[Scummvm-git-logs] scummvm branch-2-2 -> d2307ca8a66c6f6ec177cbda66ff6644cd64bd68

[yuv422]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
350e5c8c8b DRAGONS: Fix cursor when selecting bag in non-english versions. Trac#11612
d2307ca8a6 DRAGONS: Fixed loading screen text in non-english versions Trac#11614


Commit: 350e5c8c8b499d0d47d759a8bfcdda6f4ead5baa
    https://github.com/scummvm/scummvm/commit/350e5c8c8b499d0d47d759a8bfcdda6f4ead5baa
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-09-01T23:50:49+10:00

Commit Message:
DRAGONS: Fix cursor when selecting bag in non-english versions. Trac#11612

Changed paths:
    engines/dragons/cursor.cpp
    engines/dragons/cursor.h
    engines/dragons/dragons.cpp
    engines/dragons/dragons.h


diff --git a/engines/dragons/cursor.cpp b/engines/dragons/cursor.cpp
index 10ae008340..d58809912c 100644
--- a/engines/dragons/cursor.cpp
+++ b/engines/dragons/cursor.cpp
@@ -41,6 +41,7 @@ Cursor::Cursor(DragonsEngine *vm): _vm(vm), _actor(0), _x(0), _y(0) {
 	_objectInHandSequenceID = 0;
 	_cursorActivationSeqOffset = 0;
 	_iniItemInHand = 0;
+	_handPointerSequenceID = _vm->getCursorHandPointerSequenceID();
 }
 
 void Cursor::init(ActorManager *actorManager, DragonINIResource *dragonINIResource) {
@@ -84,22 +85,22 @@ void Cursor::update() {
 	if (_iniUnderCursor != 0
 			&& ((_iniUnderCursor & 0x8000 && _vm->_inventory->isOpen())
 			||(!(_iniUnderCursor & 0x8000) && _vm->getINI(_iniUnderCursor - 1)->flags & 0x80))) {
-		if (_actor->_sequenceID != 0x84) {
-			_actor->updateSequence(0x84);
+		if (_actor->_sequenceID != _handPointerSequenceID) {
+			_actor->updateSequence(_handPointerSequenceID);
 		}
 		return;
 	}
 	int32 inventorySequenceID = _vm->_inventory->getSequenceId();
 	if ((_iniUnderCursor == 0x8001) && (inventorySequenceID == 1)) {
-		if (_actor->_sequenceID != 0x84) {
-			_actor->updateSequence(0x84);
+		if (_actor->_sequenceID != _handPointerSequenceID) {
+			_actor->updateSequence(_handPointerSequenceID);
 		}
 		return;
 	}
 
 	if (_iniUnderCursor == 0x8002 && inventorySequenceID == 4) {//goto LAB_80028204;
-		if (_actor->_sequenceID != 0x84) {
-			_actor->updateSequence(0x84);
+		if (_actor->_sequenceID != _handPointerSequenceID) {
+			_actor->updateSequence(_handPointerSequenceID);
 		}
 		return;
 	}
@@ -125,8 +126,8 @@ void Cursor::update() {
 	}
 
 	if (_iniItemInHand == 0) {
-		if (_actor->_sequenceID != 0x84) {
-			_actor->updateSequence(0x84);
+		if (_actor->_sequenceID != _handPointerSequenceID) {
+			_actor->updateSequence(_handPointerSequenceID);
 		}
 		return;
 	} else {
diff --git a/engines/dragons/cursor.h b/engines/dragons/cursor.h
index 9c83d8f635..7b5ee9f337 100644
--- a/engines/dragons/cursor.h
+++ b/engines/dragons/cursor.h
@@ -43,6 +43,7 @@ public:
 	int16 _objectInHandSequenceID;
 	int16 _cursorActivationSeqOffset;
 	uint16 _iniItemInHand;
+	uint16 _handPointerSequenceID;
 
 private:
 	DragonsEngine *_vm;
diff --git a/engines/dragons/dragons.cpp b/engines/dragons/dragons.cpp
index 1fb05730c7..80d7872d12 100644
--- a/engines/dragons/dragons.cpp
+++ b/engines/dragons/dragons.cpp
@@ -1805,6 +1805,10 @@ void DragonsEngine::syncSoundSettings() {
 	_sound->syncSoundSettings();
 }
 
+uint16 DragonsEngine::getCursorHandPointerSequenceID() {
+	return _language == Common::DE_DEU || _language == Common::FR_FRA ? 0x86 : 0x84;
+}
+
 void (*DragonsEngine::getSceneUpdateFunction())() {
 	return _sceneUpdateFunction;
 }
diff --git a/engines/dragons/dragons.h b/engines/dragons/dragons.h
index cabdd9170a..f175cf1848 100644
--- a/engines/dragons/dragons.h
+++ b/engines/dragons/dragons.h
@@ -358,6 +358,7 @@ public:
 	uint32 getSpeechTblOffsetFromDragonEXE();
 	uint32 getCutscenePaletteOffsetFromDragonEXE();
 	uint32 defaultResponseOffsetFromDragonEXE();
+	uint16 getCursorHandPointerSequenceID();
 private:
 	bool savegame(const char *filename, const char *description);
 	bool loadgame(const char *filename);


Commit: d2307ca8a66c6f6ec177cbda66ff6644cd64bd68
    https://github.com/scummvm/scummvm/commit/d2307ca8a66c6f6ec177cbda66ff6644cd64bd68
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-09-01T23:51:09+10:00

Commit Message:
DRAGONS: Fixed loading screen text in non-english versions Trac#11614

Changed paths:
    engines/dragons/dragons.cpp


diff --git a/engines/dragons/dragons.cpp b/engines/dragons/dragons.cpp
index 80d7872d12..44c370e50d 100644
--- a/engines/dragons/dragons.cpp
+++ b/engines/dragons/dragons.cpp
@@ -1695,6 +1695,17 @@ void DragonsEngine::loadingScreen() {
 	actor->setFlag(ACTOR_FLAG_200);
 	actor->setFlag(ACTOR_FLAG_80);
 
+	if (_language == Common::DE_DEU || _language == Common::FR_FRA) {
+		actor = _actorManager->loadActor(0,0x84,0,0,6);
+		actor->setFlag(ACTOR_FLAG_100);
+		actor->setFlag(ACTOR_FLAG_200);
+		actor->setFlag(ACTOR_FLAG_80);
+		actor = _actorManager->loadActor(0,0x85,0,0,6);
+		actor->setFlag(ACTOR_FLAG_100);
+		actor->setFlag(ACTOR_FLAG_200);
+		actor->setFlag(ACTOR_FLAG_80);
+	}
+
 	for (int i = 0; i < 10; i++) {
 		actor = _actorManager->loadActor(0,flamesActorOffset[(i % 4)] + 0x7e,i * 0x20 + 0x10,0xbe,6);
 		actor->setFlag(ACTOR_FLAG_100);