[Scummvm-git-logs] scummvm master -> 0a20df925912bf76c0f49c70f8e9a7e1979f374a

dreammaster dreammaster at scummvm.org
Tue Mar 20 02:00:46 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:
0a20df9259 XEEN: Fix setSpeedTable crash after missed ranged attack


Commit: 0a20df925912bf76c0f49c70f8e9a7e1979f374a
    https://github.com/scummvm/scummvm/commit/0a20df925912bf76c0f49c70f8e9a7e1979f374a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-19T21:00:37-04:00

Commit Message:
XEEN: Fix setSpeedTable crash after missed ranged attack

Changed paths:
    engines/xeen/combat.cpp


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 044b650..6c337c1 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1114,7 +1114,9 @@ void Combat::setSpeedTable() {
 	}
 
 	if (hasSpeed) {
-		if (_whosSpeed >= (int)_speedTable.size() || _speedTable[_whosSpeed] != oldSpeed) {
+		if (_speedTable.empty()) {
+			_whosSpeed = 0;
+		} else if (_whosSpeed >= (int)_speedTable.size() || _speedTable[_whosSpeed] != oldSpeed) {
 			for (_whosSpeed = 0; _whosSpeed < (int)charSpeeds.size(); ++_whosSpeed) {
 				if (oldSpeed == _speedTable[_whosSpeed])
 					break;





More information about the Scummvm-git-logs mailing list