From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Fri, 18 Aug 2006 23:32:45 +0000 (+0000)
Subject: (empobj_chr): New, create a new (imcomplete) structure for
X-Git-Tag: v4.3.8~21
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=ebf588b71370f1bf70159f62f6cbc26806ccf06d

(empobj_chr): New, create a new (imcomplete) structure for
empobj characteristics.
(get_empobj_chr):  Update get_empobj_chr() to use new
struct empobj_chr.
---

diff --git a/include/empobj.h b/include/empobj.h
index a7b2e947c..19184a656 100644
--- a/include/empobj.h
+++ b/include/empobj.h
@@ -84,10 +84,12 @@ union empobj_storage {
     struct trtstr treaty;
 };
 
+struct empobj_chr;
+
 extern char *obj_nameof(struct empobj *gp);
 extern struct empobj *get_empobjp(int type, int id);
 extern int put_empobj(struct empobj *gp);
-extern void *get_empobj_chr(struct empobj *gp);
+extern struct empobj_chr *get_empobj_chr(struct empobj *gp);
 extern char *emp_obj_chr_name(struct empobj *gp);
 extern int get_empobj_mob_max(int type);
 
diff --git a/src/lib/common/empobj.c b/src/lib/common/empobj.c
index 214310646..b53c330b5 100644
--- a/src/lib/common/empobj.c
+++ b/src/lib/common/empobj.c
@@ -81,20 +81,20 @@ put_empobj(struct empobj *gp)
     }
 }
 
-void *
+struct empobj_chr *
 get_empobj_chr(struct empobj *gp)
 {
     switch (gp->ef_type) {
     case EF_LAND:
-	return &lchr[(int)gp->type];
+	return (struct empobj_chr *)&lchr[(int)gp->type];
     case EF_SHIP:
-	return &mchr[(int)gp->type];
+	return (struct empobj_chr *)&mchr[(int)gp->type];
     case EF_PLANE:
-	return &plchr[(int)gp->type];
+	return (struct empobj_chr *)&plchr[(int)gp->type];
     case EF_NUKE:
-	return &nchr[(int)gp->type];
+	return (struct empobj_chr *)&nchr[(int)gp->type];
     case EF_SECTOR:
-	return &dchr[(int)gp->type];
+	return (struct empobj_chr *)&dchr[(int)gp->type];
     }
     CANT_REACH();
     return NULL;