[Scummvm-git-logs] scummvm master -> 2b823d63d42973e751db5f5ff8a4efed10faa239

dreammaster dreammaster at scummvm.org
Thu Nov 16 02:36:06 CET 2017


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:
2b823d63d4 XEEN: Fix some Coverity warnings


Commit: 2b823d63d42973e751db5f5ff8a4efed10faa239
    https://github.com/scummvm/scummvm/commit/2b823d63d42973e751db5f5ff8a4efed10faa239
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-15T20:36:04-05:00

Commit Message:
XEEN: Fix some Coverity warnings

Changed paths:
    engines/xeen/interface.cpp


diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 0090a58..959252d 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -536,7 +536,7 @@ void Interface::perform() {
 			(int)party._activeParty.size() - 1 : spells._lastCaster];
 		do {
 			int spellId = CastSpell::show(_vm, c);
-			if (spellId == -1 || c == nullptr)
+			if (spellId == -1)
 				break;
 
 			result = spells.castSpell(c, (MagicSpell)spellId);
@@ -682,7 +682,7 @@ void Interface::doStepCode() {
 		break;
 	}
 
-	if (_vm->_files->_isDarkCc && party._gameFlags[374]) {
+	if (_vm->_files->_isDarkCc && party._gameFlags[1][118]) {
 		_falling = false;
 	} else {
 		if (_falling)
@@ -716,7 +716,7 @@ void Interface::startFalling(bool flag) {
 	Scripts &scripts = *_vm->_scripts;
 	bool isDarkCc = _vm->_files->_isDarkCc;
 
-	if (isDarkCc && party._gameFlags[374]) {
+	if (isDarkCc && party._gameFlags[1][118]) {
 		_falling = 0;
 		return;
 	}





More information about the Scummvm-git-logs mailing list