empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consistently use int for file type parameters and locals

Browse source
This commit is contained in:
Markus Armbruster 2009-12-29 13:09:01 +01:00
parent 60519b3cd0
commit c0ed527311
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/lost.h
View file

@ -56,8 +56,8 @@ struct loststr {
/* src/lib/subs/lostsub.c */ /* src/lib/subs/lostsub.c */
extern void lost_and_found(int, natid, natid, int, coord, coord); extern void lost_and_found(int, natid, natid, int, coord, coord);
extern void makelost(short, natid, short, coord, coord); extern void makelost(int, natid, short, coord, coord);
extern void makenotlost(short, natid, short, coord, coord); extern void makenotlost(int, natid, short, coord, coord);
extern void delete_old_lostitems(void); extern void delete_old_lostitems(void);
#endif #endif

4
include/prototypes.h
View file

@ -74,8 +74,8 @@ extern char *prsub(struct shpstr *);
extern int check_trade(void); extern int check_trade(void);
extern int ontradingblock(int, void *); extern int ontradingblock(int, void *);
extern void trdswitchown(int, void *, int); extern void trdswitchown(int, void *, int);
extern int do_look(short); extern int do_look(int);
extern int radar(short); extern int radar(int);
extern void update_power(void); extern void update_power(void);
extern int show_first_tel(char *); extern int show_first_tel(char *);
/* Commands */ /* Commands */

2
src/lib/commands/look.c
View file

@ -55,7 +55,7 @@ llook(void)
} }
int int
do_look(short type) do_look(int type)
{ {
int i; int i;
struct nstr_item ni; struct nstr_item ni;

2
src/lib/commands/navi.c
View file

@ -82,7 +82,7 @@ do_unit_move(struct emp_qelem *ulist, int *together,
char *pt = pathtaken; char *pt = pathtaken;
char bmap_flag; char bmap_flag;
int ac; int ac;
short type; int type;
leader = get_leader(ulist); leader = get_leader(ulist);
leader_uid = leader->uid; leader_uid = leader->uid;

2
src/lib/commands/rada.c
View file

@ -50,7 +50,7 @@ lrad(void)
} }
int int
radar(short type) radar(int type)
{ {
char *cp; char *cp;
double tf; double tf;

4
src/lib/commands/retr.c
View file

@ -51,7 +51,7 @@
static char shp_rflagsc[] = "Xitshbdu"; static char shp_rflagsc[] = "Xitshbdu";
static char lnd_rflagsc[] = "XiXXhbXX"; static char lnd_rflagsc[] = "XiXXhbXX";
static int retreat(short); static int retreat(int);
int int
retr(void) retr(void)
@ -66,7 +66,7 @@ lretr(void)
} }
static int static int
retreat(short type) retreat(int type)
{ {
char *pq, *fl; char *pq, *fl;
int nunits; int nunits;

8
src/lib/subs/lostsub.c
View file

@ -39,7 +39,7 @@
#include "misc.h" #include "misc.h"
#include "optlist.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. * 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 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; struct loststr lost;
int n; int n;
@ -72,7 +72,7 @@ makelost(short type, natid owner, short id, coord x, coord y)
} }
void 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; struct loststr lost;
int n; int n;
@ -93,7 +93,7 @@ makenotlost(short type, natid owner, short id, coord x, coord y)
* Else return -1. * Else return -1.
*/ */
static int 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; struct loststr lost;
int n; int n;