Path: utzoo!attcan!uunet!lll-winken!lll-tis!ames!amdahl!pacbell!att!whuts!homxb!homxc!smile
From: smile@homxc.UUCP (E.BARLOW)
Newsgroups: comp.sources.games.bugs
Subject: conquer v3 - repost of patch1
Message-ID: <2679@homxc.UUCP>
Date: 13 Jul 88 14:15:06 GMT
Organization: AT&T Bell Laboratories, Holmdel
Lines: 249


Here is a reposting of patch 1 for conquer v3.  Lots of people have
mailed to me - claiming to have missed it.  patch 2 and the shell
archive patch2.sh are to follow.

The Ed
------------------------ Cut Here ------------------------
*** oldcexecute.c	Fri Jun 17 09:40:20 1988
--- cexecute.c	Fri Jun 17 09:40:39 1988
***************
*** 83,88
  			ntn[country].nvy[armynum].xloc=x;
  			ntn[country].nvy[armynum].yloc=y;
  			break;
  		case XNASHP: /*nadjshp*/
  			ntn[country].nvy[armynum].merchant=x;
  			ntn[country].nvy[armynum].warships=y;

--- 83,92 -----
  			ntn[country].nvy[armynum].xloc=x;
  			ntn[country].nvy[armynum].yloc=y;
  			break;
+ 		case XNACREW: 
+ 			ntn[country].nvy[armynum].crew=x;
+ 			ntn[country].nvy[armynum].armynum=y;
+ 			break;
  		case XNASHP: /*nadjshp*/
  			ntn[country].nvy[armynum].merchant=x;
  			ntn[country].nvy[armynum].warships=y;
*** oldcommands.c	Fri Jun 17 09:40:09 1988
--- commands.c	Fri Jun 17 09:40:41 1988
***************
*** 345,351
  			return;
  		}
  
! 		if( sct[XREAL][YREAL].people < (wnumber+mnumber) * mnumber ){
  			errormsg("NOT ENOUGH CIVILIANS IN SECTOR");
  			if(isgod==TRUE) country=0;
  			return;

--- 345,351 -----
  			return;
  		}
  
! 		if( sct[XREAL][YREAL].people < (wnumber+mnumber) * SHIPCREW ){
  			errormsg("NOT ENOUGH CIVILIANS IN SECTOR");
  			if(isgod==TRUE) country=0;
  			return;
***************
*** 353,360
  
  		if((nvynum>=0)&&(nvynum=0)&&(nvynum=0)&&(nvynum');
  				if(selector==(nfound%5)*2) standout();
! 				mvprintw((nfound%5)*2,COLS-20,"navy %d: move %d",nvynum,NMOVE);
! 				mvprintw((nfound%5)*2+1,COLS-20," war:%d mer:%d",NWAR,NMER);
  				standend();
  			}
  			nfound++;

--- 679,686 -----
  				/*print a navy*/
  				mvaddch((nfound%5)*2,COLS-21,'>');
  				if(selector==(nfound%5)*2) standout();
! 				mvprintw((nfound%5)*2,COLS-20,"nvy %d: war:%d mv:%d",nvynum,NWAR,NMOVE);
! 				mvprintw((nfound%5)*2+1,COLS-20," mer %d crew %d",NMER,NCREW);
  				standend();
  			}
  			nfound++;
*** oldnpc.c	Fri Jun 17 09:40:08 1988
--- npc.c	Fri Jun 17 09:41:05 1988
***************
*** 254,259
  	}
  	ntn[country].tmil -= militia;
  
  	/*make sure enough men in army 0 -- garrison duty in capitol*/
  	armynum=0;
  	ASTAT=GARRISON;

--- 254,262 -----
  	}
  	ntn[country].tmil -= militia;
  
+ 	for(armynum=1;armynum0)&&(ATYPE==A_INFANTRY)) ASTAT = DEFEND;
+ 
  	/*make sure enough men in army 0 -- garrison duty in capitol*/
  	armynum=0;
  	ASTAT=GARRISON;
***************
*** 441,447
  				&&(i!=armynum)&&(free==0)){
  					free=1;
  					ntn[country].arm[i].sold += ASOLD;
- 					ntn[country].arm[i].unittyp=A_INFANTRY;
  					ASOLD=0;
  				}
  			}

--- 444,449 -----
  				&&(i!=armynum)&&(free==0)){
  					free=1;
  					ntn[country].arm[i].sold += ASOLD;
  					ASOLD=0;
  				}
  			}
***************
*** 485,491
  		}
  		if(free==FALSE) {	 /* draft a new militia army */
  			for(armynum=0;armynum