Permalink
Browse files

games: Massive style(9) cleanup commit. Reduces differences to NetBSD.

Submitted-by: Ulrich Spoerlein <uqs@spoerlein.net>
  • Loading branch information...
Sascha Wildner
Sascha Wildner committed Jan 9, 2010
1 parent c36bd81 commit 6693db176654a0f25095ec64d0a74d58dcf0e47e
Showing 450 changed files with 31,450 additions and 29,998 deletions.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
View
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -42,59 +38,59 @@
#include <sys/types.h>
#include "hdr.h"
-const u_long crctab[] = {
+const unsigned long crctab[] = {
0x7fffffff,
- 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
- 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e,
- 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
- 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d,
- 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0,
- 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63,
- 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
- 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa,
- 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75,
- 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, 0xc8d75180,
- 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
- 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87,
- 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
- 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5,
- 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
- 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4,
- 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b,
- 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea,
- 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
- 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541,
- 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc,
- 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f,
- 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
- 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, 0x5edef90e,
- 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
- 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c,
- 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
- 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b,
- 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2,
- 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671,
- 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
- 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8,
- 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767,
- 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, 0x36034af6,
- 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
- 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795,
- 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
- 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b,
- 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
- 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, 0x95bf4a82,
- 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d,
- 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8,
- 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
- 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff,
- 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee,
- 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d,
- 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
- 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c,
- 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
- 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02,
- 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+ 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+ 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e,
+ 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+ 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d,
+ 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0,
+ 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63,
+ 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+ 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa,
+ 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75,
+ 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, 0xc8d75180,
+ 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+ 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87,
+ 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+ 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5,
+ 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
+ 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4,
+ 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b,
+ 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea,
+ 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+ 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541,
+ 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc,
+ 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f,
+ 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
+ 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, 0x5edef90e,
+ 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+ 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c,
+ 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+ 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b,
+ 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, 0x8708a3d2,
+ 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671,
+ 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+ 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8,
+ 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767,
+ 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, 0x36034af6,
+ 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+ 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795,
+ 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+ 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b,
+ 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
+ 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, 0x95bf4a82,
+ 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d,
+ 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8,
+ 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+ 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff,
+ 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee,
+ 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d,
+ 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
+ 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c,
+ 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+ 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02,
+ 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
};
/*
@@ -105,29 +101,27 @@ const u_long crctab[] = {
* it.
*/
-u_long crcval;
-u_int step;
+unsigned long crcval;
+unsigned int step;
-void
+void
crc_start(void)
{
crcval = step = 0;
}
/* Process nr bytes at a time; ptr points to them */
-u_long
+unsigned long
crc(const char *ptr, int nr)
{
- int i;
- const char *p;
+ int i;
+ const char *p;
while (nr > 0)
- for (p = ptr; nr--; ++p)
- {
- if (!(i = crcval >> 24 ^ *p))
- {
+ for (p = ptr; nr--; ++p) {
+ if (!(i = crcval >> 24 ^ *p)) {
i = step++;
- if (step >= sizeof(crctab)/sizeof(crctab[0]))
+ if (step >= sizeof(crctab) / sizeof(crctab[0]))
step = 0;
}
crcval = ((crcval << 8) ^ crctab[i]) & 0xffffffff;
View
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -40,105 +36,132 @@
* $DragonFly: src/games/adventure/done.c,v 1.4 2007/04/18 18:32:12 swildner Exp $
*/
-/* Re-coding of advent in C: termination routines */
+/* Re-coding of advent in C: termination routines */
#include <stdio.h>
#include <stdlib.h>
#include "hdr.h"
-/* sort of like 20000 */
+/* sort of like 20000 */
int
score(void)
-{ int scor,i;
- mxscor=scor=0;
- for (i=50; i<=maxtrs; i++)
- { if (ptext[i].txtlen==0) continue;
- k=12;
- if (i==chest) k=14;
- if (i>chest) k=16;
- if (prop[i]>=0) scor += 2;
- if (place[i]==3&&prop[i]==0) scor += k-2;
+{
+ int scor, i;
+
+ mxscor = scor = 0;
+ for (i = 50; i <= maxtrs; i++) {
+ if (ptext[i].txtlen == 0)
+ continue;
+ k = 12;
+ if (i == chest)
+ k = 14;
+ if (i > chest)
+ k = 16;
+ if (prop[i] >= 0)
+ scor += 2;
+ if (place[i] == 3 && prop[i] == 0)
+ scor += k - 2;
mxscor += k;
}
- scor += (maxdie-numdie)*10;
- mxscor += maxdie*10;
- if (!(scorng||gaveup)) scor += 4;
+ scor += (maxdie - numdie) * 10;
+ mxscor += maxdie * 10;
+ if (!(scorng || gaveup))
+ scor += 4;
mxscor += 4;
- if (dflag!=0) scor += 25;
+ if (dflag != 0)
+ scor += 25;
mxscor += 25;
- if (closng) scor += 25;
+ if (closng)
+ scor += 25;
mxscor += 25;
- if (closed)
- { if (bonus==0) scor += 10;
- if (bonus==135) scor += 25;
- if (bonus==134) scor += 30;
- if (bonus==133) scor += 45;
+ if (closed) {
+ if (bonus == 0)
+ scor += 10;
+ if (bonus == 135)
+ scor += 25;
+ if (bonus == 134)
+ scor += 30;
+ if (bonus == 133)
+ scor += 45;
}
mxscor += 45;
- if (place[magzin]==108) scor++;
+ if (place[magzin] == 108)
+ scor++;
mxscor++;
scor += 2;
mxscor += 2;
- for (i=1; i<=hntmax; i++)
- if (hinted[i]) scor -= hints[i][2];
- return(scor);
+ for (i = 1; i <= hntmax; i++)
+ if (hinted[i])
+ scor -= hints[i][2];
+ return (scor);
}
-/* entry=1 means goto 13000 */ /* game is over */
-/* entry=2 means goto 20000 */ /* 3=19000 */
+/* entry=1 means goto 13000 */ /* game is over */
+/* entry=2 means goto 20000 */ /* 3=19000 */
void
done(int entry)
-{ int i,sc;
- if (entry==1) mspeak(1);
- if (entry==3) rspeak(136);
- printf("\n\n\nYou scored %d out of a ",(sc=score()));
- printf("possible %d using %d turns.\n",mxscor,turns);
- for (i=1; i<=clsses; i++)
- if (cval[i]>=sc)
- { speak(&ctext[i]);
- if (i==clsses-1)
- { printf("To achieve the next higher rating");
+{
+ int i, sc;
+
+ if (entry == 1)
+ mspeak(1);
+ if (entry == 3)
+ rspeak(136);
+ printf("\n\n\nYou scored %d out of a ", (sc = score()));
+ printf("possible %d using %d turns.\n", mxscor, turns);
+ for (i = 1; i <= clsses; i++)
+ if (cval[i] >= sc) {
+ speak(&ctext[i]);
+ if (i == clsses - 1) {
+ printf("To achieve the next higher rating");
printf(" would be a neat trick!\n\n");
printf("Congratulations!!\n");
exit(0);
}
- k=cval[i]+1-sc;
+ k = cval[i] + 1 - sc;
printf("To achieve the next higher rating, you need");
- printf(" %d more point",k);
- if (k==1) printf(".\n");
- else printf("s.\n");
+ printf(" %d more point", k);
+ if (k == 1)
+ printf(".\n");
+ else
+ printf("s.\n");
exit(0);
}
printf("You just went off my scale!!!\n");
exit(0);
}
-
-/* label 90 */
+/* label 90 */
void
die(int entry)
-{ int i;
- if (entry != 99)
- { rspeak(23);
- oldlc2=loc;
+{
+ int i;
+
+ if (entry != 99) {
+ rspeak(23);
+ oldlc2 = loc;
}
- if (closng) /* 99 */
- { rspeak(131);
+ if (closng) { /* 99 */
+ rspeak(131);
numdie++;
done(2);
}
- yea=yes(81+numdie*2,82+numdie*2,54);
+ yea = yes(81 + numdie * 2, 82 + numdie * 2, 54);
numdie++;
- if (numdie==maxdie || !yea) done(2);
- place[water]=0;
- place[oil]=0;
- if (toting(lamp)) prop[lamp]=0;
- for (i=100; i>=1; i--)
- { if (!toting(i)) continue;
- k=oldlc2;
- if (i==lamp) k=1;
- drop(i,k);
+ if (numdie == maxdie || !yea)
+ done(2);
+ place[water] = 0;
+ place[oil] = 0;
+ if (toting(lamp))
+ prop[lamp] = 0;
+ for (i = 100; i >= 1; i--) {
+ if (!toting(i))
+ continue;
+ k = oldlc2;
+ if (i == lamp)
+ k = 1;
+ drop(i, k);
}
- loc=3;
- oldloc=loc;
+ loc = 3;
+ oldloc = loc;
}
Oops, something went wrong.

0 comments on commit 6693db1

Please sign in to comment.