Conquer v4.07, from usenet

Author: Conquer

cexecute.c

@@ -293,21 +293,24 @@ hangup()
 	}
 	/*close file*/
 	fclose(fexe);
-	/*send a message to God*/
-	if(mailopen( 0 )!=(-1)) {
-		fprintf(fm,"WARNING: Nation %s hungup on me.\n",curntn->name);
-		mailclose(0);
-	}
 
-	/* remove the lock file */
-	unlink(fison);
 	/* remove any existing mail reading/writing file */
 	if (mailok!=DONEMAIL) {
 		extern char tmp_mail_name[];
 		unlink(tmp_mail_name);
 	}
+
+	/* remove the lock file */
+	unlink(fison);
 	sprintf(line,"%s%hd.tmp",msgfile,country);
 	unlink(line);
+
+	/*send a message to God*/
+	if(mailopen( 0 )!=(-1)) {
+		fprintf(fm,"WARNING: Nation %s hungup on me.\n",curntn->name);
+		mailclose(0);
+	}
+
 	/* exit program */
 	exit(FAIL);
 }

check.c

@@ -50,16 +50,16 @@ int	__line__;
 					__file__, __line__, country, i, a->yloc );
 				a->yloc = 0;
 			}
-			if( sct[a->xloc][a->yloc].altitude==PEAK ) {
-				fprintf( stderr, "file %s: line %d: nation[%d] army[%d] loc=%d,%d (peak)\n",
-				__file__,__line__,country,i,a->xloc,a->yloc);
-				a->sold = 0;
-			}
 			if( a->stat != ONBOARD && sct[a->xloc][a->yloc].altitude==WATER ) {
 				fprintf( stderr, "file %s: line %d: nation[%d] army[%d] loc=%d,%d (water) men=%d\n",
 				__file__,__line__,country,i,a->xloc,a->yloc,a->sold);
 				a->sold = 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;
+			}
 		} /* for */
 
 		for( i = 0; i < NTOTAL; i++ ) {
@@ -147,8 +147,8 @@ checkout(file,line)
 int	line;
 char	*file;
 {
-	/* fprintf(stderr,"file %s line %d\n",file,line);  */
-	/* verifydata(file,line); */
+	fprintf(stderr,"file %s line %d\n",file,line);
+	verifydata(file,line);
 }
 #endif DEBUG
 
@@ -158,6 +158,7 @@ char	*file;
 #    include <unistd.h>
 #    define do_lock(fd) lockf(fd,F_TLOCK,0)
 #else
+#    include <sys/types.h>
 #    include <sys/file.h>
 #    define do_lock(fd) flock(fd,LOCK_EX|LOCK_NB)
 #endif
@@ -192,8 +193,17 @@ check_lock(filename,keeplock)
 		exit(FAIL);
 	}
 #else
-	if( access( filename, 00 ) == 0 ) {
-		hold=TRUE;
+	struct stat fst;
+
+	if( stat( filename, &fst ) == 0 ) {
+		long now;
+		now = time(0);
+		if (now - fst.st_mtime < TIME_DEAD*3) {
+			hold=TRUE;
+		} else {
+			/* remove useless file */
+			unlink(filename);
+		}
 	}
 	if (hold==FALSE && keeplock==TRUE) {
 		/* create lock file */

combat.c

@@ -633,8 +633,8 @@ printf("I AM VERY CONFUSED - PLEASE HELP... combat.c\n");
 				if((ntn[UOWNER(k)].arm[unit[k]].unittyp >= MINLEADER)
 				&&( ntn[UOWNER(k)].arm[unit[k]].sold == 0))
 					fprintf(fm," (killed)\n");
-				else if((ntn[owner[k]].arm[unit[k]].unittyp == A_MILITIA)
-				&&( ntn[owner[k]].arm[unit[k]].sold == 0))
+				else if((ntn[UOWNER(k)].arm[unit[k]].unittyp == A_MILITIA)
+				&&( ntn[UOWNER(k)].arm[unit[k]].sold == 0))
 				fprintf(fm," (disbanded)\n");
 				else fputc('\n',fm);
 			}

commands.c

@@ -13,10 +13,11 @@
 #include "header.h"
 #include "data.h"
 #include <ctype.h>
-
-#ifdef SYSMAIL
+#ifdef CONQUER
 #include <sys/types.h>
-#endif SYSMAIL
+#include <sys/stat.h>
+#endif /*CONQUER*/
+
 extern long conq_mail_size;
 
 extern FILE *fexe;			/*execute file pointer*/
@@ -93,16 +94,6 @@ desg_ok(prtflag, desg, sptr)
 		}
 	}
 
