Conquer v4.08, from usenet

Author: Conquer

admin.c

@@ -204,9 +204,7 @@ char **argv;
 				printf(".\n");
 				exit(FAIL);
 			}
-#ifdef REMAKE
 			remake=TRUE;
-#endif /*REMAKE*/
 			printf("************* WARNING!!!! *******************\n\n");
 			printf("    There is already a game in progress.\n\n");
 			printf("*********************************************\n\n");
@@ -227,7 +225,7 @@ char **argv;
 		}
 #else
 		/* check for god permissions */
-		if(realuser!=(getpwnam(LOGIN)->pw_uid)) {
+		if(realuser!=(getpwnam(LOGIN))->pw_uid) {
 			printf("Sorry -- you can not create a world\n");
 			printf("you need to be logged in as %s.\n",LOGIN);
 			exit(FAIL);

cexecute.c

@@ -15,7 +15,7 @@
 #include "data.h"
 extern long startgold;
 extern short country;
-extern FILE *fexe;
+extern FILE *fexe, *fnews;
 extern char fison[];
 
 #ifdef CONQUER
@@ -161,6 +161,14 @@ int	isupdate;	/* 0 if not update, 1 if update */
 			curntn->reputation = y;
 			break;
 		case NTAX:	/* set nations tax rate */
+#ifdef ADMIN
+			if (ispc(curntn->active) && !ispc(x)) {
+			  fprintf(fnews, "1.\tNation %s is now being run by the computer.\n", curntn->name);
+			}
+			if (ispc(x) && !ispc(curntn->active)) {
+			  fprintf(fnews, "1.\tNation %s is no longer being run by the computer.\n", curntn->name);
+			}
+#endif /*ADMIN*/
 			curntn->tax_rate = armynum;
 			curntn->active = x;
 			curntn->charity = y;

check.c

@@ -3,6 +3,10 @@
 
 #include	<ctype.h>
 #include	<stdio.h>
+#ifndef FILELOCK
+#include	<sys/types.h>
+#include	<sys/stat.h>
+#endif
 #include	"header.h"
 #include	"data.h"
 
@@ -55,7 +59,7 @@ int	__line__;
 				__file__,__line__,country,i,a->xloc,a->yloc,a->sold);
 				a->sold = 0;
 			}
