archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Magic-number elimination.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-16 07:00:57 -04:00
parent 1b5ab6c808
commit a57d93ce35
6 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
misc.c
View file

@ -367,7 +367,7 @@ void MOVE(long object, long where)
from=game.fixed[object-NOBJECTS];
else
from=game.place[object];
if (from > 0 && !SPECIAL(from))
if (from > NOWHERE && !SPECIAL(from))
CARRY(object,from);
DROP(object,where);
}
@ -388,9 +388,9 @@ void CARRY(long object, long where)
long temp;
if (object <= NOBJECTS) {
if (game.place[object] == -1)
if (game.place[object] == CARRIED)
return;
game.place[object]= -1;
game.place[object] = CARRIED;
++game.holdng;
}
if (game.atloc[where] == object) {
@ -412,7 +412,7 @@ void DROP(long object, long where)
game.fixed[object-NOBJECTS] = where;
else
{
if (game.place[object] == -1)
if (game.place[object] == CARRIED)
--game.holdng;
game.place[object] = where;
}