projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
After splitting out the stop field, nothing ever negates a travel opcode...
[open-adventure.git]
/
misc.c
diff --git
a/misc.c
b/misc.c
index 906834291e7cca0b21c894e26913178889f75cf2..f05e51883c5e55dbab1a323f73e15cca6149e2b5 100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-41,18
+41,6
@@
void packed_to_token(long packed, char token[6])
}
}
}
}
-void token_to_packed(char token[6], long* packed)
-{
- *packed = 0;
- for (size_t i = 0; i < 5; ++i)
- {
- if (token[4 - i] == '\0')
- continue;
- char mapped = ascii_to_advent[(int) token[4 - i]];
- *packed |= (mapped << (6 * i));
- }
-}
-
/* Hide the fact that wods are corrently packed longs */
bool wordeq(token_t a, token_t b)
/* Hide the fact that wods are corrently packed longs */
bool wordeq(token_t a, token_t b)
@@
-172,16
+160,16
@@
void pspeak(vocab_t msg, enum speaktype mode, int skip, ...)
va_start(ap, skip);
switch (mode) {
case touch:
va_start(ap, skip);
switch (mode) {
case touch:
- vspeak(object
_description
s[msg].inventory, ap);
+ vspeak(objects[msg].inventory, ap);
break;
case look:
break;
case look:
- vspeak(object
_description
s[msg].longs[skip], ap);
+ vspeak(objects[msg].longs[skip], ap);
break;
case hear:
break;
case hear:
- vspeak(object
_description
s[msg].sounds[skip], ap);
+ vspeak(objects[msg].sounds[skip], ap);
break;
case study:
break;
case study:
- vspeak(object
_description
s[msg].texts[skip], ap);
+ vspeak(objects[msg].texts[skip], ap);
break;
}
va_end(ap);
break;
}
va_end(ap);