[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.374,1.375 simon.h,1.112,1.113 vga.cpp,1.97,1.98
Travis Howell
kirben at users.sourceforge.net
Thu Dec 18 02:48:01 CET 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv12989/simon
Modified Files:
simon.cpp simon.h vga.cpp
Log Message:
Make fade a config optiom
Make sure non-English/German versions of simon1talkie start with subtitles enabled.
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -d -r1.374 -r1.375
--- simon.cpp 18 Dec 2003 09:36:17 -0000 1.374
+++ simon.cpp 18 Dec 2003 10:47:12 -0000 1.375
@@ -338,6 +338,7 @@
_dump_images = 0;
_speech = false;
_subtitles = false;
+ _fade = true;
_mouse_cursor = 0;
_vga_var9 = 0;
_script_unk_1 = 0;
@@ -541,8 +542,15 @@
_debugMode = ConfMan.hasKey("debuglevel");
_debugLevel = ConfMan.getInt("debuglevel");
_language = Common::parseLanguage(ConfMan.get("language"));
- _subtitles = ConfMan.getBool("subtitles");
+ if (!(_game & GF_SIMON2) && _language > 1) {
+ if (ConfMan.hasKey("_subtitles") && ConfMan.getBool("_subtitles") == 0)
+ _subtitles = 0;
+ } else
+ _subtitles = ConfMan.getBool("subtitles");
+
+ if (ConfMan.hasKey("fade") && ConfMan.getBool("fade") == 0)
+ _fade = 0;
if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1)
_speed = ConfMan.getInt("slow_down");
@@ -2431,7 +2439,8 @@
palette_fadeout((uint32 *)_video_buf_1 + 32 + 16 + 144 + 16, 48);
_system->set_palette(_video_buf_1, 0, 256);
- _system->update_screen();
+ if (_fade)
+ _system->update_screen();
delay(5);
} while (--i);
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- simon.h 18 Dec 2003 09:36:17 -0000 1.112
+++ simon.h 18 Dec 2003 10:47:12 -0000 1.113
@@ -200,6 +200,7 @@
bool _dump_images;
bool _speech;
bool _subtitles;
+ bool _fade;
byte _mouse_cursor;
bool _vga_var9;
int16 _script_unk_1;
Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- vga.cpp 18 Dec 2003 09:10:47 -0000 1.97
+++ vga.cpp 18 Dec 2003 10:47:12 -0000 1.98
@@ -1717,7 +1717,8 @@
for (i = NUM_PALETTE_FADEOUT; i != 0; --i) {
palette_fadeout((uint32 *)_video_buf_1, _video_num_pal_colors);
_system->set_palette(_video_buf_1, 0, _video_num_pal_colors);
- _system->update_screen();
+ if (_fade)
+ _system->update_screen();
delay(5);
}
More information about the Scummvm-git-logs
mailing list