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

pointer, char * for string.

diff --git a/include/prototypes.h b/include/prototypes.h
index 2385440d05b0f05fa35a97cbe47b6e549a5b5a58..57eb74396bf58436569c1c753fa93d409dfc9b6a 100644 (file)
--- 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 869b4597f94ce00e99b8b8b2e7db38d5c8cbbd7b..44e52679aa5dffdc1e34824a56a5bccb99e20daa 100644 (file)
--- 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");