projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Back out the behavior change to magic words outside the Giant's Room.
[open-adventure.git]
/
actions.c
diff --git
a/actions.c
b/actions.c
index 4c2fcdbad111c600cfe745544de3898eb95c09f4..5d763b98c33893238615f5f83b4f42aebde8b41d 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-228,13
+228,7
@@
static phase_codes_t bigwords(vocab_t id)
}
} else {
fum:
}
} else {
fum:
- if (game.loc == LOC_GIANTROOM || settings.oldstyle) {
- rspeak(START_OVER);
- } else {
- /* This is new behavior in Open Adventure - sounds better when
- * player isn't in the Giant Room. */
- rspeak(NOTHING_HAPPENS);
- }
+ rspeak(START_OVER);
game.foobar = WORD_EMPTY;
return GO_CLEAROBJ;
}
game.foobar = WORD_EMPTY;
return GO_CLEAROBJ;
}