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

[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:
a542c025ad SWORD2: Added support for Spanish demo. Fixes #11396
bea2dbd1bf NEWS: Mention Sword2 Spanish support


Commit: a542c025ad9a040226cf424c5ff91de429fb21c9
    https://github.com/scummvm/scummvm/commit/a542c025ad9a040226cf424c5ff91de429fb21c9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-09-02T14:42:34+02:00

Commit Message:
SWORD2: Added support for Spanish demo. Fixes #11396

Changed paths:
    engines/sword2/controls.cpp
    engines/sword2/sword2.cpp
    engines/sword2/sword2.h


diff --git a/engines/sword2/controls.cpp b/engines/sword2/controls.cpp
index 8d80d599b4..46e9e98f58 100644
--- a/engines/sword2/controls.cpp
+++ b/engines/sword2/controls.cpp
@@ -905,10 +905,10 @@ OptionsDialog::OptionsDialog(Sword2Engine *vm) : Dialog(vm) {
 	_mixer = _vm->_mixer;
 
 	_panel = new Widget(this, 1);
-	_panel->createSurfaceImages(3405, 0, 40);
+	_panel->createSurfaceImages(3405, (_vm->_features & GF_SPANISHDEMO) ? 45 : 0, 40);
 
 	_objectLabelsSwitch = new Switch(this, 304, 100, 53, 32);
-	_objectLabelsSwitch->createSurfaceImages(3687, 304, 100);
+	_objectLabelsSwitch->createSurfaceImages((_vm->_features & GF_SPANISHDEMO) ? 901 : 3687, 304, 100);
 
 	_subtitlesSwitch = new Switch(this, 510, 100, 53, 32);
 	_subtitlesSwitch->linkSurfaceImages(_objectLabelsSwitch, 510, 100);
@@ -1179,7 +1179,7 @@ SaveRestoreDialog::SaveRestoreDialog(Sword2Engine *vm, int mode) : Dialog(vm) {
 	_fr2 = new FontRendererGui(_vm, _vm->_redFontId);
 
 	_panel = new Widget(this, 1);
-	_panel->createSurfaceImages(2016, 0, 40);
+	_panel->createSurfaceImages(2016, (_vm->_features & GF_SPANISHDEMO) ? 84 : 0, 40);
 
 	for (i = 0; i < 4; i++) {
 		_slotButton[i] = new Slot(this, 114, 0, 384, 36);
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index a882710a73..a939d82783 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -70,6 +70,7 @@ static const GameSettings sword2_settings[] = {
 	{"sword2psx", "Broken Sword II: The Smoking Mirror (PlayStation)", 0, "screens.clu"},
 	{"sword2psxdemo", "Broken Sword II: The Smoking Mirror (PlayStation/Demo)", Sword2::GF_DEMO, "screens.clu"},
 	{"sword2demo", "Broken Sword II: The Smoking Mirror (Demo)", Sword2::GF_DEMO, "players.clu" },
+	{"sword2demo-es", "Broken Sword II: The Smoking Mirror (Spanish/Demo)", Sword2::GF_DEMO | Sword2::GF_SPANISHDEMO, "vielogo.tga" },
 	{NULL, NULL, 0, NULL}
 };
 
@@ -316,6 +317,8 @@ Sword2Engine::Sword2Engine(OSystem *syst) : Engine(syst), _rnd("sword2") {
 
 	if (!scumm_stricmp(ConfMan.get("gameid").c_str(), "sword2demo") || !scumm_stricmp(ConfMan.get("gameid").c_str(), "sword2psxdemo"))
 		_features = GF_DEMO;
+	else if (!scumm_stricmp(ConfMan.get("gameid").c_str(), "sword2demo-es"))
+		_features = GF_DEMO | GF_SPANISHDEMO;
 	else
 		_features = 0;
 
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index 64536ff208..681c8603db 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -56,7 +56,8 @@ class OSystem;
 namespace Sword2 {
 
 enum {
-	GF_DEMO	= 1 << 0
+	GF_DEMO	       = 1 << 0,
+	GF_SPANISHDEMO = 1 << 1
 };
 
 class MemoryManager;


Commit: bea2dbd1bf545dee7f293743da393b5d7fa1e35a
    https://github.com/scummvm/scummvm/commit/bea2dbd1bf545dee7f293743da393b5d7fa1e35a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-09-02T14:42:44+02:00

Commit Message:
NEWS: Mention Sword2 Spanish support

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index db3c09977d..4dbbebbc7b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -97,6 +97,9 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Added support for localized menus in Novy Disk Russian Trilogy release.
    - Added support for Spanish playable Demo available from our website.
 
+ Sword2:
+   - Added support for Spanish playable Demo available from our website.
+
  Titanic:
    - Fixed Barbot crash after asking what else he needs.