[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.38.2.2,1.38.2.3 items.cpp,1.129.2.1,1.129.2.2 simon-md5.h,1.13,1.13.2.1
kirben
kirben at users.sourceforge.net
Tue Nov 22 16:39:01 CET 2005
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26850/simon
Modified Files:
Tag: branch-0-8-0
charset.cpp items.cpp simon-md5.h
Log Message:
Back port Polish support for Simon2.
Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.38.2.2
retrieving revision 1.38.2.3
diff -u -d -r1.38.2.2 -r1.38.2.3
--- charset.cpp 9 Nov 2005 22:25:22 -0000 1.38.2.2
+++ charset.cpp 23 Nov 2005 00:38:23 -0000 1.38.2.3
@@ -371,6 +371,7 @@
#ifdef __PALM_OS__
static const byte *russian_video_font;
+static const byte *polish_video_font;
static const byte *french_video_font;
static const byte *german_video_font;
static const byte *hebrew_video_font;
@@ -479,6 +480,107 @@
240, 240, 240, 240, 240, 240, 240, 240,
};
+static const byte polish_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, 0, 112, 136, 248, 128, 112, 8,
+ 0, 16, 120, 128, 112, 8, 240, 0,
+ 192, 64, 64, 96, 192, 64, 224, 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,
+ 0, 0, 20, 8, 62, 8, 20, 0,
+ 0, 32, 112, 136, 136, 136, 112, 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,
+ 0, 32, 112, 136, 128, 136, 112, 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,
+ 0, 32, 240, 136, 136, 136, 136, 0,
+ 80, 0, 136, 136, 136, 136, 112, 0,
+ 0, 32, 248, 144, 32, 72, 248, 0,
+ 8, 32, 248, 144, 32, 72, 248, 0,
+ 112, 136, 8, 16, 32, 0, 32, 0,
+ 0, 0, 112, 8, 120, 136, 120, 4,
+ 112, 136, 136, 248, 136, 136, 136, 0,
+ 240, 72, 72, 112, 72, 72, 240, 0,
+ 48, 72, 128, 128, 128, 72, 48, 0,
+ 224, 80, 72, 72, 72, 80, 224, 0,
+ 248, 72, 64, 112, 64, 72, 248, 0,
+ 248, 72, 64, 112, 64, 64, 224, 0,
+ 48, 72, 128, 152, 136, 72, 56, 0,
+ 136, 136, 136, 248, 136, 136, 136, 0,
+ 248, 32, 32, 32, 32, 32, 248, 0,
+ 24, 8, 8, 8, 136, 136, 112, 0,
+ 200, 72, 80, 96, 80, 72, 200, 0,
+ 224, 64, 64, 64, 64, 72, 248, 0,
+ 136, 216, 168, 168, 136, 136, 136, 0,
+ 136, 200, 168, 152, 136, 136, 136, 0,
+ 112, 136, 136, 136, 136, 136, 112, 0,
+ 240, 72, 72, 112, 64, 64, 224, 0,
+ 112, 136, 136, 136, 136, 168, 112, 8,
+ 240, 72, 72, 112, 72, 72, 200, 0,
+ 112, 136, 128, 112, 8, 136, 112, 0,
+ 248, 168, 32, 32, 32, 32, 112, 0,
+ 136, 136, 136, 136, 136, 136, 120, 0,
+ 136, 136, 136, 80, 80, 32, 32, 0,
+ 136, 136, 136, 136, 168, 216, 136, 0,
+ 136, 136, 80, 32, 80, 136, 136, 0,
+ 136, 136, 136, 112, 32, 32, 112, 0,
+ 248, 136, 16, 32, 64, 136, 248, 0,
+ 0, 14, 8, 8, 8, 8, 14, 0,
+ 0, 128, 64, 32, 16, 8, 4, 0,
+ 224, 64, 64, 96, 192, 72, 248, 0,
+ 16, 120, 128, 112, 8, 136, 112, 0,
+ 248, 72, 64, 112, 64, 72, 248, 16,
+ 32, 248, 16, 32, 64, 136, 248, 0,
+ 0, 0, 112, 8, 120, 136, 120, 0,
+ 192, 64, 80, 104, 72, 72, 112, 0,
+ 0, 0, 112, 136, 128, 136, 112, 0,
+ 24, 16, 80, 176, 144, 144, 112, 0,
+ 0, 0, 112, 136, 248, 128, 112, 0,
+ 48, 72, 64, 224, 64, 64, 224, 0,
+ 0, 0, 104, 144, 144, 112, 136, 112,
+ 192, 64, 80, 104, 72, 72, 200, 0,
+ 64, 0, 192, 64, 64, 64, 224, 0,
+ 8, 0, 8, 8, 8, 8, 136, 112,
+ 192, 64, 72, 80, 96, 80, 200, 0,
+ 192, 64, 64, 64, 64, 64, 224, 0,
+ 0, 0, 144, 216, 168, 136, 136, 0,
+ 0, 0, 240, 136, 136, 136, 136, 0,
+ 0, 0, 112, 136, 136, 136, 112, 0,
+ 0, 0, 176, 72, 72, 112, 64, 224,
+ 0, 0, 104, 144, 144, 112, 16, 56,
+ 0, 0, 176, 72, 72, 64, 224, 0,
+ 0, 0, 120, 128, 112, 8, 240, 0,
+ 64, 64, 240, 64, 64, 72, 48, 0,
+ 0, 0, 144, 144, 144, 144, 104, 0,
+ 0, 0, 136, 136, 136, 80, 32, 0,
+ 0, 0, 136, 136, 168, 216, 144, 0,
+ 0, 0, 136, 80, 32, 80, 136, 0,
+ 0, 0, 136, 136, 136, 112, 32, 192,
+ 0, 0, 248, 144, 32, 72, 248, 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,
+};
+
static const byte french_video_font[] = {
0, 0, 0, 0, 0, 0, 0, 0,
32, 112, 112, 32, 32, 0, 32, 0,
@@ -1096,20 +1198,34 @@
dst = dx_lock_2();
dst += y * _dxSurfacePitch + x * 8 + fcs->textColumnOffset;
- if (_language == 21) {
+ switch(_language) {
+ case Common::RU_RUS:
src = russian_video_font + (chr - 0x20) * 8;
- } else if (_language == 20) {
+ break;
+ case Common::PL_POL:
+ src = polish_video_font + (chr - 0x20) * 8;
+ break;
+ case Common::HB_ISR:
src = hebrew_video_font + (chr - 0x20) * 8;
- } else if (_language == 5) {
+ break;
+ case Common::ES_ESP:
src = spanish_video_font + (chr - 0x20) * 8;
- } else if (_language == 3) {
+ break;
+ case Common::IT_ITA:
src = italian_video_font + (chr - 0x20) * 8;
- } else if (_language == 2) {
+ break;
+ case Common::FR_FRA:
src = french_video_font + (chr - 0x20) * 8;
- } else if (_language == 1) {
+ break;
+ case Common::DE_DEU:
src = german_video_font + (chr - 0x20) * 8;
- } else
+ break;
+ case Common::EN_USA:
src = video_font + (chr - 0x20) * 8;
+ break;
+ default:
+ error("video_putchar_drawchar: Unknown language %d\n", _language);
+ }
color = fcs->text_color;
@@ -1137,6 +1253,7 @@
_GINIT(Simon_Charset)
_GSETPTR(Simon::russian_video_font, GBVARS_RUSSIANVIDEOFONT_INDEX, byte, GBVARS_SIMON)
+_GSETPTR(Simon::polish_video_font, GBVARS_POLISHVIDEOFONT_INDEX, byte, GBVARS_SIMON)
_GSETPTR(Simon::french_video_font, GBVARS_FRENCHVIDEOFONT_INDEX, byte, GBVARS_SIMON)
_GSETPTR(Simon::german_video_font, GBVARS_GERMANVIDEOFONT_INDEX, byte, GBVARS_SIMON)
_GSETPTR(Simon::hebrew_video_font, GBVARS_HEBREWVIDEOFONT_INDEX, byte, GBVARS_SIMON)
@@ -1147,6 +1264,7 @@
_GRELEASE(Simon_Charset)
_GRELEASEPTR(GBVARS_RUSSIANVIDEOFONT_INDEX, GBVARS_SIMON)
+_GRELEASEPTR(GBVARS_POLISHVIDEOFONT_INDEX, GBVARS_SIMON)
_GRELEASEPTR(GBVARS_FRENCHVIDEOFONT_INDEX, GBVARS_SIMON)
_GRELEASEPTR(GBVARS_GERMANVIDEOFONT_INDEX, GBVARS_SIMON)
_GRELEASEPTR(GBVARS_HEBREWVIDEOFONT_INDEX, GBVARS_SIMON)
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.129.2.1
retrieving revision 1.129.2.2
diff -u -d -r1.129.2.1 -r1.129.2.2
--- items.cpp 18 Oct 2005 02:11:25 -0000 1.129.2.1
+++ items.cpp 23 Nov 2005 00:38:23 -0000 1.129.2.2
@@ -1387,21 +1387,24 @@
byte keyNo = 'n';
switch (_language) {
- case 21: // Russian
+ case Common::RU_RUS:
break;
- case 20: // Hebrew
+ case Common::PL_POL:
+ keyYes = 't';
+ break;
+ case Common::HB_ISR:
keyYes = 'f';
break;
- case 5: // Spanish
+ case Common::ES_ESP:
keyYes = 's';
break;
- case 3: // Italian
+ case Common::IT_ITA:
keyYes = 's';
break;
- case 2: // French
+ case Common::FR_FRA:
keyYes = 'o';
break;
- case 1: // German
+ case Common::DE_DEU:
keyYes = 'j';
break;
default:
Index: simon-md5.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/Attic/simon-md5.h,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- simon-md5.h 9 May 2005 10:50:59 -0000 1.13
+++ simon-md5.h 23 Nov 2005 00:38:23 -0000 1.13.2.1
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Mon May 09 10:43:26 2005
+ This file was generated by the md5table tool on Tue Nov 22 23:56:12 2005
DO NOT EDIT MANUALLY!
*/
@@ -13,8 +13,10 @@
static const MD5Table md5table[] = {
{ "028c6240c9c8e190d86188238505c5e5", "simon2talkie", Common::DE_DEU, Common::kPlatformPC },
{ "057eac98fc4d14dc7fd04341781b26b3", "simon1talkie", Common::IT_ITA, Common::kPlatformPC },
+ { "069a619f3880393441e6d9d968885f11 ", "simon1dos", Common::DE_DEU, Common::kPlatformPC },
{ "078b04da0974a40645b92baffdf2781e", "simon2talkie", Common::EN_USA, Common::kPlatformPC },
{ "08bd7abefe9c44e43df396748640e531", "simon1talkie", Common::FR_FRA, Common::kPlatformPC },
+ { "0ce41d8d7d0487f1ddb76244532eb219", "simon2talkie", Common::UNK_LANG, Common::kPlatformWindows },
{ "1e11ddbad80c408031ae44a0cbce46bb", "simon2talkie", Common::EN_USA, Common::kPlatformPC },
{ "39e8f13ec29de1fcef98c81ca0a2ae57", "simon1amiga", Common::EN_USA, Common::kPlatformAmiga },
{ "3b22f3cc4ce9faa3f7830ab18235b04d", "simon1dos", Common::RU_RUS, Common::kPlatformPC },
@@ -27,6 +29,7 @@
{ "a3cbdd3450f9fccb0a9d8d6dc28f66fe", "simon2talkie", Common::HB_ISR, Common::kPlatformPC },
{ "b6cfe7449a32418ed523bde22f5125ed", "simon1dos", Common::FR_FRA, Common::kPlatformPC },
{ "bd85a8b5135592ada9cbeae49160f1d3", "simon2talkie", Common::EN_USA, Common::kPlatformWindows },
+ { "c5091c98e3b13760764876177fdf4fb4", "simon2talkie", Common::IT_ITA, Common::kPlatformWindows },
{ "c8ddd48919aa75423dd2d3e5864909df", "simon2talkie", Common::FR_FRA, Common::kPlatformPC },
{ "c8f5b860a20dcc63915d94cf2bdcfa49", "simon1dos", Common::IT_ITA, Common::kPlatformPC },
{ "d22302abf44219f95d50f2faa807dd1a", "simon1talkie", Common::EN_USA, Common::kPlatformWindows },
More information about the Scummvm-git-logs
mailing list