Consistently use int for sector and unit uid parameters

diff --git a/include/lost.h b/include/lost.h
index a7fd65428002199f8f6492c404df889b57725892..1f81eb78dd98faad67d6705c8e1cd9396b82ee5b 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(int, natid, short, coord, coord);
-extern void makenotlost(int, natid, short, coord, coord);
+extern void makelost(int, natid, int, coord, coord);
+extern void makenotlost(int, natid, int, coord, coord);
 extern void delete_old_lostitems(void);
 
 #endif

diff --git a/include/plane.h b/include/plane.h
index b09596631a03249611c00c791dfa95f2337ad8c2..0079367c3f60e0948efe574a7dfcdbf643281083 100644 (file)
--- a/include/plane.h
+++ b/include/plane.h
@@ -166,8 +166,8 @@ extern void ac_encounter(struct emp_qelem *, struct emp_qelem *, coord,
                         coord, char *, int);
 
 /* src/lib/subs/aswplnsubs.c */
-extern int on_shiplist(short, struct shiplist *);
-extern void add_shiplist(short, struct shiplist **);
+extern int on_shiplist(int, struct shiplist *);
+extern void add_shiplist(int, struct shiplist **);
 extern void free_shiplist(struct shiplist **);
 extern void print_shiplist(struct shiplist *);
 

diff --git a/src/lib/subs/aswplnsubs.c b/src/lib/subs/aswplnsubs.c
index e5ba1ebfa02223f52ab9474278b5189bcb8b8abf..0cd73c1dec870de7c74a057d9bdef62d440845c3 100644 (file)
--- a/src/lib/subs/aswplnsubs.c
+++ b/src/lib/subs/aswplnsubs.c
@@ -41,7 +41,7 @@
 #include "ship.h"
 
 int
-on_shiplist(short uid, struct shiplist *head)
+on_shiplist(int uid, struct shiplist *head)
 {
     struct shiplist *s;
 
@@ -55,7 +55,7 @@ on_shiplist(short uid, struct shiplist *head)
 }
 
 void
-add_shiplist(short uid, struct shiplist **head)
+add_shiplist(int uid, struct shiplist **head)
 {
     struct shiplist *s, *s2;
 

diff --git a/src/lib/subs/lostsub.c b/src/lib/subs/lostsub.c
index aa13fb560efaca29b7424a3e416a44a5a33da37f..f09ef96b3a615f881509131347959e888da3993d 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(int, natid, short, coord, coord, int);
+static int findlost(int, natid, int, 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(int type, natid owner, short id, coord x, coord y)
+makelost(int type, natid owner, int id, coord x, coord y)
 {
     struct loststr lost;
     int n;
@@ -72,7 +72,7 @@ makelost(int type, natid owner, short id, coord x, coord y)
 }
 
 void
-makenotlost(int type, natid owner, short id, coord x, coord y)
+makenotlost(int type, natid owner, int id, coord x, coord y)
 {
     struct loststr lost;
     int n;
@@ -93,7 +93,7 @@ makenotlost(int type, natid owner, short id, coord x, coord y)
  * Else return -1.
  */
 static int
-findlost(int type, natid owner, short id, coord x, coord y, int free)
+findlost(int type, natid owner, int id, coord x, coord y, int free)
 {
     struct loststr lost;
     int n;