Fixed numerous compiler warnings

actors.c

@@ -7,8 +7,7 @@
 #include "funcs.h"
 #include "vars.h"
 
-logical aappli_(ri)
-integer ri;
+logical aappli_(integer ri)
 {
     /* System generated locals */
     logical ret_val;

ballop.c

@@ -7,8 +7,7 @@
 #include "funcs.h"
 #include "vars.h"
 
-logical ballop_(arg)
-integer arg;
+logical ballop_(integer arg)
 {
     /* System generated locals */
     logical ret_val;

clockr.c

@@ -10,8 +10,7 @@
 static void litint_ P((integer, integer *, integer, const integer *,
 		       integer));
 
-void cevapp_(ri)
-integer ri;
+void cevapp_(integer ri)
 {
     /* Initialized data */
 
@@ -763,12 +762,7 @@ integer ri;
 
 /* DECLARATIONS */
 
-static void litint_(obj, ctr, cev, ticks, tickln)
-integer obj;
-integer *ctr;
-integer cev;
-const integer *ticks;
-integer tickln;
+static void litint_(integer obj, integer *ctr, integer cev, const integer *ticks, integer tickln)
 {
     /* Parameter adjustments */
     --ticks;

demons.c

@@ -175,12 +175,7 @@ void fightd_()
 
 /* DECLARATIONS */
 
-integer blow_(h, v, rmk, hflg, out)
-integer h;
-integer v;
-integer rmk;
-logical hflg;
-integer out;
+integer blow_(integer h, integer v, integer rmk, logical hflg, integer out)
 {
     /* Initialized data */
 
@@ -581,8 +576,7 @@ void swordd_()
 /* INFEST-	SUBROUTINE TO TEST FOR INFESTED ROOM */
 
 /* DECLARATIONS */
-static logical infest_(r)
-integer r;
+static logical infest_(integer r)
 {
     /* System generated locals */
     logical ret_val;

dgame.c

@@ -205,8 +205,7 @@ void game_()
 
 /* DECLARATIONS */
 
-static void xendmv_(flag)
-logical flag;
+static void xendmv_(logical flag)
 {
     /* Local variables */
     logical f;
@@ -241,8 +240,7 @@ logical flag;
 
 /* DECLARATIONS */
 
-static logical xvehic_(n)
-integer n;
+static logical xvehic_(integer n)
 {
     /* System generated locals */
     logical ret_val;

dinit.c

@@ -26,7 +26,9 @@ FILE *dbfile;
 #ifdef unix
 #define TEXTFILE "/usr/games/lib/dunlib/dtextc.dat"
 #else /* ! unix */
- I need a definition for TEXTFILE
+/* I need a definition for TEXTFILE */
+/* Defaulting to the unix location to handle the error */
+#define TEXTFILE "/usr/games/lib/dunlib/dtextc.dat"
 #endif /* ! unix */
 #endif /* ! __AMOS__ */
 #endif /* ! TEXTFILE */
@@ -43,10 +45,7 @@ FILE *dbfile;
 
 /* Read a number of two byte integers from the index file */
 
-static void rdints(c, pi, indxfile)
-integer c;
-integer *pi;
-FILE *indxfile;
+static void rdints( integer c, integer *pi, FILE *indxfile)
 {
     integer ch;	/* Local variable for rdint */
 
@@ -58,10 +57,7 @@ FILE *indxfile;
  * pairs.
  */
 
-static void rdpartialints(c, pi, indxfile)
-integer c;
-integer *pi;
-FILE *indxfile;
+static void rdpartialints(integer c, integer *pi, FILE *indxfile)
 {
     integer ch;	/* Local variable for rdint */
 
@@ -85,10 +81,7 @@ FILE *indxfile;
 
 /* Read a number of one byte flags from the index file */
 
-static void rdflags(c, pf, indxfile)
-integer c;
-logical *pf;
-FILE *indxfile;
+static void rdflags(integer c, logical *pf, FILE *indxfile)
 {
     while (c-- != 0)
 	*pf++ = getc(indxfile);

dmain.c

@@ -10,9 +10,7 @@
 #include "funcs.h"
 #include "vars.h"
 
-void main(argc, argv)
-int argc;
-char **argv;
+int main(int argc, char **argv)
 {
 /* 1) INITIALIZE DATA STRUCTURES */
 /* 2) PLAY GAME */
@@ -22,5 +20,6 @@ char **argv;
     }
 /* 						!IF INIT, PLAY GAME. */
     exit_();
+    return 0;
 /* 						!DONE */
-} /* MAIN__ */
+} /* MAIN__ */

dso1.c

@@ -7,9 +7,7 @@
 #include "funcs.h"
 #include "vars.h"
 
-void princr_(full, rm)
-logical full;
-integer rm;
+void princr_(logical full, integer rm)
 {
     /* System generated locals */
     integer i__1, i__2;
@@ -96,8 +94,7 @@ integer rm;
 
 /* DECLARATIONS */
 
-void invent_(adv)
-integer adv;
+void invent_(integer adv)
 {
     /* System generated locals */
     integer i__1;
@@ -158,9 +155,7 @@ integer adv;
 
 /* DECLARATIONS */
 
-void princo_(obj, desc)
-integer obj;
-integer desc;
+void princo_(integer obj, integer desc)
 {
     /* System generated locals */
     integer i__1;

dso2.c

@@ -8,9 +8,7 @@
 #include "funcs.h"
 #include "vars.h"
 
-logical moveto_(nr, who)
-integer nr;
-integer who;
+logical moveto_(integer nr, integer who)
 {
     /* System generated locals */
     logical ret_val;
@@ -94,8 +92,7 @@ integer who;
 
 /* DECLARATIONS */
 
-void score_(flg)
-logical flg;
+void score_(logical flg)
 {
     /* Initialized data */
 
@@ -162,8 +159,7 @@ logical flg;
 
 /* DECLARATIONS */
 
-void scrupd_(n)
-integer n;
+void scrupd_(integer n)
 {
     if (findex_1.endgmf) {
 	goto L100;

dso3.c

@@ -8,9 +8,7 @@
 #include "funcs.h"
 #include "vars.h"
 
-logical findxt_(dir, rm)
-integer dir;
-integer rm;
+logical findxt_(integer dir, integer rm)
 {
     /* System generated locals */
     logical ret_val;
@@ -70,13 +68,7 @@ integer rm;
 
 /* DECLARATIONS */
 
-integer fwim_(f1, f2, rm, con, adv, nocare)
-integer f1;
-integer f2;
-integer rm;
-integer con;
-integer adv;
-logical nocare;
+integer fwim_(integer f1, integer f2, integer rm, integer con, integer adv, logical nocare)
 {
     /* System generated locals */
     integer ret_val, i__1, i__2;
@@ -160,10 +152,7 @@ logical nocare;
 
 /* 	YES-IS-TRUE=YESNO(QUESTION,YES-STRING,NO-STRING) */
 
-logical yesno_(q, y, n)
-integer q;
-integer y;
-integer n;
+logical yesno_(integer q, integer y, integer n)
 {
     /* System generated locals */
     logical ret_val;

dso4.c

@@ -7,11 +7,7 @@
 #include "funcs.h"
 #include "vars.h"
 
-integer robadv_(adv, nr, nc, na)
-integer adv;
-integer nr;
-integer nc;
-integer na;
+integer robadv_(integer adv, integer nr, integer nc, integer na)
 {
     /* System generated locals */
     integer ret_val, i__1;
@@ -40,12 +36,7 @@ integer na;
 
 /* DECLARATIONS */
 
-integer robrm_(rm, pr, nr, nc, na)
-integer rm;
-integer pr;
-integer nr;
-integer nc;
-integer na;
+integer robrm_(integer rm, integer pr, integer nr, integer nc, integer na)
 {
     /* System generated locals */
     integer ret_val, i__1, i__2;
@@ -91,9 +82,7 @@ integer na;
 
 /* DECLARATIONS */
 
-logical winnin_(vl, hr)
-integer vl;
-integer hr;
+logical winnin_(integer vl, integer hr)
 {
     /* System generated locals */
     logical ret_val;
@@ -138,9 +127,7 @@ integer hr;
 
 /* DECLARATIONS */
 
-integer fights_(h, flg)
-integer h;
-logical flg;
+integer fights_(integer h, logical flg)
 {
     /* Initialized data */
 
@@ -162,8 +149,7 @@ logical flg;
 
 /* DECLARATIONS */
 
-integer vilstr_(v)
-integer v;
+integer vilstr_(integer v)
 {
     /* System generated locals */
     integer ret_val, i__1, i__2, i__3;

dso5.c

@@ -7,8 +7,7 @@
 
 /* GTTIME-- GET TOTAL TIME PLAYED */
 
-void gttime_(t)
-integer *t;
+void gttime_(integer *t)
 {
     integer h, m, s;
 
@@ -25,10 +24,7 @@ integer *t;
 
 /* DECLARATIONS */
 
-logical opncls_(obj, so, sc)
-integer obj;
-integer so;
-integer sc;
+logical opncls_(integer obj, integer so, integer sc)
 {
     /* System generated locals */
     integer i__1;
@@ -77,8 +73,7 @@ integer sc;
 
 /* DECLARATIONS */
 
-logical lit_(rm)
-integer rm;
+logical lit_(integer rm)
 {
     /* System generated locals */
     integer i__1, i__2;
@@ -144,10 +139,7 @@ integer rm;
 
 /* DECLARATIONS */
 
-integer weight_(rm, cn, ad)
-integer rm;
-integer cn;
-integer ad;
+integer weight_(integer rm, integer cn, integer ad)
 {
     /* System generated locals */
     integer ret_val, i__1;

dso6.c

@@ -7,9 +7,7 @@
 #include "funcs.h"
 #include "vars.h"
 
-logical ghere_(obj, rm)
-integer obj;
-integer rm;
+logical ghere_(integer obj, integer rm)
 {
     /* System generated locals */
     logical ret_val;
@@ -130,8 +128,7 @@ integer rm;
 
 /* DECLARATIONS */
 
-integer mrhere_(rm)
-integer rm;
+integer mrhere_(integer rm)
 {
     /* System generated locals */
     integer ret_val, i__1;