-			if( a->stat == ONBOARD && a->smove > 0) {
+			if( a->stat == ONBOARD && a->smove != 0) {
 				/* don't echo since this is still getting */
 				/* set some place someplace I can't find yet */
 				a->smove = 0;

data.c

@@ -62,10 +62,10 @@ char *unittype[]= {
 "Knights", "Gryfins","Elephants","Zombies","Spy","Scout",
 "King","Baron","Emperor","Prince","Wizard","Mage",
 "Pope","Bishop","Admiral","Captain","Warlord","Lord",
-"Demon","Devil","Dragon","Wyrm","Shadow","Nazgul",
+"Demon","Devil","Dragyn","Wyrm","Shadow","Nazgul",
 "Spirit", "Assasin", "Efreet", "Gargoyl", "Wraith",
 "Hero", "Centaur", "Giant", "Suphero", "Mummy",
-"Elmentl", "Mintaur", "Demon", "Balrog", "Dragon"
+"Elmentl", "Mintaur", "Daemon", "Balrog", "Dragon"
 };
 
 #ifdef CONQUER
@@ -80,7 +80,7 @@ char *shunittype[]= {
 "Demn","Devl","Drag","Wyrm","Shad","Nazg",
 "spir", "Assn", "efr", "Garg", "Wra",
 "Hero", "Cent", "gt", "Shro", "Mumm",
-"Elem", "mino", "dem", "Bal", "Drag"
+"Elem", "mino", "daem", "Bal", "Drgn"
 };
 #endif CONQUER
 int unitminsth[]=		/* min strength of a unit */

display.c

@@ -220,7 +220,7 @@ get_display_for(x,y,dmode)
 			break;
 		case DI_DESI: /*designation*/
 			if(sct[x+xoffset][y+yoffset].owner==0){
-				if(tofood( &sct[x+xoffset][y+yoffset],sct[x+xoffset][y+yoffset].owner)!=0)
+				if(tofood( &sct[x+xoffset][y+yoffset],country)!=0)
 					ch=sct[x+xoffset][y+yoffset].altitude;
 				else ch=sct[x+xoffset][y+yoffset].vegetation;
 			}
@@ -408,11 +408,11 @@ highlight(x,y,hmode)
 void
 coffmap()
 {
-	if((xcurs<=0)||(ycurs<=0)||(xcurs>=SCREEN_X_SIZE-1)
-	||((ycurs>=SCREEN_Y_SIZE-1))||((XREAL)>=MAPX)
-	 ||((YREAL)>=MAPY)) {
-	  centermap();
-	  redraw=PART;
+	if( xcurs<0 || (XREAL!=0 && xcurs==0) || (ycurs<0) ||
+	   (YREAL!=0 && ycurs==0) || xcurs>=SCREEN_X_SIZE-1 ||
+	   ycurs>=SCREEN_Y_SIZE-1 || XREAL>=MAPX || YREAL>=MAPY) {
+		centermap();
+		redraw=PART;
 	}
 
 	if(redraw!=DONE) {

extcmds.c

@@ -113,17 +113,25 @@ int armynum, army2;
 {
 	int nocomb_stat();
 
-	if (armynum < 0 || armynum >= MAXARM ||
-		army2 < 0 || army2 >= MAXARM ||
-		armynum == army2 ||
-		(nocomb_stat(P_ASTAT) == TRUE) ||
+	if (armynum < 0 || armynum >= MAXARM
+	    || army2 < 0 || army2 >= MAXARM || P_ASOLD == 0
+	    || curntn->arm[army2].sold == 0) {
+		errormsg("Selected unit doesn't exist");
+		return;
+	}
+	if (P_ASTAT != curntn->arm[army2].stat
+	    || P_ATYPE != curntn->arm[army2].unittyp
+	    || P_ATYPE >= MINLEADER
+	    || P_ASTAT == ONBOARD || P_ASTAT == TRADED) {
+	  if ((nocomb_stat(P_ASTAT) == TRUE) ||
 		(nocomb_stat(curntn->arm[army2].stat) == TRUE) ||
 		curntn->arm[army2].stat == SIEGE ||    /* may not jump out  */
 		curntn->arm[army2].stat == SORTIE ||   /* of these statuses */
 		P_ATYPE >= MINLEADER ||
 		P_ATYPE!=curntn->arm[army2].unittyp) {
 			errormsg("Selected armies not legal");
 			return;
+		}
 	}
 	if((curntn->arm[army2].xloc!=P_AXLOC)
 	||(curntn->arm[army2].yloc!=P_AYLOC)) {
@@ -350,6 +358,10 @@ int	armynum;
 		errormsg("Your Zombies just don't seem inspired");
 		return;
 	}
+	if(P_ASTAT==MARCH) {
+		errormsg("Your troops must stop marching before they can be lead");
+		return;
+	}
 	if(armynum<0 || armynum >= MAXARM || P_ASTAT==SCOUT ||
 		P_ASTAT==TRADED || P_ASTAT==ONBOARD || P_ATYPE==A_MILITIA ){
 		errormsg("Selected army not groupable");

forms.c

@@ -413,10 +413,10 @@ change()
 		mvprintw(5,0,"active is %d",curntn->active);
 	mvprintw(6,0,"tax_rate...... %2d%%",curntn->tax_rate);
 	mvprintw(7,0,"inflation..... %2d%%",curntn->inflation);
-	i=10*curntn->tax_rate-curntn->popularity-curntn->terror-3*curntn->charity;
+	i=(int)10*curntn->tax_rate-curntn->popularity-curntn->terror-3*curntn->charity;
 	if( i<0 ) i=0;
 	mvprintw(8,0,"peasant revolt %2d%%",(i*PREVOLT)/100);
-	i=5*curntn->tax_rate - curntn->prestige;
+	i=(int)5*curntn->tax_rate - curntn->prestige;
 	if( i<0 ) i=0;
 	mvprintw(9,0,"other revolt.. %2d%%",(i*PREVOLT)/100);
 	standend();
@@ -441,7 +441,7 @@ change()
 	temp = P_EATRATE;
 	mvprintw(7,COLS/2-12, "eatrate.......%3.2f",temp);
 	mvprintw(8,COLS/2-12, "wealth........ %3d",curntn->wealth);
-	mvprintw(9,COLS/2-12,"charity....... %2d%%",curntn->charity);
+	mvprintw(9,COLS/2-12, "charity....... %2d%%",curntn->charity);
 	mvprintw(10,COLS/2-12,"communication.%3.2f",(float) P_NTNCOM);
 	mvprintw(11,COLS/2-12,"reputation.... %3d",curntn->reputation);
 	mvprintw(12,COLS/2-12,"spoilrate.....%3d%%",curntn->spoilrate);

main.c

@@ -574,8 +574,8 @@ parse(ch)
 	case 'b':	/*move south west*/
 		pager=0;
 		selector=0;
-		xcurs--;
-		ycurs++;
+		if (XREAL > 0) xcurs--;
+		if (YREAL < MAPY - 1) ycurs++;
 		break;
 	case 'B':	/*budget*/
 		redraw=FULL;
@@ -620,13 +620,14 @@ parse(ch)
 	case 'H':	/*scroll west*/
 		pager=0;
 		selector=0;
-		xcurs-=((COLS-22)/4);
+		if (XREAL > (COLS-22)/4) xcurs-=((COLS-22)/4);
+		else xcurs = -xoffset;
 		break;
 	case '4':
 	case 'h':	/*move west*/
 		pager=0;
 		selector=0;
-		xcurs--;
+		if (XREAL > 0) xcurs--;
 		break;
 	case 'I':	/*campaign information*/
 		camp_info();
@@ -635,35 +636,39 @@ parse(ch)
 	case 'J':	/*scroll down*/
 		pager=0;
 		selector=0;
-		ycurs+=((SCREEN_Y_SIZE)/2);
+		if (YREAL + (SCREEN_Y_SIZE)/2 < MAPY)
+			ycurs+=((SCREEN_Y_SIZE)/2);
+		else ycurs = MAPY - yoffset - 1;
 		break;
 	case '2':
 	case 'j':	/*move down*/
 		pager=0;
 		selector=0;
-		ycurs++;
+		if (YREAL < MAPY - 1) ycurs++;
 		break;
 	case '8':
 	case 'k':	/*move up*/
 		pager=0;
 		selector=0;
-		ycurs--;
+		if (YREAL > 0) ycurs--;
 		break;
 	case 'K':	/*scroll up*/
 		pager=0;
 		selector=0;
-		ycurs-=((SCREEN_Y_SIZE)/2);
+		if (YREAL > (SCREEN_Y_SIZE)/2) ycurs-=((SCREEN_Y_SIZE)/2);
+		else ycurs = -yoffset;
 		break;
 	case '6':
 	case 'l':	/*move east*/
 		pager=0;
 		selector=0;
-		xcurs++;
+		if (XREAL < MAPX - 1) xcurs++;
 		break;
 	case 'L':	/*scroll east*/
 		pager=0;
 		selector=0;
-		xcurs+=((COLS-22)/4);
+		if (XREAL + (COLS-22)/4 < MAPX) xcurs+=((COLS-22)/4);
+		else xcurs = MAPX - xoffset - 1;
 		break;
 	case 'm':	/*move selected item to new x,y */
 		mymove();
@@ -680,8 +685,8 @@ parse(ch)
 	case 'n':	/*move south-east*/
 		pager=0;
 		selector=0;
-		ycurs++;
-		xcurs++;
+		if (YREAL < MAPY - 1) ycurs++;
+		if (XREAL < MAPX - 1) xcurs++;
 		break;
 	case 'N':	/*read newspaper */
 		redraw=PART;
@@ -762,14 +767,16 @@ parse(ch)
 	case 'u':	/*move north-east*/
 		pager=0;
 		selector=0;
-		ycurs--;
-		xcurs++;
+		if (YREAL > 0) ycurs--;
+		if (XREAL < MAPX - 1) xcurs++;
 		break;
     	case 'U':	/* scroll north-east */
 		pager=0;
 		selector=0;
-		xcurs+=((COLS-22)/4);
-		ycurs-=((SCREEN_Y_SIZE)/2);
+		if (XREAL + (COLS-22)/4 < MAPX) xcurs+=((COLS-22)/4);
+		else xcurs = MAPX - xoffset - 1;
+		if (YREAL > (SCREEN_Y_SIZE)/2) ycurs-=((SCREEN_Y_SIZE)/2);
+		else ycurs = -yoffset;
 		break;
     	case 'v':	/* version credits */
 		credits();
@@ -801,14 +808,16 @@ parse(ch)
 	case 'y':	/*move north-west*/
 		pager=0;
 		selector=0;
-		ycurs--;
-		xcurs--;
+		if (YREAL > 0) ycurs--;
+		if (XREAL > 0) xcurs--;
 		break;
 	case 'Y':	/* scroll north-west */
 		pager=0;
 		selector=0;
-		xcurs-=((COLS-22)/4);
-		ycurs-=((SCREEN_Y_SIZE)/2);
+		if (XREAL < (COLS-22)/4) xcurs = -xoffset;
+		else xcurs-=((COLS-22)/4);
+		if (YREAL < (SCREEN_Y_SIZE)/2) ycurs = -yoffset;
+		else ycurs-=((SCREEN_Y_SIZE)/2);
 		break;
 	case 'Z':	/*move civilians up to 2 spaces*/
 		moveciv();

newlogin.c

@@ -849,7 +849,6 @@ newlogin()
 				break;
 			}
 		}
-		check();
 
 		/* check for save */
 		newmsg("Save this nation? [ny]");

notes.v4

@@ -283,12 +283,37 @@
 227. misc.c[498]: fixed overflow on gold scoring [Kenneth J Dalka]
 228. adjusted inflation calculation in update.c and reports.c.
 229. added the inflation estimation to the budget report.
-230. fixed bug with division of charity by population. [Dave F.]
+230. fixed bug with division of charity by population. [Charles C. Fu]
 231. prevent passage of fleets through hostile cities.
 232. added some checks in npc.c for ownership in drafting in some sectors.
 233. removed destruction of troops on peaks, now that flight is possible.
 234. changed to min zero in attractiveness, now drift will no longer occur
 	for sectors with "zero" attractiveness.  [Dave F.]
+===4.0 patch number seven released => 4.7 ===============================
+235. update.c[1327]: "ispc(country)" => "ispc(curntn->active)"
+236. added a note to README and fixed credit in notes.v4 file.
+237. made sure npcs do not change scout status.
+238. fixed bug with include files in check.c. [J. Bayer]
+239. update.c[1073]: declare items as unsigned char [Rodney Orr]
+240. update.c[1541]: rewrote move_people() routine to avoid memory leak
+	and to use only 5 / MAPX as much memory.
+241. adjusted casting in propuction screen for food consumption.
+242. trade.c: added check for unexpected end of file in trade [R. Orr]
+243. newlogin.c: removed the check() in the routine.
+244. added news notification during update if npc/pc mode is changed.
+245. removed useless ifdef REMAKE statement in admin.c.
+246. added check for edge of screen unnecessarily redrawing.
+247. added check for motion beyond edge of screen.
+248. added stoppage for going beyond map edges.
+249. checked for invalid reads of commerce file in trade.c.
+250. changed float casting back to longs at line 1052 of update.c.
+251. did the same for the calculations in function budget() of report.c.
+252. fixed display.c designation to show tofood(sctptr, country).
+253. made Dragyn the nation leader name and Dragon the monster name.
+254. restricted marching troops from being grouped.  (could get into
+	defend mode this way; even when they had marched too far).
+255. allow recombination of troops with same status and same type
+	unless the type is TRADED or ON_BOARD.
 
 -------------------------------------------------------------------------
 | 2.0 POSSIBLE SHORT-TERM ENHANCEMENTS/FIXES FOR CONQUER V5             |