[Scummvm-cvs-logs] scummvm branch-1-8 -> ab91d179637808cbe9e4b1828c51d5bbcd207dd1
sev-
sev at scummvm.org
Mon Apr 18 08:49:06 CEST 2016
This automated email contains information about 16 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f3a6cd9b7e CONFIGURE: Fix options for GCW0
3f1c709ed1 GCW0: Remove hardcoded list of skipped engines.
917e6e0470 ALL: Split SMALL_SCREEN_DEVICE into GUI_ENABLE_KEYSDIALOG and GUI_ONLY_FULLSCREEN
0317ab63b8 GCW0: GCW0 is fullscreen-only device
fdc3db693c GCW0: Disable Timidity by default
a46303973e GCW0: Clean up build script
bdc3fce2db GCW0: Enable building with all scalers disabled
68a09fcc99 GCW0: Better bracket replacements in README
c342702368 GCW0: Redirect debug output to log
ff92bc8ddf GCW0: Split README by chapters
9106fb56fe AGOS: Added Russian Simon2 Talkie. Submitted by Dimouse
8609e53e23 SKY: Added localized quit message for Russian translation
ffb6659928 SKY: Proper support for Russian BASS
2551818573 SKY: Two more adjustments to Russian BASS
a97a35c629 NEWS: Mention GCW0 port improvements
ab91d17963 GCW0: Mention location of scummvm.log file in README
Commit: f3a6cd9b7ef6745b9d2f7c10277f122465020915
https://github.com/scummvm/scummvm/commit/f3a6cd9b7ef6745b9d2f7c10277f122465020915
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:37:13+02:00
Commit Message:
CONFIGURE: Fix options for GCW0
Changed paths:
configure
diff --git a/configure b/configure
index 33cbc83..8a781bd 100755
--- a/configure
+++ b/configure
@@ -3241,7 +3241,7 @@ esac
#
# Enable High resolution engines (>320x240) support only for backends which support it
#
-case $_backend in
+case $_host in
gcw0)
if test "$_highres" = yes ; then
_highres=yes
Commit: 3f1c709ed1bdb1b90a97cf8f424fac93c5e459f3
https://github.com/scummvm/scummvm/commit/3f1c709ed1bdb1b90a97cf8f424fac93c5e459f3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:37:14+02:00
Commit Message:
GCW0: Remove hardcoded list of skipped engines.
Now we rely on highres feature of the backends
Changed paths:
backends/platform/dingux/build.gcw0.sh
diff --git a/backends/platform/dingux/build.gcw0.sh b/backends/platform/dingux/build.gcw0.sh
index eafccb1..c1a4fa2 100755
--- a/backends/platform/dingux/build.gcw0.sh
+++ b/backends/platform/dingux/build.gcw0.sh
@@ -3,4 +3,4 @@
export PATH=/opt/gcw0-toolchain/usr/bin:$PATH
# Disable high resolution engines since we have 320x240 hardware
-./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release --disable-engine=he,mohawk,neverhood,sword1,sword2,sword25,toltecs,wintermute,zvision --disable-mt32emu --disable-hq-scalers && make -j6 gcw-opk && ls -l scummvm.opk
+./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release --disable-mt32emu --disable-hq-scalers && make -j6 gcw-opk && ls -l scummvm.opk
Commit: 917e6e04703cfbf30935f94e9575a0f607e7820f
https://github.com/scummvm/scummvm/commit/917e6e04703cfbf30935f94e9575a0f607e7820f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:38:00+02:00
Commit Message:
ALL: Split SMALL_SCREEN_DEVICE into GUI_ENABLE_KEYSDIALOG and GUI_ONLY_FULLSCREEN
Changed paths:
backends/platform/symbian/src/portdefs.h
backends/platform/wince/portdefs.h
engines/dialogs.cpp
engines/scumm/dialogs.cpp
gui/options.cpp
gui/options.h
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index f9da09d..e2465e4 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -65,7 +65,8 @@ typedef signed long int int32;
#undef remove
#endif
-#define SMALL_SCREEN_DEVICE
+#define GUI_ONLY_FULLSCREEN
+#define GUI_ENABLE_KEYSDIALOG
#define DISABLE_COMMAND_LINE
#define USE_RGB_COLOR
diff --git a/backends/platform/wince/portdefs.h b/backends/platform/wince/portdefs.h
index 3304ee0..c74fc39 100644
--- a/backends/platform/wince/portdefs.h
+++ b/backends/platform/wince/portdefs.h
@@ -30,7 +30,8 @@
// Missing string/stdlib/assert declarations for WinCE 2.xx
#if _WIN32_WCE < 300
- #define SMALL_SCREEN_DEVICE
+ #define GUI_ONLY_FULLSCREEN
+ #define GUI_ENABLE_KEYSDIALOG
void *calloc(size_t n, size_t s);
int isalnum(int c);
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index 8498e50..a21a4a8 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -43,13 +43,13 @@
#include "engines/engine.h"
#include "engines/metaengine.h"
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
#include "gui/KeysDialog.h"
#endif
class ConfigDialog : public GUI::OptionsDialog {
protected:
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
GUI::Dialog *_keysDialog;
#endif
@@ -307,14 +307,14 @@ ConfigDialog::ConfigDialog(bool subtitleControls)
new GUI::ButtonWidget(this, "GlobalConfig.Ok", _("~O~K"), 0, GUI::kOKCmd);
new GUI::ButtonWidget(this, "GlobalConfig.Cancel", _("~C~ancel"), 0, GUI::kCloseCmd);
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
new GUI::ButtonWidget(this, "GlobalConfig.Keys", _("~K~eys"), 0, kKeysCmd);
_keysDialog = NULL;
#endif
}
ConfigDialog::~ConfigDialog() {
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
delete _keysDialog;
#endif
}
@@ -323,7 +323,7 @@ void ConfigDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32
switch (cmd) {
case kKeysCmd:
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
//
// Create the sub dialog(s)
//
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 21c7428..ba9cb2a 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -52,7 +52,7 @@
#include "scumm/help.h"
#endif
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
#include "gui/KeysDialog.h"
#endif
diff --git a/gui/options.cpp b/gui/options.cpp
index ecd1607..308348e 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -72,7 +72,7 @@ enum {
kSubtitlesBoth
};
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
enum {
kChooseKeyMappingCmd = 'chma'
};
@@ -206,12 +206,12 @@ void OptionsDialog::open() {
_renderModePopUp->setSelectedTag(sel);
}
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ONLY_FULLSCREEN
_fullscreenCheckbox->setState(true);
_fullscreenCheckbox->setEnabled(false);
_aspectCheckbox->setState(false);
_aspectCheckbox->setEnabled(false);
-#else // !SMALL_SCREEN_DEVICE
+#else // !GUI_ONLY_FULLSCREEN
// Fullscreen setting
_fullscreenCheckbox->setState(ConfMan.getBool("fullscreen", _domain));
@@ -223,7 +223,7 @@ void OptionsDialog::open() {
_aspectCheckbox->setEnabled(true);
_aspectCheckbox->setState(ConfMan.getBool("aspect_ratio", _domain));
}
-#endif // SMALL_SCREEN_DEVICE
+#endif // GUI_ONLY_FULLSCREEN
}
@@ -606,7 +606,7 @@ void OptionsDialog::setGraphicSettingsState(bool enabled) {
_gfxPopUp->setEnabled(enabled);
_renderModePopUpDesc->setEnabled(enabled);
_renderModePopUp->setEnabled(enabled);
-#ifndef SMALL_SCREEN_DEVICE
+#ifndef GUI_ENABLE_KEYSDIALOG
_fullscreenCheckbox->setEnabled(enabled);
if (_guioptions.contains(GUIO_NOASPECT))
_aspectCheckbox->setEnabled(false);
@@ -1196,7 +1196,7 @@ GlobalOptionsDialog::GlobalOptionsDialog()
_autosavePeriodPopUp->appendEntry(_(savePeriodLabels[i]), savePeriodValues[i]);
}
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
new ButtonWidget(tab, "GlobalOptions_Misc.KeysButton", _("Keys"), 0, kChooseKeyMappingCmd);
#endif
@@ -1255,7 +1255,7 @@ GlobalOptionsDialog::GlobalOptionsDialog()
new ButtonWidget(this, "GlobalOptions.Cancel", _("Cancel"), 0, kCloseCmd);
new ButtonWidget(this, "GlobalOptions.Ok", _("OK"), 0, kOKCmd);
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
_keysDialog = new KeysDialog();
#endif
@@ -1265,7 +1265,7 @@ GlobalOptionsDialog::GlobalOptionsDialog()
}
GlobalOptionsDialog::~GlobalOptionsDialog() {
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
delete _keysDialog;
#endif
@@ -1509,7 +1509,7 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
}
break;
}
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
case kChooseKeyMappingCmd:
_keysDialog->runModal();
break;
diff --git a/gui/options.h b/gui/options.h
index 6f40463..294b417 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -29,7 +29,7 @@
#include "common/str.h"
#include "audio/mididrv.h"
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
#include "gui/KeysDialog.h"
#endif
@@ -210,7 +210,7 @@ public:
virtual void reflowLayout();
protected:
-#ifdef SMALL_SCREEN_DEVICE
+#ifdef GUI_ENABLE_KEYSDIALOG
KeysDialog *_keysDialog;
#endif
#ifdef USE_FLUIDSYNTH
Commit: 0317ab63b832efe3f75d809c1a94c284a9102dfe
https://github.com/scummvm/scummvm/commit/0317ab63b832efe3f75d809c1a94c284a9102dfe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:39:30+02:00
Commit Message:
GCW0: GCW0 is fullscreen-only device
Changed paths:
configure
diff --git a/configure b/configure
index 8a781bd..df0186f 100755
--- a/configure
+++ b/configure
@@ -2359,7 +2359,7 @@ case $_host_os in
echo "Could not determine prefix for static libraries"
fi
fi
-
+
# If _xcodetoolspath is not set yet use xcode-select to get the path
if test -z "$_xcodetoolspath"; then
_xcodetoolspath=`xcode-select -print-path`/Tools
@@ -2728,7 +2728,7 @@ if test -n "$_host"; then
gcw0)
_sysroot=`$CXX --print-sysroot`
_sdlpath=$_sysroot/usr/bin
- append_var DEFINES "-DDINGUX -DGCW0"
+ append_var DEFINES "-DDINGUX -DGCW0 -DGUI_ONLY_FULLSCREEN"
append_var DEFINES "-DREDUCE_MEMORY_USAGE"
append_var CXXFLAGS "-mips32"
_backend="dingux"
Commit: fdc3db693cda0a0552aa454cd659754bd65305f8
https://github.com/scummvm/scummvm/commit/fdc3db693cda0a0552aa454cd659754bd65305f8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:39:30+02:00
Commit Message:
GCW0: Disable Timidity by default
Changed paths:
configure
diff --git a/configure b/configure
index df0186f..0461c99 100755
--- a/configure
+++ b/configure
@@ -2732,17 +2732,15 @@ if test -n "$_host"; then
append_var DEFINES "-DREDUCE_MEMORY_USAGE"
append_var CXXFLAGS "-mips32"
_backend="dingux"
+ _alsa=no
_mt32emu=no
+ _seq_midi=no
+ _timidity=no
+ _build_hq_scalers=no
_optimization_level=-O3
- # Disable alsa midi to get the port build on OpenDingux toolchain
- _alsa=no
_vkeybd=yes
- _build_hq_scalers=no
_keymapper=yes
- # Force disable vorbis on dingux, it has terrible performance compared to tremor
_vorbis=no
- # Force disable seq on dingux, no way to use it and it would get enabled by default with configure
- _seq_midi=no
_port_mk="backends/platform/dingux/dingux.mk"
;;
gp2x)
Commit: a46303973eb4147d9807b00e3114dbfc5be39d57
https://github.com/scummvm/scummvm/commit/a46303973eb4147d9807b00e3114dbfc5be39d57
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:39:30+02:00
Commit Message:
GCW0: Clean up build script
Changed paths:
backends/platform/dingux/build.gcw0.sh
diff --git a/backends/platform/dingux/build.gcw0.sh b/backends/platform/dingux/build.gcw0.sh
index c1a4fa2..7a31d4f 100755
--- a/backends/platform/dingux/build.gcw0.sh
+++ b/backends/platform/dingux/build.gcw0.sh
@@ -3,4 +3,4 @@
export PATH=/opt/gcw0-toolchain/usr/bin:$PATH
# Disable high resolution engines since we have 320x240 hardware
-./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release --disable-mt32emu --disable-hq-scalers && make -j6 gcw-opk && ls -l scummvm.opk
+./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release && make -j6 gcw-opk && ls -l scummvm.opk
Commit: bdc3fce2dba3aa9f85bf3b84156de5175fd28033
https://github.com/scummvm/scummvm/commit/bdc3fce2dba3aa9f85bf3b84156de5175fd28033
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:39:30+02:00
Commit Message:
GCW0: Enable building with all scalers disabled
Changed paths:
backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
configure
diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
index 0b9cc0c..7a248f1 100644
--- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
+++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
@@ -35,6 +35,10 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
{0, 0, 0}
};
+#ifndef USE_SCALERS
+#define DownscaleAllByHalf 0
+#endif
+
DINGUXSdlGraphicsManager::DINGUXSdlGraphicsManager(SdlEventSource *boss, SdlWindow *window)
: SurfaceSdlGraphicsManager(boss, window) {
}
@@ -61,9 +65,11 @@ bool DINGUXSdlGraphicsManager::setGraphicsMode(int mode) {
case GFX_NORMAL:
newScaleFactor = 1;
break;
+#ifdef USE_SCALERS
case GFX_HALF:
newScaleFactor = 1;
break;
+#endif
default:
warning("unknown gfx mode %d", mode);
return false;
@@ -89,9 +95,11 @@ void DINGUXSdlGraphicsManager::setGraphicsModeIntern() {
case GFX_NORMAL:
newScalerProc = Normal1x;
break;
+#ifdef USE_SCALERS
case GFX_HALF:
newScalerProc = DownscaleAllByHalf;
break;
+#endif
default:
error("Unknown gfx mode %d", _videoMode.mode);
diff --git a/configure b/configure
index 0461c99..1a869cc 100755
--- a/configure
+++ b/configure
@@ -2736,7 +2736,7 @@ if test -n "$_host"; then
_mt32emu=no
_seq_midi=no
_timidity=no
- _build_hq_scalers=no
+ _build_scalers=no
_optimization_level=-O3
_vkeybd=yes
_keymapper=yes
Commit: 68a09fcc998e9b44194b81a6625858639be31e29
https://github.com/scummvm/scummvm/commit/68a09fcc998e9b44194b81a6625858639be31e29
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:40:59+02:00
Commit Message:
GCW0: Better bracket replacements in README
Changed paths:
backends/platform/dingux/dingux.mk
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index c265103..f2e087f 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -59,7 +59,7 @@ endif
echo >> $(gcw0_bundle)/README.man.txt
echo '[General README]' >> $(gcw0_bundle)/README.man.txt
echo >> $(gcw0_bundle)/README.man.txt
- cat README | sed -e 's/\[/{/g;s/\]/}/g' >> $(gcw0_bundle)/README.man.txt
+ cat README | sed -e 's/\[/⣏/g' -e 's/\]/⣹/g' >> $(gcw0_bundle)/README.man.txt
# $(CP) GeneralUser\ GS\ FluidSynth\ v1.44.sf2 $(gcw0_bundle)/
Commit: c3427023683c12c5d043290e0939db721fae9096
https://github.com/scummvm/scummvm/commit/c3427023683c12c5d043290e0939db721fae9096
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:42:07+02:00
Commit Message:
GCW0: Redirect debug output to log
Changed paths:
dists/gcw0/scummvm.sh
diff --git a/dists/gcw0/scummvm.sh b/dists/gcw0/scummvm.sh
index c12a303..7e2bbaf 100755
--- a/dists/gcw0/scummvm.sh
+++ b/dists/gcw0/scummvm.sh
@@ -6,4 +6,4 @@ if [ ! -f $HOME/.scummvmrc ] ; then
cp ./scummvmrc $HOME/.scummvmrc
fi
-exec ./scummvm
+exec ./scummvm 2>&1 >/var/tmp/scummvm.log
Commit: ff92bc8ddfd9714464eea2867b716bdd25e83ec8
https://github.com/scummvm/scummvm/commit/ff92bc8ddfd9714464eea2867b716bdd25e83ec8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:42:17+02:00
Commit Message:
GCW0: Split README by chapters
Changed paths:
backends/platform/dingux/dingux.mk
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index f2e087f..b7f700d 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -59,7 +59,8 @@ endif
echo >> $(gcw0_bundle)/README.man.txt
echo '[General README]' >> $(gcw0_bundle)/README.man.txt
echo >> $(gcw0_bundle)/README.man.txt
- cat README | sed -e 's/\[/⣏/g' -e 's/\]/⣹/g' >> $(gcw0_bundle)/README.man.txt
+ cat README | sed -e 's/\[/⟦/g' -e 's/\]/⟧/g' -e '/^1\.1)/,$$ s/^[0-9][0-9]*\.[0-9][0-9]*.*/\[&\]/' >> $(gcw0_bundle)/README.man.txt
+
# $(CP) GeneralUser\ GS\ FluidSynth\ v1.44.sf2 $(gcw0_bundle)/
Commit: 9106fb56fed9b54fea41cb4d12fbbade1e7cb50c
https://github.com/scummvm/scummvm/commit/9106fb56fed9b54fea41cb4d12fbbade1e7cb50c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:43:32+02:00
Commit Message:
AGOS: Added Russian Simon2 Talkie. Submitted by Dimouse
Changed paths:
engines/agos/detection_tables.h
diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h
index 793d408..90e5a84 100644
--- a/engines/agos/detection_tables.h
+++ b/engines/agos/detection_tables.h
@@ -2251,6 +2251,31 @@ static const AGOSGameDescription gameDescriptions[] = {
GF_TALKIE
},
+ // Simon the Sorcerer 2 - Russian DOS CD
+ {
+ {
+ "simon2",
+ "CD",
+
+ {
+ { "gsptr30", GAME_BASEFILE, "e26d162e573587f4601b88701292212c", 58851},
+ { "icon.dat", GAME_ICONFILE, "72096a62d36e6034ea9fecc13b2dbdab", 18089},
+ { "simon2.gme", GAME_GMEFILE, "9c535d403966750ae98bdaf698375a38", 19687892},
+ { "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6", 171},
+ { "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9", 513},
+ { NULL, 0, NULL, 0}
+ },
+ Common::RU_RUS,
+ Common::kPlatformDOS,
+ ADGF_CD,
+ GUIO0()
+ },
+
+ GType_SIMON2,
+ GID_SIMON2,
+ GF_TALKIE
+ },
+
// Simon the Sorcerer 2 - Czech Windows CD
{
{
Commit: 8609e53e23c235a1e28b1eb0d9038bfa4cffd343
https://github.com/scummvm/scummvm/commit/8609e53e23c235a1e28b1eb0d9038bfa4cffd343
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:43:32+02:00
Commit Message:
SKY: Added localized quit message for Russian translation
Changed paths:
engines/sky/control.cpp
engines/sky/control.h
engines/sky/sky.cpp
engines/sky/skydefs.h
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index dfdd765..e79fa6e 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -1584,7 +1584,7 @@ void Control::showGameQuitMsg() {
free(textBuf2);
}
-char Control::_quitTexts[16][35] = {
+char Control::_quitTexts[18][35] = {
"Game over player one",
"BE VIGILANT",
"Das Spiel ist aus.",
@@ -1600,7 +1600,9 @@ char Control::_quitTexts[16][35] = {
"Fim de jogo para o jogador um",
"BE VIGILANT",
"Game over player one",
- "BE VIGILANT"
+ "BE VIGILANT",
+ "Irpa okohseha, irpok 1",
+ "JYD\x96 JDITELEH"
};
uint8 Control::_crossImg[594] = {
diff --git a/engines/sky/control.h b/engines/sky/control.h
index 44591f2..2089c74 100644
--- a/engines/sky/control.h
+++ b/engines/sky/control.h
@@ -292,7 +292,7 @@ private:
ControlStatus *_statusBar;
- static char _quitTexts[16][35];
+ static char _quitTexts[18][35];
static uint8 _crossImg[594];
};
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 40b6959..710313b 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -336,6 +336,9 @@ Common::Error SkyEngine::init() {
case Common::EN_GRB:
_systemVars.language = SKY_ENGLISH;
break;
+ case Common::RU_RUS:
+ _systemVars.language = SKY_RUSSIAN;
+ break;
default:
_systemVars.language = SKY_ENGLISH;
break;
diff --git a/engines/sky/skydefs.h b/engines/sky/skydefs.h
index 167b7da..ed07a5e 100644
--- a/engines/sky/skydefs.h
+++ b/engines/sky/skydefs.h
@@ -45,6 +45,7 @@ namespace Sky {
#define SKY_ITALIAN 5
#define SKY_PORTUGUESE 6
#define SKY_SPANISH 7
+#define SKY_RUSSIAN 8
#define ST_COLLISION_BIT 5
Commit: ffb6659928d74d20581c837ac7596e8efb011e95
https://github.com/scummvm/scummvm/commit/ffb6659928d74d20581c837ac7596e8efb011e95
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:43:32+02:00
Commit Message:
SKY: Proper support for Russian BASS
Changed paths:
engines/sky/control.cpp
engines/sky/sky.cpp
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index e79fa6e..07be1c6 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -1562,8 +1562,13 @@ void Control::showGameQuitMsg() {
screenData = _skyScreen->giveCurrent();
- _skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 0], textBuf1, true, 320, 255);
- _skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 1], textBuf2, true, 320, 255);
+ if (Common::parseLanguage(ConfMan.get("language")) == Common::RU_RUS) {
+ _skyText->displayText(_quitTexts[8 * 2 + 0], textBuf1, true, 320, 255);
+ _skyText->displayText(_quitTexts[8 * 2 + 1], textBuf2, true, 320, 255);
+ } else {
+ _skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 0], textBuf1, true, 320, 255);
+ _skyText->displayText(_quitTexts[SkyEngine::_systemVars.language * 2 + 1], textBuf2, true, 320, 255);
+ }
uint8 *curLine1 = textBuf1 + sizeof(DataFileHeader);
uint8 *curLine2 = textBuf2 + sizeof(DataFileHeader);
uint8 *targetLine = screenData + GAME_SCREEN_WIDTH * 80;
diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 710313b..40b6959 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -336,9 +336,6 @@ Common::Error SkyEngine::init() {
case Common::EN_GRB:
_systemVars.language = SKY_ENGLISH;
break;
- case Common::RU_RUS:
- _systemVars.language = SKY_RUSSIAN;
- break;
default:
_systemVars.language = SKY_ENGLISH;
break;
Commit: 2551818573fc8fbe5a02393482482a3f0801edb7
https://github.com/scummvm/scummvm/commit/2551818573fc8fbe5a02393482482a3f0801edb7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:43:32+02:00
Commit Message:
SKY: Two more adjustments to Russian BASS
Changed paths:
engines/sky/control.cpp
diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index 07be1c6..9f78234 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -324,7 +324,11 @@ void Control::initPanel() {
}
void Control::buttonControl(ConResource *pButton) {
- char autoSave[] = "Restore Autosave";
+ char autoSave[50] = "Restore Autosave";
+
+ if (Common::parseLanguage(ConfMan.get("language")) == Common::RU_RUS)
+ strncpy(autoSave, "Zarpyzit/ abtocoxpahehie", 50);
+
if (pButton == NULL) {
free(_textSprite);
_textSprite = NULL;
@@ -525,8 +529,13 @@ void Control::doControlPanel() {
}
uint16 Control::handleClick(ConResource *pButton) {
- char quitDos[] = "Quit to DOS?";
- char restart[] = "Restart?";
+ char quitDos[50] = "Quit to DOS?";
+ char restart[50] = "Restart?";
+
+ if (Common::parseLanguage(ConfMan.get("language")) == Common::RU_RUS) {
+ strncpy(quitDos, "B[uti b DOC?", 50);
+ strncpy(restart, "Hobaq irpa?", 50);
+ }
switch (pButton->_onClick) {
case DO_NOTHING:
@@ -1562,7 +1571,7 @@ void Control::showGameQuitMsg() {
screenData = _skyScreen->giveCurrent();
- if (Common::parseLanguage(ConfMan.get("language")) == Common::RU_RUS) {
+ if (Common::parseLanguage(ConfMan.get("language")) == Common::RU_RUS) {
_skyText->displayText(_quitTexts[8 * 2 + 0], textBuf1, true, 320, 255);
_skyText->displayText(_quitTexts[8 * 2 + 1], textBuf2, true, 320, 255);
} else {
Commit: a97a35c629d63cbdcfc79e8e0d1a3a946dd6b6ee
https://github.com/scummvm/scummvm/commit/a97a35c629d63cbdcfc79e8e0d1a3a946dd6b6ee
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:45:41+02:00
Commit Message:
NEWS: Mention GCW0 port improvements
Changed paths:
NEWS
diff --git a/NEWS b/NEWS
index df533cd..360b8fe 100644
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,9 @@ For a more comprehensive changelog of the latest experimental code, see:
not running and allows starting those games.
- Enabled Sparkle application updater.
+GCW0 port:
+ - Improved support for built-in ScummVM documentation.
+
1.8.0 (2016-03-04)
New Games:
- Added support for Rex Nebular and the Cosmic Gender Bender.
Commit: ab91d179637808cbe9e4b1828c51d5bbcd207dd1
https://github.com/scummvm/scummvm/commit/ab91d179637808cbe9e4b1828c51d5bbcd207dd1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-18T08:47:32+02:00
Commit Message:
GCW0: Mention location of scummvm.log file in README
Changed paths:
backends/platform/dingux/README.GCW0
diff --git a/backends/platform/dingux/README.GCW0 b/backends/platform/dingux/README.GCW0
index 1875e53..1b7e30e 100644
--- a/backends/platform/dingux/README.GCW0
+++ b/backends/platform/dingux/README.GCW0
@@ -24,3 +24,12 @@ It's pretty simple if you are running Linux on an x86/amd64 machine:
3. Run backends/platform/dingux/build.gcw0.sh script
4. Copy the resulting file scummvm.opk to your device
5. Enjoy
+
+Troubleshooting
+===============
+In case you need to submit a bugreport, you may find the log file at the
+following path:
+
+ /var/tmp/scummvm.log
+
+The log file is being overwritten at every ScummVM run.
More information about the Scummvm-git-logs
mailing list