diff --git a/include/lost.h b/include/lost.h index a7fd6542..1f81eb78 100644 --- 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 b0959663..0079367c 100644 --- 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 e5ba1ebf..0cd73c1d 100644 --- 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 aa13fb56..f09ef96b 100644 --- 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;