projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ready for 1.5 release.
[open-adventure.git]
/
main.c
diff --git
a/main.c
b/main.c
index 5cdbcc48e488047da5f7feea1e62b0f7f34e5c4e..198a4ccb55868c4505fd9dfb8252392bd0fcd664 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1089,10
+1089,10
@@
Lclearobj:
#ifdef BROKEN
/* Handling of actionless object followed by objectless action */
#ifdef BROKEN
/* Handling of actionless object followed by objectless action */
- if (preserve.
type1 == OBJECT && preserve.type2 == NO_WORD_TYPE && command.id2 == 0
)
+ if (preserve.
word[0].type == OBJECT && preserve.word[1].type == NO_WORD_TYPE && command.word[1].id == 0 && command.word[0].id == CARRY
)
command.obj = preserve.obj;
command.obj = preserve.obj;
-#endif
-
+#endif
/* BROKEN */
+
++game.turns;
if (closecheck()) {
++game.turns;
if (closecheck()) {
@@
-1179,6
+1179,10
@@
Lookup:
command.verb = command.word[0].id;
break;
case NUMERIC: // LCOV_EXCL_LINE
command.verb = command.word[0].id;
break;
case NUMERIC: // LCOV_EXCL_LINE
+ if (!settings.oldstyle) {
+ sspeak(DONT_KNOW, command.word[0].raw);
+ goto Lclearobj;
+ }
default: // LCOV_EXCL_LINE
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
}
default: // LCOV_EXCL_LINE
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
}