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

(empobj_chr): New, create a new (imcomplete) structure for

Browse source 
empobj characteristics.
(get_empobj_chr):  Update get_empobj_chr() to use new
struct empobj_chr.
This commit is contained in:
Ron Koenderink 2006-08-18 23:32:45 +00:00
parent a9a9957a27
commit ebf588b713
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/empobj.h
View file

@ -84,10 +84,12 @@ union empobj_storage {
struct trtstr treaty; struct trtstr treaty;
}; };
struct empobj_chr;
extern char *obj_nameof(struct empobj *gp); extern char *obj_nameof(struct empobj *gp);
extern struct empobj *get_empobjp(int type, int id); extern struct empobj *get_empobjp(int type, int id);
extern int put_empobj(struct empobj *gp); 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 char *emp_obj_chr_name(struct empobj *gp);
extern int get_empobj_mob_max(int type); extern int get_empobj_mob_max(int type);

12
src/lib/common/empobj.c
View file

@ -81,20 +81,20 @@ put_empobj(struct empobj *gp)
} }
} }
void * struct empobj_chr *
get_empobj_chr(struct empobj *gp) get_empobj_chr(struct empobj *gp)
{ {
switch (gp->ef_type) { switch (gp->ef_type) {
case EF_LAND: case EF_LAND:
return &lchr[(int)gp->type]; return (struct empobj_chr *)&lchr[(int)gp->type];
case EF_SHIP: case EF_SHIP:
return &mchr[(int)gp->type]; return (struct empobj_chr *)&mchr[(int)gp->type];
case EF_PLANE: case EF_PLANE:
return &plchr[(int)gp->type]; return (struct empobj_chr *)&plchr[(int)gp->type];
case EF_NUKE: case EF_NUKE:
return &nchr[(int)gp->type]; return (struct empobj_chr *)&nchr[(int)gp->type];
case EF_SECTOR: case EF_SECTOR:
return &dchr[(int)gp->type]; return (struct empobj_chr *)&dchr[(int)gp->type];
} }
CANT_REACH(); CANT_REACH();
return NULL; return NULL;