projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added 'linty' target for make
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index b4da635737fd93aea06cd5d11c66b0c82a8dde4a..978e4b61aefb51cfee18d33d7d4a08638f6a8d2f 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-45,7
+45,7
@@
void packed_to_token(long packed, char token[6])
/* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
/* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
-void newspeak(char* msg)
+void newspeak(c
onst c
har* msg)
{
// Do nothing if we got a null pointer.
if (msg == NULL)
{
// Do nothing if we got a null pointer.
if (msg == NULL)
@@
-337,12
+337,6
@@
long VOCAB(long id, long init)
BUG(21);
}
BUG(21);
}
-void DSTROY(long object)
-/* Permanently eliminate "object" by moving to a non-existent location. */
-{
- MOVE(object,0);
-}
-
void JUGGLE(long object)
/* Juggle an object by picking it up and putting it down again, the purpose
* being to get the object to the front of the chain of things at its loc. */
void JUGGLE(long object)
/* Juggle an object by picking it up and putting it down again, the purpose
* being to get the object to the front of the chain of things at its loc. */
@@
-367,7
+361,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
> NOWHERE
&& !SPECIAL(from))
+ if (from
!= NOWHERE && from != CARRIED
&& !SPECIAL(from))
CARRY(object,from);
DROP(object,where);
}
CARRY(object,from);
DROP(object,where);
}