[Scummvm-git-logs] scummvm master -> 1b8e8bbd2bc37a6b44bd7f984dc450823443bd95

dreammaster noreply at scummvm.org
Mon Feb 7 06:14:01 UTC 2022


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:
1b8e8bbd2b XEEN: Fix showing Darkstone Tower SE statue text in auto notes


Commit: 1b8e8bbd2bc37a6b44bd7f984dc450823443bd95
    https://github.com/scummvm/scummvm/commit/1b8e8bbd2bc37a6b44bd7f984dc450823443bd95
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-02-06T22:13:45-08:00

Commit Message:
XEEN: Fix showing Darkstone Tower SE statue text in auto notes

Changed paths:
    engines/xeen/party.cpp
    engines/xeen/party.h
    engines/xeen/patcher.cpp


diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index d43e329d0b8..0d847786051 100644
--- a/engines/xeen/party.cpp
+++ b/engines/xeen/party.cpp
@@ -243,7 +243,7 @@ Party::Party(XeenEngine *vm) {
 
 	Common::fill(&_gameFlags[0][0], &_gameFlags[0][256], false);
 	Common::fill(&_gameFlags[1][0], &_gameFlags[1][256], false);
-	Common::fill(&_worldFlags[0], &_worldFlags[128], false);
+	Common::fill(&_worldFlags[0], &_worldFlags[129], false);
 	Common::fill(&_questFlags[0], &_questFlags[60], false);
 	Common::fill(&_questItems[0], &_questItems[85], 0);
 
@@ -1458,7 +1458,7 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
 		_gold += _vm->getRandomNumber(1, giveVal);
 		break;
 	case 103:
-		assert(giveVal < (uint)(_vm->getGameID() == GType_Swords ? 49 : 128));
+		assert(giveVal < (uint)(_vm->getGameID() == GType_Swords ? 49 : 129));
 		_worldFlags[giveVal] = true;
 		break;
 	case 104:
diff --git a/engines/xeen/party.h b/engines/xeen/party.h
index 2193a1b1171..b9b9e803892 100644
--- a/engines/xeen/party.h
+++ b/engines/xeen/party.h
@@ -223,7 +223,7 @@ public:
 	int _totalTime;
 	bool _rested;
 	bool _gameFlags[2][256];
-	bool _worldFlags[128];
+	bool _worldFlags[129];
 	bool _questFlags[60];
 	int _questItems[TOTAL_QUEST_ITEMS];
 	bool _characterFlags[30][32];
diff --git a/engines/xeen/patcher.cpp b/engines/xeen/patcher.cpp
index c7bc3fc4828..f0ebcc5bfae 100644
--- a/engines/xeen/patcher.cpp
+++ b/engines/xeen/patcher.cpp
@@ -44,7 +44,7 @@ struct ObjectEntry {
 
 static const byte DS_MAP54_LINE8[] = { 8, 10, 10, DIR_EAST, 8, OP_MoveWallObj, 20, 100, 100 };
 static const byte SW_MAP53_LINE8[] = { 5, 14, 6, DIR_EAST, 8, OP_Exit };
-static const byte DS_MAP116[] = { 9, 10, 6, 4, 2, OP_TakeOrGive, 0, 0, 103, 127 };
+static const byte DS_MAP116[] = { 9, 10, 6, 4, 2, OP_TakeOrGive, 0, 0, 103, 128 };
 static const byte DS_MAP62_PIT1[] = { 9, 11, 8, DIR_ALL, 4, OP_FallToMap, 61, 11, 8, 0 };
 static const byte DS_MAP62_PIT2[] = { 9, 7, 4, DIR_ALL, 4, OP_FallToMap, 61, 7, 4, 0 };
 




More information about the Scummvm-git-logs mailing list