From 6f65f6f166854fb9c6bd2983072b6824fb74d9a5 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 7 Mar 2003 12:29:33 +0000
Subject: Rename variable

svn-id: r6738
---
 simon/items.cpp | 10 +++++-----
 simon/simon.cpp | 18 +++++++++---------
 simon/simon.h   |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'simon')

diff --git a/simon/items.cpp b/simon/items.cpp
index bf7c00b0db..2d84ce730e 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -992,7 +992,7 @@ int SimonState::runScript() {
 				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 @@ void SimonState::o_177() {
 	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 @@ void SimonState::o_177() {
 				}
 			}
 
-			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;
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 066ebb2e7e..8bdbc175bc 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1811,7 +1811,7 @@ void SimonState::o_print_str() {
 	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 @@ void SimonState::o_print_str() {
 	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 @@ void SimonState::processSpecialKeys() {
 
 		case 't':
 			if (_game & GF_SIMON2)
-				_vk_t_toggle ^= 1;
+				_subtitles ^= 1;
 			break;
 
 		case '+':
@@ -3889,7 +3889,7 @@ void SimonState::talk_with_speech(uint speech_id, uint num_1) {
 		}
 	} 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 @@ void SimonState::talk_with_speech(uint speech_id, uint num_1) {
 			}
 			_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 @@ void SimonState::go() {
 		_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;
 	
diff --git a/simon/simon.h b/simon/simon.h
index acebd8d619..d77feca331 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -184,7 +184,7 @@ public:
 	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;
-- 
cgit v1.2.3