[Scummvm-git-logs] scummvm master -> fb5c464572999472df0f6787fd5a1e96c130969e
dreammaster
dreammaster at scummvm.org
Sat Apr 21 01:59:42 CEST 2018
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a5395edd32 XEEN: Fix scripts scanning party inventories for an item
fb5c464572 XEEN: Fix crash attacking enemies with an Elder weapon
Commit: a5395edd325722accb752c644f76f77f96cd7065
https://github.com/scummvm/scummvm/commit/a5395edd325722accb752c644f76f77f96cd7065
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-20T19:59:09-04:00
Commit Message:
XEEN: Fix scripts scanning party inventories for an item
Changed paths:
engines/xeen/scripts.cpp
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 8c1f4a0..a354bc1 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1599,8 +1599,8 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
uint itemOffset = _vm->getGameID() == GType_Swords ? 6 : 0;
v = 0xFFFFFFFF;
if (val < (82 + itemOffset)) {
- for (int idx = 0; idx < 9; ++idx) {
- if (val == (35 + itemOffset)) {
+ for (int idx = 0; idx < INV_ITEMS_TOTAL; ++idx) {
+ if (val < (35 + itemOffset)) {
if (ps->_weapons[idx]._id == val) {
v = val;
break;
Commit: fb5c464572999472df0f6787fd5a1e96c130969e
https://github.com/scummvm/scummvm/commit/fb5c464572999472df0f6787fd5a1e96c130969e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-20T19:59:35-04:00
Commit Message:
XEEN: Fix crash attacking enemies with an Elder weapon
Changed paths:
engines/xeen/combat.cpp
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 0e1dc9a..3aff7ec 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1452,9 +1452,9 @@ void Combat::attack2(int damage, RangeType rangeType) {
intf.draw3d(true);
sound.stopSound();
- File powVoc(Common::String::format("pow%d.voc",
- POW_WEAPON_VOCS[_attackWeaponId]));
- sound.playFX(60 + POW_WEAPON_VOCS[_attackWeaponId]);
+ int powNum = (_attackWeaponId > XEEN_SLAYER_SWORD) ? 0 : POW_WEAPON_VOCS[_attackWeaponId];
+ File powVoc(Common::String::format("pow%d.voc", powNum));
+ sound.playFX(60 + powNum);
sound.playSound(powVoc, 1);
if (monster._hp > damage) {
More information about the Scummvm-git-logs
mailing list