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

(gift): Fix parameter types: natid instead of int, void * for generic

Browse source 
pointer, char * for string.
This commit is contained in:
Markus Armbruster 2006-03-26 08:18:34 +00:00
parent a6843eeba6
commit 8ca2468706
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -63,7 +63,7 @@ extern void finish_server(void);
*/ */
extern int check_market(void); extern int check_market(void);
extern int sendmessage(struct natstr *, struct natstr *, char *message, int); extern int sendmessage(struct natstr *, struct natstr *, char *message, int);
extern void gift(int, int, s_char *, int, s_char *); extern void gift(natid, natid, void *, int, char *);
extern int display_mark(i_type, int); extern int display_mark(i_type, int);
extern int want_to_abandon(struct sctstr *, i_type, int, struct lndstr *); extern int want_to_abandon(struct sctstr *, i_type, int, struct lndstr *);
extern int would_abandon(struct sctstr *, i_type, int, struct lndstr *); extern int would_abandon(struct sctstr *, i_type, int, struct lndstr *);

10
src/lib/commands/load.c
View file

@ -319,22 +319,22 @@ lload(void)
} }
void void
gift(int givee, int giver, s_char *ptr, int type, s_char *mesg) gift(natid givee, natid giver, void *ptr, int type, char *mesg)
{ {
s_char *p; char *p;
if (giver == givee) if (giver == givee)
return; return;
switch (type) { switch (type) {
case EF_SHIP: case EF_SHIP:
p = prship((struct shpstr *)ptr); p = prship(ptr);
break; break;
case EF_PLANE: case EF_PLANE:
p = prplane((struct plnstr *)ptr); p = prplane(ptr);
break; break;
case EF_LAND: case EF_LAND:
p = prland((struct lndstr *)ptr); p = prland(ptr);
break; break;
default: default:
CANT_HAPPEN("bad TYPE"); CANT_HAPPEN("bad TYPE");