aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/combat.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2018-03-17 07:12:01 -0400
committerPaul Gilbert2018-03-17 07:12:01 -0400
commit902c984cf5c367d9bfb1d8cdfac4fb887b921d3e (patch)
tree40dd163c02b013f7b448ac1afc41e07dfc6992d4 /engines/xeen/combat.cpp
parent637dedeb9acbd0c024a84f8d1b6fc04f33ceeacc (diff)
downloadscummvm-rg350-902c984cf5c367d9bfb1d8cdfac4fb887b921d3e.tar.gz
scummvm-rg350-902c984cf5c367d9bfb1d8cdfac4fb887b921d3e.tar.bz2
scummvm-rg350-902c984cf5c367d9bfb1d8cdfac4fb887b921d3e.zip
XEEN: Fix crash setting up combat speed table for new games
Diffstat (limited to 'engines/xeen/combat.cpp')
-rw-r--r--engines/xeen/combat.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 6c293bc36d..6422b7284f 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1116,7 +1116,7 @@ void Combat::setSpeedTable() {
}
if (hasSpeed) {
- if (_speedTable[_whosSpeed] != oldSpeed) {
+ if (_whosSpeed >= (int)_speedTable.size() || _speedTable[_whosSpeed] != oldSpeed) {
for (_whosSpeed = 0; _whosSpeed < (int)charSpeeds.size(); ++_whosSpeed) {
if (oldSpeed == _speedTable[_whosSpeed])
break;