[Scummvm-git-logs] scummvm master -> 6a3e1297d1e4b661b34807b3967d4f7360b39157
dreammaster
dreammaster at scummvm.org
Fri Mar 23 03:11:08 CET 2018
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6a3e1297d1 XEEN: Fix conditions that prevent characters doing actions
Commit: 6a3e1297d1e4b661b34807b3967d4f7360b39157
https://github.com/scummvm/scummvm/commit/6a3e1297d1e4b661b34807b3967d4f7360b39157
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-22T22:11:02-04:00
Commit Message:
XEEN: Fix conditions that prevent characters doing actions
Changed paths:
engines/xeen/character.cpp
diff --git a/engines/xeen/character.cpp b/engines/xeen/character.cpp
index 4fd1c32..810c765 100644
--- a/engines/xeen/character.cpp
+++ b/engines/xeen/character.cpp
@@ -454,12 +454,12 @@ bool Character::noActions() {
Condition condition = worstCondition();
switch (condition) {
- case CURSED:
- case POISONED:
- case DISEASED:
- case INSANE:
- case IN_LOVE:
- case DRUNK: {
+ case ASLEEP:
+ case PARALYZED:
+ case UNCONSCIOUS:
+ case DEAD:
+ case STONED:
+ case ERADICATED: {
Common::String msg = Common::String::format(Res.IN_NO_CONDITION, _name.c_str());
ErrorScroll::show(Party::_vm, msg,
Party::_vm->_mode == 17 ? WT_LOC_WAIT : WT_NONFREEZED_WAIT);
More information about the Scummvm-git-logs
mailing list