[Scummvm-git-logs] scummvm master -> d958287e841f88d414b958ababff6ef439628910

[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:
5745c0d09e FULLPIPE: Beginnings of support of Russian demo
d958287e84 QUEEN: Improved Russian fonts


Commit: 5745c0d09ecae7d895e73f3aeb1bfb47ebbb0c9e
    https://github.com/scummvm/scummvm/commit/5745c0d09ecae7d895e73f3aeb1bfb47ebbb0c9e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-11T00:08:40+01:00

Commit Message:
FULLPIPE: Beginnings of support of Russian demo

Changed paths:
    engines/fullpipe/modal.cpp
    engines/fullpipe/stateloader.cpp


diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 6202ad8..8c94f60 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -225,7 +225,9 @@ void ModalIntro::update() {
 }
 
 void ModalIntro::finish() {
-	g_fp->_gameLoader->unloadScene(SC_INTRO2);
+	if (!(g_fp->getFeatures() & ADGF_DEMO && g_fp->getLanguage() == Common::RU_RUS)) {
+		g_fp->_gameLoader->unloadScene(SC_INTRO2);
+
 	g_fp->_currentScene = g_fp->accessScene(SC_INTRO1);
 	g_fp->_gameLoader->preloadScene(SC_INTRO1, TrubaDown);
 
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 4861699..05305a4 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -27,6 +27,8 @@
 #include "common/list.h"
 #include "common/memstream.h"
 
+#include "engines/advancedDetector.h"
+
 #include "graphics/thumbnail.h"
 
 #include "fullpipe/objects.h"
@@ -333,8 +335,13 @@ bool FullpipeEngine::loadGam(const char *fname, int scene) {
 			_gameLoader->loadScene(SC_INTRO1);
 			_gameLoader->gotoScene(SC_INTRO1, TrubaUp);
 		} else {
-			_gameLoader->loadScene(SC_1);
-			_gameLoader->gotoScene(SC_1, TrubaLeft);
+			if (g_fp->getFeatures() & ADGF_DEMO && g_fp->getLanguage() == Common::RU_RUS) {
+				_gameLoader->loadScene(SC_9);
+				_gameLoader->gotoScene(SC_9, TrubaDown);
+			} else {
+				_gameLoader->loadScene(SC_1);
+				_gameLoader->gotoScene(SC_1, TrubaLeft);
+			}
 		}
 	}
 


Commit: d958287e841f88d414b958ababff6ef439628910
    https://github.com/scummvm/scummvm/commit/d958287e841f88d414b958ababff6ef439628910
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-11T00:08:40+01:00

Commit Message:
QUEEN: Improved Russian fonts

Changed paths:
    engines/queen/display.cpp


diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp
index b2213f7..0611381 100644
--- a/engines/queen/display.cpp
+++ b/engines/queen/display.cpp
@@ -1625,7 +1625,7 @@ const uint8 Display::_fontRussian[] = {
 	0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x7c, 0xee, 0xc6, 0xfe, 0xfe, 0x00,
 	0x38, 0x6c, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0xfc, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xfc, 0x00,
 	0xfc, 0xc6, 0xc6, 0xfc, 0xc6, 0xc6, 0xfc, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00,
-	0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0xfe, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xfe, 0x00,
+	0x1e, 0x26, 0x66, 0x66, 0x66, 0x66, 0xff, 0x00, 0xfe, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xfe, 0x00,
 	0xd6, 0xd6, 0xd6, 0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x7c, 0xc6, 0x06, 0x1c, 0x06, 0xc6, 0x7c, 0x00,
 	0xc6, 0xc6, 0xce, 0xde, 0xf6, 0xe6, 0xc6, 0x00, 0xd6, 0xd6, 0xc6, 0xce, 0xde, 0xf6, 0xe6, 0x00,
 	0xc6, 0xcc, 0xd8, 0xf0, 0xd8, 0xcc, 0xc6, 0x00, 0x3c, 0x66, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00,
@@ -1633,7 +1633,7 @@ const uint8 Display::_fontRussian[] = {
 	0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00,
 	0xfc, 0xc6, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00,
 	0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x7c, 0x00,
-	0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x00, 0xc6, 0xc6, 0x6c, 0x38, 0x6c, 0xc6, 0xc6, 0x00,
+	0x7c, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x00, 0xc6, 0xc6, 0x6c, 0x38, 0x6c, 0xc6, 0xc6, 0x00,
 	0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xff, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x00,
 	0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xfe, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xff, 0x01,
 	0xe0, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xf6, 0xde, 0xde, 0xf6, 0x00,