[Scummvm-git-logs] scummvm master -> 63313fe2475d70d64d448a14da36a19ea7b12d43

aquadran noreply at scummvm.org
Mon Oct 28 13:17:35 UTC 2024


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:
63313fe247 WINTERMUTE: CID 1003778


Commit: 63313fe2475d70d64d448a14da36a19ea7b12d43
    https://github.com/scummvm/scummvm/commit/63313fe2475d70d64d448a14da36a19ea7b12d43
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-28T14:17:30+01:00

Commit Message:
WINTERMUTE: CID 1003778

Changed paths:
    engines/wintermute/ad/ad_game.cpp


diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index f279be0b8d3..2a1558d0954 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -2034,7 +2034,7 @@ bool AdGame::resetResponse(int id) {
 
 	for (uint32 i = 0; i < _responsesGame.size(); i++) {
 		if (_responsesGame[i]->_id == id) {
-			if ((context == nullptr && _responsesGame[i]->getContext() == nullptr) || scumm_stricmp(context, _responsesGame[i]->getContext()) == 0) {
+			if ((context == nullptr && _responsesGame[i]->getContext() == nullptr) || (context != nullptr && scumm_stricmp(context, _responsesGame[i]->getContext()) == 0)) {
 				delete _responsesGame[i];
 				_responsesGame.remove_at(i);
 				break;
@@ -2044,7 +2044,7 @@ bool AdGame::resetResponse(int id) {
 
 	for (uint32 i = 0; i < _responsesBranch.size(); i++) {
 		if (_responsesBranch[i]->_id == id) {
-			if ((context == nullptr && _responsesBranch[i]->getContext() == nullptr) || scumm_stricmp(context, _responsesBranch[i]->getContext()) == 0) {
+			if ((context == nullptr && _responsesBranch[i]->getContext() == nullptr) || (context != nullptr && scumm_stricmp(context, _responsesBranch[i]->getContext()) == 0)) {
 				delete _responsesBranch[i];
 				_responsesBranch.remove_at(i);
 				break;




More information about the Scummvm-git-logs mailing list