projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mostly confine assumptions about what token_t is to misc.c
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index 33ec95ba0b96e6af01ae87c54c23fb3663e4b4f1..ba834fdffd44b84cef98268a2e2cbadc8dea63b2 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-50,6
+50,23
@@
void packed_to_token(long packed, char token[6])
}
}
}
}
+/* Hide the fact that wods are corrently packed longs */
+
+bool wordeq(token_t a, token_t b)
+{
+ return a == b;
+}
+
+bool wordempty(token_t a)
+{
+ return a == 0;
+}
+
+void wordclear(token_t *v)
+{
+ *v = 0;
+}
+
/* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
void speak(const char* msg)
/* I/O routines (SPEAK, PSPEAK, RSPEAK, SETPRM, GETIN, YES) */
void speak(const char* msg)
@@
-417,7
+434,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 && from != CARRIED && !SPECIAL(from))
+ if (from !=
LOC_
NOWHERE && from != CARRIED && !SPECIAL(from))
CARRY(object, from);
DROP(object, where);
}
CARRY(object, from);
DROP(object, where);
}
@@
-660,8
+677,8
@@
void DATIME(long* d, long* t)
void bug(enum bugtype num, const char *error_string)
{
void bug(enum bugtype num, const char *error_string)
{
- fprintf(stderr, "Fatal error %d, %s.\n", num, error_string);
- exit(EXIT_FAILURE);
+
fprintf(stderr, "Fatal error %d, %s.\n", num, error_string);
+
exit(EXIT_FAILURE);
}
/* end */
}
/* end */