projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Eliminate magic numbers from C side of condition handling.
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index cef36519e82e5d9d250da92e4784373b234f8461..e9d833e30ef3d547bd741ff927f4fba104282316 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-571,7
+571,8
@@
void move(obj_t object, loc_t where)
from = game.fixed[object - NOBJECTS];
else
from = game.place[object];
from = game.fixed[object - NOBJECTS];
else
from = game.place[object];
- if (from != LOC_NOWHERE && from != CARRIED && !SPECIAL(from))
+ /* (ESR) Used to check for !SPECIAL(from). I *think* that was wrong... */
+ if (from != LOC_NOWHERE && from != CARRIED)
carry(object, from);
drop(object, where);
}
carry(object, from);
drop(object, where);
}