-	/* have this for now... may be too harsh */
-	if (desg==DMILL || desg==DGRANARY) {
-		if((sptr->tradegood != TG_none)
-		&&(*(tg_stype + sptr->tradegood) != DFARM)
-		&&(*(tg_stype + sptr->tradegood) != 'x')) {
-			if(prtflag) errormsg("You can't have one of those here!");
-			return(FALSE);
-		}
-	}
-
 	if (desg==DUNIVERSITY || desg==DLUMBERYD) {
 		if((sptr->tradegood != TG_none)
 		&&(*(tg_stype + sptr->tradegood) != desg)
@@ -149,7 +140,7 @@ redesignate()
 		curntn= &ntn[country];
 
 		clear_bottom(0);
-		mvaddstr(LINES-4,0,"SUPER USER: CHANGE (v)egetation, (e)levation, (d)esig, (o)wner, (t)radegood");
+		mvaddstr(LINES-4,0,"SUPER USER: CHANGE (v)eg, (e)lev, (d)esig, (o)wner, (p)op, (t)radegood");
 		refresh();
 		switch(getch()){
 		case 'd':
@@ -190,8 +181,8 @@ redesignate()
 			}
 			sptr->vegetation=newdes;
 			if( tofood(sptr,0) < DESFOOD )
-				sptr->designation=DNODESIG;
-			else sptr->designation=newdes;
+				sptr->designation=newdes;
+			else sptr->designation=DNODESIG;
 			reset_god();
 			return;
 		case 'o':
@@ -201,6 +192,17 @@ redesignate()
 			if (x<NTOTAL) sptr->owner=x;
 			reset_god();
 			return;
+		case 'p':
+			if (sptr->altitude == WATER) {
+				errormsg("Trying to build a colony of mermen?");
+				reset_god();
+				return;
+			}
+			mvaddstr(LINES-3,7,"new population for sector: ");
+			refresh();
+			sptr->people = (long) get_number();
+			reset_god();
+			return;
 		case 't':
 			x=TRUE;
 			while(x==TRUE) {
@@ -635,7 +637,7 @@ construct()
 			return;
 		}
 
-		if( sct[XREAL][YREAL].people < amount * SHIPCREW ){
+		if( sct[XREAL][YREAL].people < amount * (shipsize+1) * SHIPCREW ){
 			errormsg("NOT ENOUGH CIVILIANS IN SECTOR");
 			if(isgod==TRUE) reset_god();
 			return;
@@ -699,13 +701,15 @@ construct()
 	/* construct fortification points*/
 	else if(type=='f'){
 		/* can only go into debt as much as the nation has jewels */
-		if ((curntn->tgold - cost) >= ((-1)*10*curntn->jewels)) {
+		if (sct[XREAL][YREAL].fortress>11) {
+			errormsg("That sector is as impregnable as you can make it");
+		} else if ((curntn->tgold - cost) >= ((-1)*10*curntn->jewels)) {
 			mvprintw(LINES-2,5,"you build +%d%% fort points for %ld gold",armbonus,cost);
 			curntn->tgold-=cost;
 			sct[XREAL][YREAL].fortress++;
 			INCFORT;
 			errormsg("");
-		} else errormsg("you are broke");
+		} else errormsg("you may not spend that much");
 	}
 	else errormsg("invalid input error");
 
@@ -1038,6 +1042,7 @@ rmessage()
 	char mesgfile[FILELTH];
 	char line[LINELTH+1], inpch;
 	char save[LINELTH][LINELTH+1];
+	struct stat fst;
 
 	/*open file; used in mailopen() as well */
 	sprintf(tempfile,"%s%hd.tmp",msgfile,country);
@@ -1062,14 +1067,21 @@ rmessage()
 
 	/* check for people sending mail */
 	sprintf(line,"send.%s%hd",msgfile,country);
-	if (access(line,00)==0) {
-		/* someone is sending mail to the country */
-		(void) unlink (tempfile) ;
-		clear_bottom(0);
-		errormsg("Someone is sending you mail... please wait.");
-		makebottom();
-		redraw=DONE;
-		return;
+	if (stat(line,&fst)==0) {
+		long now;
+		now = time(0);
+		if (now - fst.st_mtime < TIME_DEAD) {
+			/* someone is sending mail to the country */
+			(void) unlink (tempfile) ;
+			clear_bottom(0);
+			errormsg("Someone is sending you mail... please wait.");
+			makebottom();
+			redraw=DONE;
+			return;
+		} else {
+			/* remove useless file */
+			(void) unlink(line);
+		}
 	}
 
 	/*read in file a line at at time*/
@@ -1142,27 +1154,29 @@ wmessage()
 	char line[BIGLTH];
 
 	/*what nation to send to*/
-	clear();
-	mvaddstr(0,0,"To send a message to the administrator, send to 'god';");
-	mvaddstr(1,0,"To post to the news, send to 'news':");
-	mvaddstr(2,0,"Enter the name of the country to send to: ");
+	clear_bottom(0);
+	mvaddstr(LINES-4,0,"The Conquer Administrator is 'god'; To send to the News use 'news';");
+	mvaddstr(LINES-3,0,"Send mail to what nation? ");
 	refresh();
 	temp=get_country();
 
 	if( temp == NEWSMAIL ) {
 		strcpy(name,"news");
 	} else {
 		/* quick return on bad input */
-		if(temp==(-1) || temp>=NTOTAL
-		  || (!isntn(ntn[temp].active) && temp!=0))
-  			return;
+		if(temp==(-1) || temp>=NTOTAL 
+		|| (!isntn(ntn[temp].active) && temp!=0)) {
+			makebottom();
+			return;
+		}
 		strcpy(name,ntn[temp].name);	/* find nation name */
 	}
 
 	if(mailopen( temp )==(-1)) {
+		makebottom();
 		return;
 	}
-
+	redraw=FULL;
 
 	if(temp != -2) {
 		if (country==0)

data.h

@@ -3,6 +3,7 @@
 /*--------I DO NOT BELIEVE IT IS NECESSARY TO ALTER THIS FILE----------------*/
 #define	FAIL	1		/* fail return to shell			*/
 #define	SUCCESS	0		/* successful return to shell		*/
+#define TIME_DEAD	3600	/* number of seconds for file aging	*/
 #define	BIG	500000000L	/* BIGGER THAN ANYTHING SHOULD BE	*/
 				/* this is used to protect against overflow */
 #define	SCRARM	((LINES-14)/2)	/* number of armies to fit on screen	*/
@@ -203,7 +204,7 @@ struct s_sector
 	long	people;			/* civilians in sector		*/
 	short	i_people;		/* initial civilians in sector	*/
 	unsigned char	jewels;		/* jewel production ability	*/
-	unsigned char	fortress;	/* fortification level (0 to 9)	*/
+	unsigned char	fortress;	/* fortification level; 0 to 12	*/
 	unsigned char	metal;		/* metal produced by sector	*/
 	unsigned char	tradegood;	/* exotic trade goods in sector	*/
 	/* unsigned char	region;		/* index of region	*/

display.c

@@ -3,13 +3,13 @@
 /*conquer : Copyright (c) 1988 by Ed Barlow.
  *  I spent a long time writing this code & I hope that you respect this.
  *  I give permission to alter the code, but not to copy or redistribute
- *  it without my explicit permission.	If you alter the code,
+ *  it without my explicit permission.  If you alter the code,
  *  please document changes and send me a copy, so all can have it.
- *  This code, to the best of my knowledge works well,	 but it is my first
+ *  This code, to the best of my knowledge works well,  but it is my first
  *  'C' program and should be treated as such.  I disclaim any
- *  responsibility for the codes actions (use at your own risk).	 I guess
+ *  responsibility for the codes actions (use at your own risk).  I guess
  *  I am saying "Happy gaming", and am trying not to get sued in the process.
- *										Ed
+ *                                                Ed
  */
 
 /*include files*/
@@ -410,7 +410,10 @@ coffmap()
 {
 	if((xcurs<=0)||(ycurs<=0)||(xcurs>=SCREEN_X_SIZE-1)
 	||((ycurs>=SCREEN_Y_SIZE-1))||((XREAL)>=MAPX)
-	 ||((YREAL)>=MAPY)) offmap();
+	 ||((YREAL)>=MAPY)) {
+	  centermap();
+	  redraw=PART;
+	}
 
 	if(redraw!=DONE) {
 		if (redraw==FULL) {