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

(sctoff): Oops on bad arguments. Recovery by returning -1 seems

Browse source 
dangerous.  Not touching that now.

(sctoff): Use XYOFFSET().  No functional change.
This commit is contained in:
Markus Armbruster 2007-07-28 07:08:45 +00:00
parent 6d9e78af4c
commit cc2629d6cf
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/common/xy.c
View file

@ -167,11 +167,9 @@ yabs(struct natstr *np, coord rely)
int int
sctoff(coord x, coord y) sctoff(coord x, coord y)
{ {
if ((x + y) & 01) { if (CANT_HAPPEN((x + y) & 1))
logerror("%d,%d is an invalid sector specification!\n", x, y);
return -1; return -1;
} return XYOFFSET(XNORM(x), YNORM(y));
return (YNORM(y) * WORLD_X + XNORM(x)) / 2;
} }
coord coord