[Scummvm-git-logs] scummvm master -> 5e888a601efca23f8abf64e50b816288b61675af

[sev-]

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:
5e2381eff9 DRAGONS: Improve error messages
5e888a601e DRAGONS: Add detection and support for Russian version


Commit: 5e2381eff9b08315b2242cb3fd878bbb1c16a344
    https://github.com/scummvm/scummvm/commit/5e2381eff9b08315b2242cb3fd878bbb1c16a344
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-09-13T01:06:47+02:00

Commit Message:
DRAGONS: Improve error messages

Changed paths:
    engines/dragons/dragons.cpp


diff --git a/engines/dragons/dragons.cpp b/engines/dragons/dragons.cpp
index c7d988e41d..ef23f9de7f 100644
--- a/engines/dragons/dragons.cpp
+++ b/engines/dragons/dragons.cpp
@@ -1496,7 +1496,7 @@ uint32 DragonsEngine::getBigFileInfoTblFromDragonEXE() {
 	case Common::DE_DEU : return 0x4b054;
 	case Common::FR_FRA : return 0x4b250;
 	default :
-		error("Unable to get speech table offset from dragon.exe for %s", getLanguageCode(_language));
+		error("Unable to get bigfile info table offset from dragon.exe for %s", getLanguageCode(_language));
 	}
 }
 
@@ -1507,7 +1507,7 @@ uint32 DragonsEngine::getCutscenePaletteOffsetFromDragonEXE() {
 	case Common::DE_DEU : return 0x541d8;
 	case Common::FR_FRA : return 0x543d4;
 	default :
-		error("Unable to get speech table offset from dragon.exe for %s", getLanguageCode(_language));
+		error("Unable to get cutscene palette table offset from dragon.exe for %s", getLanguageCode(_language));
 	}
 }
 
@@ -1518,7 +1518,7 @@ uint32 DragonsEngine::defaultResponseOffsetFromDragonEXE() {
 	case Common::DE_DEU : return 0x55020;
 	case Common::FR_FRA : return 0x5521c;
 	default :
-		error("Unable to get speech table offset from dragon.exe for %s", getLanguageCode(_language));
+		error("Unable to get response offset table offset from dragon.exe for %s", getLanguageCode(_language));
 	}
 }
 


Commit: 5e888a601efca23f8abf64e50b816288b61675af
    https://github.com/scummvm/scummvm/commit/5e888a601efca23f8abf64e50b816288b61675af
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-09-13T01:06:47+02:00

Commit Message:
DRAGONS: Add detection and support for Russian version

Changed paths:
    engines/dragons/detection.cpp
    engines/dragons/dragons.cpp


diff --git a/engines/dragons/detection.cpp b/engines/dragons/detection.cpp
index 7c12a8873b..245eaf0984 100644
--- a/engines/dragons/detection.cpp
+++ b/engines/dragons/detection.cpp
@@ -87,6 +87,24 @@ static const DragonsGameDescription gameDescriptions[] = {
 			},
 			kGameIdDragons
 	},
+	// Russian localization by Russian Versions
+	{
+			{
+					"dragons",
+					0,
+					{
+						{"bigfile.dat", 0, "02c26712bee57266f28235fdc0207725", 44990464},
+						{"dtspeech.xa", 0, "7f7ace860e5dd3696b51eace20215274", 182138880},
+						AD_LISTEND
+					},
+					Common::RU_RUS,
+					Common::kPlatformPSX,
+					ADGF_DROPPLATFORM,
+					GUIO0()
+			},
+			kGameIdDragons
+	},
+
 
 	// BAD EXTRACTIONS
 	{
diff --git a/engines/dragons/dragons.cpp b/engines/dragons/dragons.cpp
index ef23f9de7f..fb4af3a02d 100644
--- a/engines/dragons/dragons.cpp
+++ b/engines/dragons/dragons.cpp
@@ -1464,7 +1464,8 @@ void DragonsEngine::updatePaletteCycling() {
 
 uint32 DragonsEngine::getFontOffsetFromDragonEXE() {
 	switch (_language) {
-	case Common::EN_USA : return 0x4a144;
+	case Common::EN_USA :
+	case Common::RU_RUS : return 0x4a144;
 	case Common::EN_GRB : return 0x4b4fc;
 	case Common::DE_DEU : return 0x4af5c;
 	case Common::FR_FRA : return 0x4b158;
@@ -1474,7 +1475,8 @@ uint32 DragonsEngine::getFontOffsetFromDragonEXE() {
 
 uint32 DragonsEngine::getSpeechTblOffsetFromDragonEXE() {
 	switch (_language) {
-	case Common::EN_USA : return 0x4e138;
+	case Common::EN_USA :
+	case Common::RU_RUS : return 0x4e138;
 	case Common::EN_GRB : return 0x4f4f4;
 	case Common::DE_DEU : return 0x4f0a4;
 	case Common::FR_FRA : return 0x4f2a0;
@@ -1483,7 +1485,7 @@ uint32 DragonsEngine::getSpeechTblOffsetFromDragonEXE() {
 }
 
 uint16 DragonsEngine::getBigFileTotalRecords() {
-	if (_language == Common::EN_USA || _language == Common::EN_GRB) {
+	if (_language == Common::EN_USA || _language == Common::EN_GRB || _language == Common::RU_RUS) {
 		return 576;
 	}
 	return 588;
@@ -1491,7 +1493,8 @@ uint16 DragonsEngine::getBigFileTotalRecords() {
 
 uint32 DragonsEngine::getBigFileInfoTblFromDragonEXE() {
 	switch (_language) {
-	case Common::EN_USA : return 0x4a238;
+	case Common::EN_USA :
+	case Common::RU_RUS : return 0x4a238;
 	case Common::EN_GRB : return 0x4b5f4;
 	case Common::DE_DEU : return 0x4b054;
 	case Common::FR_FRA : return 0x4b250;
@@ -1502,7 +1505,8 @@ uint32 DragonsEngine::getBigFileInfoTblFromDragonEXE() {
 
 uint32 DragonsEngine::getCutscenePaletteOffsetFromDragonEXE() {
 	switch (_language) {
-	case Common::EN_USA : return 0x5336c;
+	case Common::EN_USA :
+	case Common::RU_RUS : return 0x5336c;
 	case Common::EN_GRB : return 0x54628;
 	case Common::DE_DEU : return 0x541d8;
 	case Common::FR_FRA : return 0x543d4;
@@ -1513,7 +1517,8 @@ uint32 DragonsEngine::getCutscenePaletteOffsetFromDragonEXE() {
 
 uint32 DragonsEngine::defaultResponseOffsetFromDragonEXE() {
 	switch (_language) {
-	case Common::EN_USA : return 0x541b0;
+	case Common::EN_USA :
+	case Common::RU_RUS : return 0x541b0;
 	case Common::EN_GRB : return 0x55470;
 	case Common::DE_DEU : return 0x55020;
 	case Common::FR_FRA : return 0x5521c;