projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a57d93c
)
Remove total-ordering assumption.
author
Eric S. Raymond
<esr@thyrsus.com>
Fri, 16 Jun 2017 12:39:01 +0000
(08:39 -0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Fri, 16 Jun 2017 12:39:01 +0000
(08:39 -0400)
misc.c
patch
|
blob
|
history
diff --git
a/misc.c
b/misc.c
index b4da635737fd93aea06cd5d11c66b0c82a8dde4a..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];
- if (from
> NOWHERE
&& !SPECIAL(from))
+ if (from
!= NOWHERE && from != CARRIED
&& !SPECIAL(from))
CARRY(object,from);
DROP(object,where);
}