Consistently use int for file type parameters and locals

diff --git a/include/lost.h b/include/lost.h
index d30f8e856b0399308b81ad06f081dbaf4adc2fae..a7fd65428002199f8f6492c404df889b57725892 100644 (file)
--- a/include/lost.h
+++ b/include/lost.h
@@ -56,8 +56,8 @@ struct loststr {
 
 /* src/lib/subs/lostsub.c */
 extern void lost_and_found(int, natid, natid, int, coord, coord);
-extern void makelost(short, natid, short, coord, coord);
-extern void makenotlost(short, natid, short, coord, coord);
+extern void makelost(int, natid, short, coord, coord);
+extern void makenotlost(int, natid, short, coord, coord);
 extern void delete_old_lostitems(void);
 
 #endif

diff --git a/include/prototypes.h b/include/prototypes.h
index fee4e3f65121ea6eaf465a0aabe2ac7a09fe1efd..7b13524200bbac9bada405e00789236e863ab3e3 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -74,8 +74,8 @@ extern char *prsub(struct shpstr *);
 extern int check_trade(void);
 extern int ontradingblock(int, void *);
 extern void trdswitchown(int, void *, int);
-extern int do_look(short);
-extern int radar(short);
+extern int do_look(int);
+extern int radar(int);
 extern void update_power(void);
 extern int show_first_tel(char *);
 /* Commands */

diff --git a/src/lib/commands/look.c b/src/lib/commands/look.c
index f0952a3df55a9aede58dc6235586d853507fe414..5be2269b9252e26d33efadc69ddd93d929984bfb 100644 (file)
--- a/src/lib/commands/look.c
+++ b/src/lib/commands/look.c
@@ -55,7 +55,7 @@ llook(void)
 }
 
 int
-do_look(short type)
+do_look(int type)
 {
     int i;
     struct nstr_item ni;

diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index 1e2ec5d702db7f050e07896c09f47f0e22b9cb95..92754afa2c7fae301bfea88616fa7ec954432eca 100644 (file)
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -82,7 +82,7 @@ do_unit_move(struct emp_qelem *ulist, int *together,
     char *pt = pathtaken;
     char bmap_flag;
     int ac;
-    short type;
+    int type;
 
     leader = get_leader(ulist);
     leader_uid = leader->uid;

diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c
index cfe6ad06efc33219002a85e38507b458996ccd31..29831ad31245fa841997194f2c2909871c504253 100644 (file)
--- a/src/lib/commands/rada.c
+++ b/src/lib/commands/rada.c
@@ -50,7 +50,7 @@ lrad(void)
 }
 
 int
-radar(short type)
+radar(int type)
 {
     char *cp;
     double tf;

diff --git a/src/lib/commands/retr.c b/src/lib/commands/retr.c
index b5b39c160559fb4652497a23fca87a2f1bd7c717..a192f1f66cb6990572dc0bea107be782d48da5ba 100644 (file)
--- a/src/lib/commands/retr.c
+++ b/src/lib/commands/retr.c
@@ -51,7 +51,7 @@
 static char shp_rflagsc[] = "Xitshbdu";
 static char lnd_rflagsc[] = "XiXXhbXX";
 
-static int retreat(short);
+static int retreat(int);
 
 int
 retr(void)
@@ -66,7 +66,7 @@ lretr(void)
 }
 
 static int
-retreat(short type)
+retreat(int type)
 {
     char *pq, *fl;
     int nunits;

diff --git a/src/lib/subs/lostsub.c b/src/lib/subs/lostsub.c
index a2dd9d9df1171bd06afa3138684281d8cada4cb8..aa13fb560efaca29b7424a3e416a44a5a33da37f 100644 (file)
--- a/src/lib/subs/lostsub.c
+++ b/src/lib/subs/lostsub.c
@@ -39,7 +39,7 @@
 #include "misc.h"
 #include "optlist.h"
 
-static int findlost(short, natid, short, coord, coord, int);
+static int findlost(int, natid, short, coord, coord, int);
 
 /*
  * Record item ID of type TYPE changed owner from EXOWN to OWN at X, Y.
@@ -56,7 +56,7 @@ lost_and_found(int type, natid exown, natid own, int id, coord x, coord y)
 }
 
 void
-makelost(short type, natid owner, short id, coord x, coord y)
+makelost(int type, natid owner, short id, coord x, coord y)
 {
     struct loststr lost;
     int n;
@@ -72,7 +72,7 @@ makelost(short type, natid owner, short id, coord x, coord y)
 }
 
 void
-makenotlost(short type, natid owner, short id, coord x, coord y)
+makenotlost(int type, natid owner, short id, coord x, coord y)
 {
     struct loststr lost;
     int n;
@@ -93,7 +93,7 @@ makenotlost(short type, natid owner, short id, coord x, coord y)
  * Else return -1.
  */
 static int
-findlost(short type, natid owner, short id, coord x, coord y, int free)
+findlost(int type, natid owner, short id, coord x, coord y, int free)
 {
     struct loststr lost;
     int n;