projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove total-ordering assumption.
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index 243381a86330d1df2221b4f3ee6975b8b5cd6b34..e9b5c84e18c083819f1f9bca8ad67e5f9c34e94b 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-367,7
+367,7
@@
void MOVE(long object, long where)
from=game.fixed[object-NOBJECTS];
else
from=game.place[object];
from=game.fixed[object-NOBJECTS];
else
from=game.place[object];
- if (from
> 0
&& !SPECIAL(from))
+ if (from
!= NOWHERE && from != CARRIED
&& !SPECIAL(from))
CARRY(object,from);
DROP(object,where);
}
CARRY(object,from);
DROP(object,where);
}
@@
-388,9
+388,9
@@
void CARRY(long object, long where)
long temp;
if (object <= NOBJECTS) {
long temp;
if (object <= NOBJECTS) {
- if (game.place[object] ==
-1
)
+ if (game.place[object] ==
CARRIED
)
return;
return;
- game.place[object]
= -1
;
+ game.place[object]
= CARRIED
;
++game.holdng;
}
if (game.atloc[where] == object) {
++game.holdng;
}
if (game.atloc[where] == object) {
@@
-412,7
+412,7
@@
void DROP(long object, long where)
game.fixed[object-NOBJECTS] = where;
else
{
game.fixed[object-NOBJECTS] = where;
else
{
- if (game.place[object] ==
-1
)
+ if (game.place[object] ==
CARRIED
)
--game.holdng;
game.place[object] = where;
}
--game.holdng;
game.place[object] = where;
}