games@tekred.TEK.COM (07/20/88)
Submitted by: ihnp4!homxc!smile
Comp.sources.games: Volume 5, Issue 4
Archive-name: conquer3/Patch1
[This has already been posted to comp.sources.games.bugs and is
posted here for archival purposes. If you have the latest version
of patch you can feed this file directly to patch, otherwise you
will have to unshar it first. -br]
#! /bin/sh
# This is a shell archive. Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file". To overwrite existing
# files, type "sh file -c". You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g.. If this archive is complete, you
# will see the following message at the end:
# "End of shell archive."
# Contents: patches01
# Wrapped by billr@saab on Tue Jul 19 09:50:29 1988
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f 'patches01' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'patches01'\"
else
echo shar: Extracting \"'patches01'\" \(7693 characters\)
sed "s/^X//" >'patches01' <<'END_OF_FILE'
X*** oldcexecute.c Fri Jun 17 09:40:20 1988
X--- cexecute.c Fri Jun 17 09:40:39 1988
X***************
X*** 83,88
X ntn[country].nvy[armynum].xloc=x;
X ntn[country].nvy[armynum].yloc=y;
X break;
X case XNASHP: /*nadjshp*/
X ntn[country].nvy[armynum].merchant=x;
X ntn[country].nvy[armynum].warships=y;
X
X--- 83,92 -----
X ntn[country].nvy[armynum].xloc=x;
X ntn[country].nvy[armynum].yloc=y;
X break;
X+ case XNACREW:
X+ ntn[country].nvy[armynum].crew=x;
X+ ntn[country].nvy[armynum].armynum=y;
X+ break;
X case XNASHP: /*nadjshp*/
X ntn[country].nvy[armynum].merchant=x;
X ntn[country].nvy[armynum].warships=y;
X*** oldcommands.c Fri Jun 17 09:40:09 1988
X--- commands.c Fri Jun 17 09:40:41 1988
X***************
X*** 345,351
X return;
X }
X
X! if( sct[XREAL][YREAL].people < (wnumber+mnumber) * mnumber ){
X errormsg("NOT ENOUGH CIVILIANS IN SECTOR");
X if(isgod==TRUE) country=0;
X return;
X
X--- 345,351 -----
X return;
X }
X
X! if( sct[XREAL][YREAL].people < (wnumber+mnumber) * SHIPCREW ){
X errormsg("NOT ENOUGH CIVILIANS IN SECTOR");
X if(isgod==TRUE) country=0;
X return;
X***************
X*** 353,360
X
X if((nvynum>=0)&&(nvynum<MAXNAVY)) {
X clear_bottom(0);
X- mvprintw(LINES-4,0,"constructing %hd warships and %hd merchant",wnumber,mnumber);
X-
X NCREW += (wnumber+mnumber) * SHIPCREW;
X sct[XREAL][YREAL].people -= (wnumber+mnumber)*SHIPCREW;
X
X
X--- 353,358 -----
X
X if((nvynum>=0)&&(nvynum<MAXNAVY)) {
X clear_bottom(0);
X NCREW += (wnumber+mnumber) * SHIPCREW;
X mvprintw(LINES-4,0,"constructing %hd warships and %hd merchants (crew now %d)",wnumber,mnumber,NCREW);
X
X***************
X*** 356,361
X mvprintw(LINES-4,0,"constructing %hd warships and %hd merchant",wnumber,mnumber);
X
X NCREW += (wnumber+mnumber) * SHIPCREW;
X sct[XREAL][YREAL].people -= (wnumber+mnumber)*SHIPCREW;
X
X ntn[country].tgold -= cost;
X
X--- 354,361 -----
X if((nvynum>=0)&&(nvynum<MAXNAVY)) {
X clear_bottom(0);
X NCREW += (wnumber+mnumber) * SHIPCREW;
X+ mvprintw(LINES-4,0,"constructing %hd warships and %hd merchants (crew now %d)",wnumber,mnumber,NCREW);
X+
X sct[XREAL][YREAL].people -= (wnumber+mnumber)*SHIPCREW;
X
X ntn[country].tgold -= cost;
X***************
X*** 365,370
X NWAR+=wnumber;
X NMER+=mnumber;
X NMOVE=0;
X NADJSHP;
X NADJLOC;
X NADJMOV;
X
X--- 365,372 -----
X NWAR+=wnumber;
X NMER+=mnumber;
X NMOVE=0;
X+ SADJCIV;
X+ NADJCRW;
X NADJSHP;
X NADJLOC;
X NADJMOV;
X*** oldmain.c Fri Jun 17 09:40:18 1988
X--- main.c Fri Jun 17 09:41:05 1988
X***************
X*** 679,686
X /*print a navy*/
X mvaddch((nfound%5)*2,COLS-21,'>');
X if(selector==(nfound%5)*2) standout();
X! mvprintw((nfound%5)*2,COLS-20,"navy %d: move %d",nvynum,NMOVE);
X! mvprintw((nfound%5)*2+1,COLS-20," war:%d mer:%d",NWAR,NMER);
X standend();
X }
X nfound++;
X
X--- 679,686 -----
X /*print a navy*/
X mvaddch((nfound%5)*2,COLS-21,'>');
X if(selector==(nfound%5)*2) standout();
X! mvprintw((nfound%5)*2,COLS-20,"nvy %d: war:%d mv:%d",nvynum,NWAR,NMOVE);
X! mvprintw((nfound%5)*2+1,COLS-20," mer %d crew %d",NMER,NCREW);
X standend();
X }
X nfound++;
X*** oldnpc.c Fri Jun 17 09:40:08 1988
X--- npc.c Fri Jun 17 09:41:05 1988
X***************
X*** 254,259
X }
X ntn[country].tmil -= militia;
X
X /*make sure enough men in army 0 -- garrison duty in capitol*/
X armynum=0;
X ASTAT=GARRISON;
X
X--- 254,262 -----
X }
X ntn[country].tmil -= militia;
X
X+ for(armynum=1;armynum<MAXARM;armynum++)
X+ if((ASOLD>0)&&(ATYPE==A_INFANTRY)) ASTAT = DEFEND;
X+
X /*make sure enough men in army 0 -- garrison duty in capitol*/
X armynum=0;
X ASTAT=GARRISON;
X***************
X*** 441,447
X &&(i!=armynum)&&(free==0)){
X free=1;
X ntn[country].arm[i].sold += ASOLD;
X- ntn[country].arm[i].unittyp=A_INFANTRY;
X ASOLD=0;
X }
X }
X
X--- 444,449 -----
X &&(i!=armynum)&&(free==0)){
X free=1;
X ntn[country].arm[i].sold += ASOLD;
X ASOLD=0;
X }
X }
X***************
X*** 485,491
X }
X if(free==FALSE) { /* draft a new militia army */
X for(armynum=0;armynum<MAXARM;armynum++) if(ASOLD==0){
X- ATYPE=A_MILITIA;
X AXLOC=x;
X AYLOC=y;
X free=TRUE;
X
X--- 487,492 -----
X }
X if(free==FALSE) { /* draft a new militia army */
X for(armynum=0;armynum<MAXARM;armynum++) if(ASOLD==0){
X AXLOC=x;
X AYLOC=y;
X free=TRUE;
X***************
X*** 506,511
X }
X }
X ASOLD+=ideal;
X ASTAT=GARRISON;
X #ifdef DEBUG
X if(ATYPE!=A_MILITIA) printf("ERROR - NOT MILITIA\n");
X
X--- 507,513 -----
X }
X }
X ASOLD+=ideal;
X+ ATYPE=A_MILITIA;
X ASTAT=GARRISON;
X #ifdef DEBUG
X printf("\tadding %d troops to %s army %d (now %d men - populace %d)\n",ideal,unittype[ATYPE],armynum,ASOLD,sct[x][y].people);
X***************
X*** 508,514
X ASOLD+=ideal;
X ASTAT=GARRISON;
X #ifdef DEBUG
X- if(ATYPE!=A_MILITIA) printf("ERROR - NOT MILITIA\n");
X printf("\tadding %d troops to %s army %d (now %d men - populace %d)\n",ideal,unittype[ATYPE],armynum,ASOLD,sct[x][y].people);
X #endif DEBUG
X }
X
X--- 510,515 -----
X ATYPE=A_MILITIA;
X ASTAT=GARRISON;
X #ifdef DEBUG
X printf("\tadding %d troops to %s army %d (now %d men - populace %d)\n",ideal,unittype[ATYPE],armynum,ASOLD,sct[x][y].people);
X #endif DEBUG
X }
X*** olddata.h Fri Jun 17 09:40:13 1988
X--- data.h Fri Jun 17 09:41:05 1988
X***************
X*** 252,257
X #define XALOC 4
X #define XNLOC 5
X #define XNASHP 6
X #define XECNAME 8
X #define XECPAS 9
X #define EDSPL 10
X
X--- 252,258 -----
X #define XALOC 4
X #define XNLOC 5
X #define XNASHP 6
X+ #define XNACREW 7
X #define XECNAME 8
X #define XECPAS 9
X #define EDSPL 10
X***************
X*** 276,281
X #define I_DPLUS fprintf(fexe,"INC_DPLUS \t%d \t%hd \t0 \t0 \t0 \t%s\n",INCDPLUS,country,"null")
X #define AADJSTAT fprintf(fexe,"A_STAT \t%d \t%hd \t%d \t%d \t0 \t%s\n",XASTAT,country,armynum,ntn[country].arm[armynum].stat,"null")
X #define AADJMEN fprintf(fexe,"L_ADJMEN \t%d \t%hd \t%d \t%d \t%d \t%s\n",XAMEN ,country,armynum,ASOLD,ATYPE,"null")
X #define NADJSHP fprintf(fexe,"N_ASHP \t%d \t%hd \t%d \t%d \t%d \t%s\n",XNASHP ,country,nvynum,ntn[country].nvy[nvynum].merchant,ntn[country].nvy[nvynum].warships,"null" )
X #define AADJLOC fprintf(fexe,"A_LOC \t%d \t%hd \t%d \t%d \t%d \t%s\n",XALOC ,country,armynum,ntn[country].arm[armynum].xloc,ntn[country].arm[armynum].yloc,"null")
X #define NADJLOC fprintf(fexe,"N_LOC \t%d \t%hd \t%d \t%d \t%d \t%s\n",XNLOC ,country,nvynum,ntn[country].nvy[nvynum].xloc,ntn[country].nvy[nvynum].yloc ,"null")
X
X--- 277,283 -----
X #define I_DPLUS fprintf(fexe,"INC_DPLUS \t%d \t%hd \t0 \t0 \t0 \t%s\n",INCDPLUS,country,"null")
X #define AADJSTAT fprintf(fexe,"A_STAT \t%d \t%hd \t%d \t%d \t0 \t%s\n",XASTAT,country,armynum,ntn[country].arm[armynum].stat,"null")
X #define AADJMEN fprintf(fexe,"L_ADJMEN \t%d \t%hd \t%d \t%d \t%d \t%s\n",XAMEN ,country,armynum,ASOLD,ATYPE,"null")
X+ #define NADJCRW fprintf(fexe,"N_ASHP \t%d \t%hd \t%d \t%d \t%d \t%s\n",XNACREW,country,nvynum,ntn[country].nvy[nvynum].crew,ntn[country].nvy[nvynum].armynum,"null" )
X #define NADJSHP fprintf(fexe,"N_ASHP \t%d \t%hd \t%d \t%d \t%d \t%s\n",XNASHP ,country,nvynum,ntn[country].nvy[nvynum].merchant,ntn[country].nvy[nvynum].warships,"null" )
X #define AADJLOC fprintf(fexe,"A_LOC \t%d \t%hd \t%d \t%d \t%d \t%s\n",XALOC ,country,armynum,ntn[country].arm[armynum].xloc,ntn[country].arm[armynum].yloc,"null")
X #define NADJLOC fprintf(fexe,"N_LOC \t%d \t%hd \t%d \t%d \t%d \t%s\n",XNLOC ,country,nvynum,ntn[country].nvy[nvynum].xloc,ntn[country].nvy[nvynum].yloc ,"null")
X
END_OF_FILE
if test 7693 -ne `wc -c <'patches01'`; then
echo shar: \"'patches01'\" unpacked with wrong size!
fi
# end of 'patches01'
fi
echo shar: End of shell archive.
exit 0