[Scummvm-git-logs] scummvm branch-2-2 -> 26d5fa77251a16ba642c229960acd25d49fd2d7a

[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:
6558e52ca0 DRAGONS: Fixed actor dialog position
26d5fa7725 DRAGONS: Fixed missing dialog for jester in end credits Trac#11610


Commit: 6558e52ca07dda3bd295e497fc04eff7beb4deea
    https://github.com/scummvm/scummvm/commit/6558e52ca07dda3bd295e497fc04eff7beb4deea
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-09-03T23:33:29+10:00

Commit Message:
DRAGONS: Fixed actor dialog position

Changed paths:
    engines/dragons/scriptopcodes.cpp


diff --git a/engines/dragons/scriptopcodes.cpp b/engines/dragons/scriptopcodes.cpp
index 1a6caa9642..76792f7237 100644
--- a/engines/dragons/scriptopcodes.cpp
+++ b/engines/dragons/scriptopcodes.cpp
@@ -959,7 +959,7 @@ void ScriptOpcodes::opCodeActorTalk(ScriptOpCall &scriptOpCall) {
 	} else {
 		_vm->_talk->FUN_8003239c(dialog,
 								 (int)(((uint)ini->actor->_x_pos - (uint)_vm->_scene->_camera.x) * 0x10000) >> 0x13,
-								 (int)(((ini->actor->_y_pos - ini->actor->getFrameYOffset()) - (uint)_vm->_scene->_camera.y) * 0x10000) >> 0x13,
+								 (int)((((ini->actor->_y_pos - ini->actor->getFrameYOffset()) - (uint)_vm->_scene->_camera.y) * 0x10000) >> 0x13) - 3,
 								 READ_LE_INT16(_vm->_dragonOBD->getFromOpt(iniId) + 6),
 								 1,
 								 ini->actor, startSequenceId, endSequenceId, textIndex);


Commit: 26d5fa77251a16ba642c229960acd25d49fd2d7a
    https://github.com/scummvm/scummvm/commit/26d5fa77251a16ba642c229960acd25d49fd2d7a
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-09-03T23:33:40+10:00

Commit Message:
DRAGONS: Fixed missing dialog for jester in end credits Trac#11610

Changed paths:
    engines/dragons/talk.cpp


diff --git a/engines/dragons/talk.cpp b/engines/dragons/talk.cpp
index b183dcef6f..02e55f79aa 100644
--- a/engines/dragons/talk.cpp
+++ b/engines/dragons/talk.cpp
@@ -94,6 +94,7 @@ void
 Talk::FUN_8003239c(uint16 *dialog, int16 x, int16 y, int32 param_4, uint16 param_5, Actor *actor, uint16 startSequenceId,
 				   uint16 endSequenceId, uint32 textId) {
 	//TODO 0x800323a4
+	uint16 stubDialog[] = {'1', '2', '3', 0};
 
 	//TODO dragon_text_related(textId);
 	_vm->_isLoadingDialogAudio = true;
@@ -101,7 +102,7 @@ Talk::FUN_8003239c(uint16 *dialog, int16 x, int16 y, int32 param_4, uint16 param
 
 	actor->updateSequence(startSequenceId);
 	_vm->_sound->playSpeech(textId);
-	conversation_related_maybe(dialog, (int)x, (int)y, param_4 & 0xffff, (uint)param_5, textId, uVar4 & 0xffff);
+	conversation_related_maybe((*dialog != 0) ? dialog : &stubDialog[0], (int)x, (int)y, param_4 & 0xffff, (uint)param_5, textId, uVar4 & 0xffff);
 
 	actor->updateSequence(endSequenceId);
 }