[Scummvm-git-logs] scummvm master -> 30f0da8660d3cc389cfdec307c526cef432d668d

dreammaster dreammaster at scummvm.org
Mon Apr 9 01:56:12 CEST 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:
30f0da8660 XEEN: Fix reading and setting character specific flags


Commit: 30f0da8660d3cc389cfdec307c526cef432d668d
    https://github.com/scummvm/scummvm/commit/30f0da8660d3cc389cfdec307c526cef432d668d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-08T19:51:50-04:00

Commit Message:
XEEN: Fix reading and setting character specific flags

Changed paths:
    engines/xeen/party.cpp
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index cb8072f..eafc026 100644
--- a/engines/xeen/party.cpp
+++ b/engines/xeen/party.cpp
@@ -1412,16 +1412,16 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
 		_gold += _vm->getRandomNumber(1, giveVal);
 		break;
 	case 103:
-		assert(takeVal < 128);
-		_worldFlags[takeVal] = true;
+		assert(giveVal < 128);
+		_worldFlags[giveVal] = true;
 		break;
 	case 104:
 		assert(giveVal < 30);
 		_questFlags[files._ccNum][giveVal] = true;
 		break;
 	case 107:
-		assert(takeVal < 24);
-		_characterFlags[ps._rosterId][takeVal] = true;
+		assert(giveVal < 24);
+		_characterFlags[ps._rosterId][giveVal] = true;
 		break;
 	default:
 		break;
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index df94845..464130b 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1829,7 +1829,7 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
 		break;
 	case 107:
 		// Get value of character flag
-		error("Unused");
+		v = party._characterFlags[ps->_rosterId][val] ? val : 0xffffffff;
 		break;
 	default:
 		break;





More information about the Scummvm-git-logs mailing list