From 8ca246870669d88626f0df7fbf304cec8cc51a48 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 26 Mar 2006 08:18:34 +0000 Subject: [PATCH] (gift): Fix parameter types: natid instead of int, void * for generic pointer, char * for string. --- include/prototypes.h | 2 +- src/lib/commands/load.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/prototypes.h b/include/prototypes.h index 2385440d0..57eb74396 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -63,7 +63,7 @@ extern void finish_server(void); */ extern int check_market(void); 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 want_to_abandon(struct sctstr *, i_type, int, struct lndstr *); extern int would_abandon(struct sctstr *, i_type, int, struct lndstr *); diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c index 869b4597f..44e52679a 100644 --- a/src/lib/commands/load.c +++ b/src/lib/commands/load.c @@ -319,22 +319,22 @@ lload(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) return; switch (type) { case EF_SHIP: - p = prship((struct shpstr *)ptr); + p = prship(ptr); break; case EF_PLANE: - p = prplane((struct plnstr *)ptr); + p = prplane(ptr); break; case EF_LAND: - p = prland((struct lndstr *)ptr); + p = prland(ptr); break; default: CANT_HAPPEN("bad TYPE"); -- 2.43.0