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

Change unit_map() not to use RET_OK and RET_FAIL as return values

Browse source 
Returning 0 and -1 is simpler.
This commit is contained in:
Markus Armbruster 2011-04-10 09:11:20 +02:00
parent a00f9e200e
commit d3004510c8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/subs/maps.c
View file

@ -92,7 +92,7 @@ do_map(int bmap, int unit_type, char *arg, char *map_flags_arg)
return RET_SYN; return RET_SYN;
break; break;
default: default:
if (unit_map(unit_type, atoi(arg), &ns, &origin)) if (unit_map(unit_type, atoi(arg), &ns, &origin) < 0)
return RET_FAIL; return RET_FAIL;
} }
@ -408,12 +408,12 @@ unit_map(int unit_type, int uid, struct nstr_sect *nsp, char *originp)
if (CANT_HAPPEN((ef_flags(unit_type) & (EFF_OWNER | EFF_XY)) if (CANT_HAPPEN((ef_flags(unit_type) & (EFF_OWNER | EFF_XY))
!= (EFF_OWNER | EFF_XY))) != (EFF_OWNER | EFF_XY)))
return RET_FAIL; return -1;
if (!get_empobj(unit_type, uid, &unit)) if (!get_empobj(unit_type, uid, &unit))
return RET_FAIL; return -1;
if (!player->owner || unit.gen.own == 0) if (!player->owner || unit.gen.own == 0)
return RET_FAIL; return -1;
if (unit_type == EF_NUKE) if (unit_type == EF_NUKE)
*originp = 'n'; *originp = 'n';
@ -428,7 +428,7 @@ unit_map(int unit_type, int uid, struct nstr_sect *nsp, char *originp)
range.hy = ynorm(unit.gen.y + 5); range.hy = ynorm(unit.gen.y + 5);
xysize_range(&range); xysize_range(&range);
snxtsct_area(nsp, &range); snxtsct_area(nsp, &range);
return RET_OK; return 0;
} }
int int