- simon : russian support

- simon : remove obsolete const
- scumm : oldScaleTable support

svn-id: r15072

4 files changed, 146 insertions, 22 deletions

diff --git a/backends/PalmOS/Src/builder/enum_globals.h b/backends/PalmOS/Src/builder/enum_globals.h
index 5175e9e6e8..5a2dd34a14 100644
--- a/backends/PalmOS/Src/builder/enum_globals.h
+++ b/backends/PalmOS/Src/builder/enum_globals.h
@@ -18,6 +18,7 @@ enum {
 	GBVARS_FTSEQMUSICTABLE_INDEX,
 	GBVARS_FTSEQNAMES_INDEX,
 	GBVARS_DEFAULTSCALETABLE_INDEX,
+	GBVARS_OLDSCALETABLE_INDEX,
 	GBVARS_IMCTABLE_INDEX,
 	GBVARS_CODEC47TABLE_INDEX,
 	GBVARS_TRANSITIONEFFECTS_INDEX,
@@ -46,8 +47,8 @@ enum {
 	GBVARS_SIMON1AMIGASETTINGS_INDEX,
 	GBVARS_SIMON1DEMOSETTINGS_INDEX,
 	GBVARS_SIMON2WINSETTINGS_INDEX,
-	GBVARS_SIMON2MACSETTINGS_INDEX,
 	GBVARS_SIMON2DOSSETTINGS_INDEX,
+	GBVARS_RUSSIANVIDEOFONT_INDEX,
 	GBVARS_FRENCHVIDEOFONT_INDEX,
 	GBVARS_GERMANVIDEOFONT_INDEX,
 	GBVARS_HEBREWVIDEOFONT_INDEX,
diff --git a/backends/PalmOS/Src/builder/scumm/bl_akos.c b/backends/PalmOS/Src/builder/scumm/bl_akos.c
index bceafde8c3..62a39957d1 100644
--- a/backends/PalmOS/Src/builder/scumm/bl_akos.c
+++ b/backends/PalmOS/Src/builder/scumm/bl_akos.c
@@ -1,6 +1,45 @@
 #include <PalmOS.h>
 #include "b_globals.h"
 
+static void addAkos_oldScaleTable() {
+	UInt8 oldScaleTable[256] = {
+	0xFF, 0xFD, 0x7D, 0xBD, 0x3D, 0xDD, 0x5D, 0x9D,
+	0x1D, 0xED, 0x6D, 0xAD, 0x2D, 0xCD, 0x4D, 0x8D,
+	0x0D, 0xF5, 0x75, 0xB5, 0x35, 0xD5, 0x55, 0x95,
+	0x15, 0xE5, 0x65, 0xA5, 0x25, 0xC5, 0x45, 0x85,
+	0x05, 0xF9, 0x79, 0xB9, 0x39, 0xD9, 0x59, 0x99,
+	0x19, 0xE9, 0x69, 0xA9, 0x29, 0xC9, 0x49, 0x89,
+	0x09, 0xF1, 0x71, 0xB1, 0x31, 0xD1, 0x51, 0x91,
+	0x11, 0xE1, 0x61, 0xA1, 0x21, 0xC1, 0x41, 0x81,
+	0x01, 0xFB, 0x7B, 0xBB, 0x3B, 0xDB, 0x5B, 0x9B,
+	0x1B, 0xEB, 0x6B, 0xAB, 0x2B, 0xCB, 0x4B, 0x8B,
+	0x0B, 0xF3, 0x73, 0xB3, 0x33, 0xD3, 0x53, 0x93,
+	0x13, 0xE3, 0x63, 0xA3, 0x23, 0xC3, 0x43, 0x83,
+	0x03, 0xF7, 0x77, 0xB7, 0x37, 0xD7, 0x57, 0x97,
+	0x17, 0xE7, 0x67, 0xA7, 0x27, 0xC7, 0x47, 0x87,
+	0x07, 0xEF, 0x6F, 0xAF, 0x2F, 0xCF, 0x4F, 0x8F,
+	0x0F, 0xDF, 0x5F, 0x9F, 0x1F, 0xBF, 0x3F, 0x7F,
+	0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
+	0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+	0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
+	0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+	0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
+	0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+	0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
+	0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+	0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
+	0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+	0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
+	0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+	0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
+	0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+	0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
+	0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE
+};
+
+	writeRecord(oldScaleTable, sizeof(oldScaleTable), GBVARS_OLDSCALETABLE_INDEX , GBVARS_SCUMM);
+}
+
 static void addAkos_defaultScaleTable() {
 	UInt8 defaultScaleTable[768] = {
 		0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
@@ -111,6 +150,7 @@ static void addAkos_defaultScaleTable() {
 ///////////////////////////////////////////////////////////////////
 
 void addAkos() {
+	addAkos_oldScaleTable();
 	addAkos_defaultScaleTable();
 
 }
\ No newline at end of file
diff --git a/backends/PalmOS/Src/builder/simon/bs_charset.c b/backends/PalmOS/Src/builder/simon/bs_charset.c
index dd905bc6d0..714a26567c 100644
--- a/backends/PalmOS/Src/builder/simon/bs_charset.c
+++ b/backends/PalmOS/Src/builder/simon/bs_charset.c
@@ -3,6 +3,109 @@
 
 typedef unsigned char byte;
 
+static void addCharset_russian_video_font() {
+	byte russian_video_font[] = {
+		0, 0, 0, 0, 0, 0, 0, 0,
+		32, 112, 112, 32, 32, 0, 32, 0,
+		48, 48, 96, 0, 0, 0, 0, 0,
+		0, 144, 0, 96, 144, 144, 104, 0,
+		0, 144, 0, 96, 144, 144, 96, 0,
+		0, 144, 0, 144, 144, 144, 96, 0,
+		0, 16, 40, 16, 42, 68, 58, 0,
+		48, 48, 96, 0, 0, 0, 0, 0,
+		0, 4, 8, 8, 8, 8, 4, 0,
+		0, 32, 16, 16, 16, 16, 32, 0,
+		72, 84, 84, 116, 84, 84, 72, 0,
+		0, 112, 136, 240, 136, 136, 240, 0,
+		0, 0, 0, 0, 0, 48, 48, 96,
+		0, 0, 0, 240, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 48, 48, 0,
+		16, 32, 0, 120, 112, 64, 56, 0,
+		112, 136, 152, 168, 200, 136, 112, 0,
+		32, 96, 32, 32, 32, 32, 112, 0,
+		112, 136, 8, 48, 64, 136, 248, 0,
+		112, 136, 8, 48, 8, 136, 112, 0,
+		16, 48, 80, 144, 248, 16, 56, 0,
+		248, 128, 240, 8, 8, 136, 112, 0,
+		48, 64, 128, 240, 136, 136, 112, 0,
+		248, 136, 8, 16, 32, 32, 32, 0,
+		112, 136, 136, 112, 136, 136, 112, 0,
+		112, 136, 136, 120, 8, 16, 96, 0,
+		0, 0, 48, 48, 0, 48, 48, 0,
+		32, 16, 0, 112, 8, 248, 120, 0,
+		0, 0, 96, 48, 40, 40, 112, 0,
+		0, 0, 112, 88, 20, 20, 56, 0,
+		0, 0, 120, 4, 28, 4, 120, 0,
+		112, 136, 8, 16, 32, 0, 32, 0,
+		0, 0, 84, 84, 84, 84, 56, 4,
+		56, 68, 68, 124, 68, 68, 68, 0,
+		124, 36, 32, 56, 36, 36, 120, 0,
+		120, 36, 36, 56, 36, 36, 120, 0,
+		124, 36, 32, 32, 32, 32, 112, 0,
+		56, 40, 40, 40, 40, 40, 124, 68,
+		124, 36, 32, 56, 32, 36, 124, 0,
+		84, 84, 84, 56, 84, 84, 84, 0,
+		56, 68, 4, 24, 4, 68, 56, 0,
+		68, 68, 76, 84, 100, 68, 68, 0,
+		100, 40, 40, 48, 40, 36, 100, 0,
+		28, 36, 36, 36, 36, 36, 100, 0,
+		68, 108, 84, 68, 68, 68, 68, 0,
+		68, 68, 68, 124, 68, 68, 68, 0,
+		56, 68, 68, 68, 68, 68, 56, 0,
+		124, 68, 68, 68, 68, 68, 68, 0,
+		120, 36, 36, 56, 32, 32, 112, 0,
+		56, 68, 64, 64, 64, 68, 56, 0,
+		124, 84, 16, 16, 16, 16, 56, 0,
+		100, 36, 36, 28, 4, 4, 56, 0,
+		56, 84, 84, 84, 56, 16, 56, 0,
+		108, 40, 16, 16, 40, 40, 108, 0,
+		72, 72, 72, 72, 72, 72, 60, 4,
+		76, 72, 72, 56, 8, 8, 28, 0,
+		84, 84, 84, 84, 84, 84, 60, 0,
+		84, 84, 84, 84, 84, 84, 56, 4,
+		56, 68, 4, 28, 4, 68, 56, 0,
+		0, 0, 68, 100, 84, 84, 100, 0,
+		0, 0, 72, 84, 116, 84, 72, 0,
+		0, 0, 60, 68, 60, 36, 100, 0,
+		0, 0, 120, 4, 24, 4, 120, 0,
+		0, 0, 100, 40, 48, 40, 100, 0,
+		60, 68, 68, 60, 36, 68, 68, 0,
+		0, 0, 56, 4, 60, 68, 60, 0,
+		60, 64, 32, 56, 68, 68, 56, 0,
+		48, 72, 80, 120, 68, 68, 56, 0,
+		0, 0, 120, 4, 56, 64, 60, 0,
+		56, 4, 4, 60, 68, 68, 56, 0,
+		0, 0, 56, 68, 120, 64, 56, 0,
+		40, 0, 56, 68, 120, 64, 56, 0,
+		0, 0, 84, 84, 56, 84, 84, 0,
+		64, 0, 192, 64, 64, 64, 224, 0,
+		0, 0, 68, 68, 68, 68, 60, 0,
+		56, 0, 68, 68, 68, 68, 60, 0,
+		192, 64, 64, 64, 64, 64, 224, 0,
+		0, 0, 28, 36, 36, 36, 100, 0,
+		0, 0, 68, 108, 84, 68, 68, 0,
+		0, 0, 56, 68, 68, 68, 56, 0,
+		0, 0, 68, 68, 124, 68, 68, 0,
+		0, 0, 124, 68, 68, 68, 68, 0,
+		0, 0, 120, 36, 36, 56, 32, 112,
+		0, 0, 60, 64, 64, 64, 60, 0,
+		0, 0, 124, 84, 16, 16, 56, 0,
+		0, 0, 68, 68, 60, 4, 56, 0,
+		48, 16, 56, 84, 84, 56, 16, 56,
+		0, 0, 68, 40, 16, 40, 68, 0,
+		0, 0, 72, 72, 72, 72, 60, 4,
+		0, 0, 76, 72, 72, 56, 8, 28,
+		0, 0, 84, 84, 84, 84, 60, 0,
+		32, 80, 0, 96, 144, 144, 96, 0,
+		0, 14, 8, 48, 8, 8, 14, 0,
+		0, 8, 8, 8, 8, 8, 8, 0,
+		0, 112, 16, 12, 16, 16, 112, 0,
+		0, 0, 0, 0, 0, 0, 248, 0,
+		252, 252, 252, 252, 252, 252, 252, 252,
+		240, 240, 240, 240, 240, 240, 240, 240,
+	};
+	writeRecord(russian_video_font, sizeof(russian_video_font), GBVARS_RUSSIANVIDEOFONT_INDEX , GBVARS_SIMON);
+}
 
 static void addCharset_french_video_font() {
 	byte french_video_font[] = {
@@ -634,6 +737,7 @@ static void addCharset_video_font() {
 ///////////////////////////////////////////////////////////////////
 
 void Simon_addCharset() {
+	addCharset_russian_video_font();
 	addCharset_french_video_font();
 	addCharset_german_video_font();
 	addCharset_hebrew_video_font();
diff --git a/backends/PalmOS/Src/builder/simon/bs_simon.c b/backends/PalmOS/Src/builder/simon/bs_simon.c
index d590ecbd24..a5941e743a 100644
--- a/backends/PalmOS/Src/builder/simon/bs_simon.c
+++ b/backends/PalmOS/Src/builder/simon/bs_simon.c
@@ -136,26 +136,6 @@ static void addSimon_simon2win_settings() {
 	writeRecord(&simon2win_settings, sizeof(simon2win_settings), GBVARS_SIMON2WINSETTINGS_INDEX, GBVARS_SIMON);
 }
 ///////////////////////////////////////////////////////////////////
-static void addSimon_simon2mac_settings() {
-
-
-	GameSpecificSettings simon2mac_settings = {
-	"Simon2.gme",                           // gme_filename
-	"",                                     // wav_filename
-	"",                                     // voc_filename
-	"SIMON2.MP3",                           // mp3_filename
-	"SIMON2.OGG",                           // vorbis_filename
-	"SIMON2.FLA",                           // flac_filename
-	"",                                     // voc_effects_filename
-	"",                                     // mp3_effects_filename
-	"",                                     // vorbis_effects_filename
-	"",                                     // flac_effects_filename
-	"gsptr30",                              // gamepc_filename
-};
-
-	writeRecord(&simon2mac_settings, sizeof(simon2mac_settings), GBVARS_SIMON2MACSETTINGS_INDEX, GBVARS_SIMON);
-}
-///////////////////////////////////////////////////////////////////
 static void addSimon_simon2dos_settings() {
 
 
@@ -391,7 +371,6 @@ void addSimon() {
 	addSimon_simon1amiga_settings();
 	addSimon_simon1demo_settings();
 	addSimon_simon2win_settings();
-	addSimon_simon2mac_settings();
 	addSimon_simon2dos_settings();
 	
 	addSimon_simon1_cursor();