[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.53,1.54 simon.cpp,1.161,1.162 simon.h,1.51,1.52
Travis Howell
kirben at users.sourceforge.net
Fri Mar 7 04:30:13 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm bundle.cpp,1.29,1.30 bundle.h,1.13,1.14 sound.cpp,1.93,1.94
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.162,1.163 simon.h,1.52,1.53 vga.cpp,1.36,1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv4994/simon
Modified Files:
items.cpp simon.cpp simon.h
Log Message:
Rename variable
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- items.cpp 6 Mar 2003 21:46:48 -0000 1.53
+++ items.cpp 7 Mar 2003 12:29:21 -0000 1.54
@@ -992,7 +992,7 @@
if (_game & GF_TALKIE)
d = _array_4[a];
- if (d != 0 && !_vk_t_toggle) {
+ if (d != 0 && !_subtitles) {
talk_with_speech(d, b);
} else if (s != NULL) {
talk_with_text(b, c, s, tv->a, tv->b, tv->c);
@@ -1231,11 +1231,11 @@
if (_game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) {
if (child != NULL && child->avail_props & 0x200) {
uint offs = getOffsetOfChild2Param(child, 0x200);
- if (!_vk_t_toggle)
+ if (!_subtitles)
talk_with_speech(child->array[offs], a);
} else if (child != NULL && child->avail_props & 0x100) {
uint offs = getOffsetOfChild2Param(child, 0x100);
- if (!_vk_t_toggle)
+ if (!_subtitles)
talk_with_speech(child->array[offs] + 3550, a);
}
} else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
@@ -1286,12 +1286,12 @@
}
}
- if (!_vk_t_toggle)
+ if (!_subtitles)
talk_with_speech(var200, a);
}
}
- if (child != NULL && (child->avail_props & 1) && _vk_t_toggle) {
+ if (child != NULL && (child->avail_props & 1) && _subtitles) {
if (child->avail_props & 0x100) {
sprintf(buf, "%d%s", child->array[getOffsetOfChild2Param(child, 0x100)], s);
s = buf;
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- simon.cpp 7 Mar 2003 03:26:30 -0000 1.161
+++ simon.cpp 7 Mar 2003 12:29:27 -0000 1.162
@@ -1811,7 +1811,7 @@
case GAME_SIMON1TALKIE:
case GAME_SIMON1WIN:
case GAME_SIMON1CD32:
- if (speech_id != 0 && !_vk_t_toggle) {
+ if (speech_id != 0 && !_subtitles) {
talk_with_speech(speech_id, num_1);
} else if (string_ptr != NULL) {
talk_with_text(num_1, num_2, (char *)string_ptr, tv->a, tv->b, tv->c);
@@ -1828,10 +1828,10 @@
case GAME_SIMON2TALKIE:
case GAME_SIMON2WIN:
case GAME_SIMON2MAC:
- if (speech_id != 0 && num_1 == 1 && !_vk_t_toggle)
+ if (speech_id != 0 && num_1 == 1 && !_subtitles)
talk_with_speech(speech_id, num_1);
- if (speech_id != 0 && !_vk_t_toggle)
+ if (speech_id != 0 && !_subtitles)
return;
if (speech_id == 0)
@@ -3099,7 +3099,7 @@
case 't':
if (_game & GF_SIMON2)
- _vk_t_toggle ^= 1;
+ _subtitles ^= 1;
break;
case '+':
@@ -3889,7 +3889,7 @@
}
} else {
if (speech_id == 0xFFFF) {
- if (_vk_t_toggle)
+ if (_subtitles)
return;
if (!(_bit_array[0] & 0x4000 || _bit_array[1] & 0x1000)) {
_bit_array[0] |= 0x4000;
@@ -3899,7 +3899,7 @@
}
_skip_vga_wait = true;
} else {
- if (_vk_t_toggle && _scriptvar_2) {
+ if (_subtitles && _scriptvar_2) {
start_vga_code(4, 2, 5, 0, 0, 0);
o_wait_for_vga(0xcd);
o_unk_99_simon2(2, 5);
@@ -4627,13 +4627,13 @@
_start_mainscript = true;
if (_sound->hasVoice()) {
- _vk_t_toggle = false;
+ _subtitles = false;
} else {
- _vk_t_toggle = true;
+ _subtitles = true;
}
//Only English and German voice files were produced
if (_language >= 2)
- _vk_t_toggle = true;
+ _subtitles = true;
midi._midi_sfx_toggle = false;
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- simon.h 7 Mar 2003 03:26:30 -0000 1.51
+++ simon.h 7 Mar 2003 12:29:33 -0000 1.52
@@ -184,7 +184,7 @@
bool _start_mainscript;
bool _continous_mainscript;
bool _continous_vgascript;
- bool _vk_t_toggle;
+ bool _subtitles;
byte _mouse_cursor;
bool _vga_var9;
int16 _script_unk_1;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm bundle.cpp,1.29,1.30 bundle.h,1.13,1.14 sound.cpp,1.93,1.94
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.162,1.163 simon.h,1.52,1.53 vga.cpp,1.36,1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list