billr@saab.CNA.TEK.COM (Bill Randle) (09/21/89)
Submitted-by: VANCLEEF@mps.ohio-state.edu
Posting-number: Volume 8, Issue 36
Archive-name: GB2/Patch3
Patch-To: GB2: Volume 7, Issue 44-51
[This fixes a logic error in doplanet.c and adds a missing
close() in files_shl.c and properly updates patchlevel.h]
#! /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: patches03
# Wrapped by billr@saab on Thu Sep 21 06:40:42 1989
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f 'patches03' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'patches03'\"
else
echo shar: Extracting \"'patches03'\" \(2665 characters\)
sed "s/^X//" >'patches03' <<'END_OF_FILE'
XPatch2 inadvertantly did not update the patchlevel.h file, so
Xeven though this looks wrong it is correct.-br
X*** ../../GB2/patchlevel.h Fri Sep 15 08:45:12 1989
X--- patchlevel.h Thu Sep 21 06:37:16 1989
X***************
X*** 1 ****
X! #define PATCHLEVEL 1
X--- 1 ----
X! #define PATCHLEVEL 3
X*** ../../GB2/doplanet.c Mon Sep 18 06:35:57 1989
X--- doplanet.c Thu Sep 21 06:30:04 1989
X***************
X*** 332,337 ****
X--- 332,340 ----
X
X while (Getxysect(planet, &x, &y, 0)) {
X p = &Sector(*planet,x,y);
X+ /* wasted sectors have a 1% chance/turn of repairing themselves
X+ from natural effects */
X+ if(p->is_wasted && !int_rand(0,99))p->is_wasted = 0;
X if (p->amoeba) {
X planet->info[1-1].numsectsowned++;
X allamoeba &= 1;
X***************
X*** 622,628 ****
X /* slave revolt! */
X printf("slave revolt!\n");
X /* first nuke some random sectors from the revolt */
X! i = planet->popn / 10000 + 1;
X printf("i %d Maxx %d Maxy %d\n",i,planet->Maxx,planet->Maxy);
X while (--i) {
X p = &Sector(*planet,int_rand(0,planet->Maxx-1),
X--- 625,631 ----
X /* slave revolt! */
X printf("slave revolt!\n");
X /* first nuke some random sectors from the revolt */
X! i = planet->popn / 1000 + 1;
X printf("i %d Maxx %d Maxy %d\n",i,planet->Maxx,planet->Maxy);
X while (--i) {
X p = &Sector(*planet,int_rand(0,planet->Maxx-1),
X***************
X*** 698,700 ****
X--- 701,704 ----
X }
X return allmod;
X }
X+
X*** ../../GB2/files_shl.c Fri Sep 15 08:44:27 1989
X--- files_shl.c Thu Sep 21 06:33:55 1989
X***************
X*** 365,373 ****
X
X shipno = shipnum; /* conv to u_short */
X
X! if(shipnum == 0)return;
X
X if ( (fd = open(SHIPFREEDATAFL, O_WRONLY, 0777)) < 0) {
X perror("openshfdata");
X printf("unable to open %s\n",SHIPFREEDATAFL);
X exit(-1);
X--- 365,375 ----
X
X shipno = shipnum; /* conv to u_short */
X
X! if(shipno == 0)return;
X
X if ( (fd = open(SHIPFREEDATAFL, O_WRONLY, 0777)) < 0) {
X+ printf("fd = %d \n",fd);
X+ printf("errno = %d \n",errno);
X perror("openshfdata");
X printf("unable to open %s\n",SHIPFREEDATAFL);
X exit(-1);
X***************
X*** 376,384 ****
X printf("ship #%u destroyed.\n", shipno);
X /* write the ship # at the very end of SHIPFREEDATAFL */
X fstat(fd,&buf);
X! Locks(1);
X Filewrite(fd,(char *)&shipno, sizeof(shipno), SHIPFREEDATAFL, buf.st_size );
X Locks(0);
X }
X
X
X--- 378,387 ----
X printf("ship #%u destroyed.\n", shipno);
X /* write the ship # at the very end of SHIPFREEDATAFL */
X fstat(fd,&buf);
X! Locks(1);
X Filewrite(fd,(char *)&shipno, sizeof(shipno), SHIPFREEDATAFL, buf.st_size );
X Locks(0);
X+ close(fd);
X }
X
X
END_OF_FILE
if test 2665 -ne `wc -c <'patches03'`; then
echo shar: \"'patches03'\" unpacked with wrong size!
fi
# end of 'patches03'
fi
echo shar: End of shell archive.
exit 0