From 2728aa0b703f769d01341b749700bf335d16f862 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 10 Nov 2013 16:02:55 -0500
Subject: TSAGE: Rename VisualSpeaker methods proc15 and proc16

---
 engines/tsage/ringworld2/ringworld2_speakers.cpp | 140 +++++++++++------------
 1 file changed, 70 insertions(+), 70 deletions(-)

(limited to 'engines/tsage/ringworld2/ringworld2_speakers.cpp')

diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 19f40c8864..45c00785d3 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -73,7 +73,7 @@ void VisualSpeaker::remove() {
 void VisualSpeaker::signal() {
 	// TODO: _action->_field18 = 1;
 	if (_speakerMode == 0xff)
-		proc16();
+		stopSpeaking();
 
 	_speakerMode = 0;
 	if (_numFrames) {
@@ -264,7 +264,7 @@ void VisualSpeaker::setText(const Common::String &msg) {
 	}
 }
 
-void VisualSpeaker::proc16() {
+void VisualSpeaker::stopSpeaking() {
 	R2_GLOBALS._playStream.stop();
 	_speakerMode = 0;
 	_object1.remove();
@@ -317,7 +317,7 @@ SpeakerCaptain3210::SpeakerCaptain3210() {
 	_numFrames = 0;
 }
 
-void SpeakerCaptain3210::proc15() {
+void SpeakerCaptain3210::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3210 *scene = (Scene3210 *)R2_GLOBALS._sceneManager._scene;
 
@@ -372,7 +372,7 @@ SpeakerChief1100::SpeakerChief1100() {
 	_numFrames = 0;
 }
 
-void SpeakerChief1100::proc15() {
+void SpeakerChief1100::animateSpeaker() {
 	int v = _speakerMode;
 	Scene1100 *scene = (Scene1100 *)R2_GLOBALS._sceneManager._scene;
 
@@ -430,7 +430,7 @@ SpeakerGuard::SpeakerGuard() {
 	_numFrames = 0;
 }
 
-void SpeakerGuard2800::proc15() {
+void SpeakerGuard2800::animateSpeaker() {
 	int v = _speakerMode;
 	Scene2800 *scene = (Scene2800 *)R2_GLOBALS._sceneManager._scene;
 
@@ -470,7 +470,7 @@ SpeakerJocko::SpeakerJocko() {
 	_numFrames = 0;
 }
 
-void SpeakerJocko3200::proc15() {
+void SpeakerJocko3200::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
@@ -493,7 +493,7 @@ void SpeakerJocko3200::proc15() {
 	}
 }
 
-void SpeakerJocko3220::proc15() {
+void SpeakerJocko3220::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3220 *scene = (Scene3220 *)R2_GLOBALS._sceneManager._scene;
 
@@ -516,7 +516,7 @@ void SpeakerJocko3220::proc15() {
 	}
 }
 
-void SpeakerJocko3230::proc15() {
+void SpeakerJocko3230::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3230 *scene = (Scene3230 *)R2_GLOBALS._sceneManager._scene;
 
@@ -555,7 +555,7 @@ SpeakerMiranda::SpeakerMiranda(): VisualSpeaker() {
 	_numFrames = 0;
 }
 
-void SpeakerMiranda300::proc15() {
+void SpeakerMiranda300::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -595,7 +595,7 @@ void SpeakerMiranda300::proc15() {
 	}
 }
 
-void SpeakerMiranda1625::proc15() {
+void SpeakerMiranda1625::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -618,7 +618,7 @@ void SpeakerMiranda1625::proc15() {
 	}
 }
 
-void SpeakerMiranda3255::proc15() {
+void SpeakerMiranda3255::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -639,7 +639,7 @@ void SpeakerMiranda3255::proc15() {
 	}
 }
 
-void SpeakerMiranda3375::proc15() {
+void SpeakerMiranda3375::animateSpeaker() {
 	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -689,7 +689,7 @@ void SpeakerMiranda3375::proc15() {
 	}
 }
 
-void SpeakerMiranda3385::proc15() {
+void SpeakerMiranda3385::animateSpeaker() {
 	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -738,7 +738,7 @@ void SpeakerMiranda3385::proc15() {
 	}
 }
 
-void SpeakerMiranda3395::proc15() {
+void SpeakerMiranda3395::animateSpeaker() {
 	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -788,7 +788,7 @@ void SpeakerMiranda3395::proc15() {
 	}
 }
 
-void SpeakerMiranda3400::proc15() {
+void SpeakerMiranda3400::animateSpeaker() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -832,7 +832,7 @@ void SpeakerMiranda3400::proc15() {
 	}
 }
 
-void SpeakerMiranda3600::proc15() {
+void SpeakerMiranda3600::animateSpeaker() {
 	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -878,7 +878,7 @@ void SpeakerMiranda3600::proc15() {
 	}
 }
 
-void SpeakerMiranda3700::proc15() {
+void SpeakerMiranda3700::animateSpeaker() {
 	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -946,7 +946,7 @@ SpeakerNej::SpeakerNej() {
 	_numFrames = 0;
 }
 
-void SpeakerNej2700::proc15() {
+void SpeakerNej2700::animateSpeaker() {
 	int v = _speakerMode;
 	Scene2700 *scene = (Scene2700 *)R2_GLOBALS._sceneManager._scene;
 
@@ -981,7 +981,7 @@ void SpeakerNej2700::proc15() {
 	}
 }
 
-void SpeakerNej2750::proc15() {
+void SpeakerNej2750::animateSpeaker() {
 	int v = _speakerMode;
 	Scene2750 *scene = (Scene2750 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1013,7 +1013,7 @@ void SpeakerNej2750::proc15() {
 	}
 }
 
-void SpeakerNej2800::proc15() {
+void SpeakerNej2800::animateSpeaker() {
 	int v = _speakerMode;
 	Scene2800 *scene = (Scene2800 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1054,7 +1054,7 @@ SpeakerPharisha::SpeakerPharisha(): VisualSpeaker() {
 	_numFrames = 0;
 }
 
-void SpeakerPharisha2435::proc15() {
+void SpeakerPharisha2435::animateSpeaker() {
 	int v = _speakerMode;
 	Scene2435 *scene = (Scene2435 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1090,7 +1090,7 @@ SpeakerPrivate3210::SpeakerPrivate3210() {
 	_numFrames = 0;
 }
 
-void SpeakerPrivate3210::proc15() {
+void SpeakerPrivate3210::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3210 *scene = (Scene3210 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1129,7 +1129,7 @@ SpeakerProtector3600::SpeakerProtector3600() {
 	_numFrames = 0;
 }
 
-void SpeakerProtector3600::proc15() {
+void SpeakerProtector3600::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1190,7 +1190,7 @@ SpeakerQuinn::SpeakerQuinn(): VisualSpeaker() {
 	_numFrames = 0;
 }
 
-void SpeakerQuinn300::proc15() {
+void SpeakerQuinn300::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -1237,7 +1237,7 @@ void SpeakerQuinn300::proc15() {
 	}
 }
 
-void SpeakerQuinn500::proc15() {
+void SpeakerQuinn500::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -1282,7 +1282,7 @@ void SpeakerQuinn500::proc15() {
 	}
 }
 
-void SpeakerQuinn1100::proc15() {
+void SpeakerQuinn1100::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -1331,7 +1331,7 @@ void SpeakerQuinn1100::proc15() {
 	}
 }
 
-void SpeakerQuinn2435::proc15() {
+void SpeakerQuinn2435::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -1358,7 +1358,7 @@ void SpeakerQuinn2435::proc15() {
 	}
 }
 
-void SpeakerQuinn2450::proc15() {
+void SpeakerQuinn2450::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -1387,7 +1387,7 @@ void SpeakerQuinn2450::proc15() {
 	}
 }
 
-void SpeakerQuinn2700::proc15() {
+void SpeakerQuinn2700::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -1418,7 +1418,7 @@ void SpeakerQuinn2700::proc15() {
 	}
 }
 
-void SpeakerQuinn2750::proc15() {
+void SpeakerQuinn2750::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -1449,7 +1449,7 @@ void SpeakerQuinn2750::proc15() {
 	}
 }
 
-void SpeakerQuinn2800::proc15() {
+void SpeakerQuinn2800::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -1488,7 +1488,7 @@ void SpeakerQuinn2800::proc15() {
 	}
 }
 
-void SpeakerQuinn3255::proc15() {
+void SpeakerQuinn3255::animateSpeaker() {
 	Scene3255 *scene = (Scene3255 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -1511,7 +1511,7 @@ void SpeakerQuinn3255::proc15() {
 	}
 }
 
-void SpeakerQuinn3375::proc15() {
+void SpeakerQuinn3375::animateSpeaker() {
 	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -1562,7 +1562,7 @@ void SpeakerQuinn3375::proc15() {
 	}
 }
 
-void SpeakerQuinn3385::proc15() {
+void SpeakerQuinn3385::animateSpeaker() {
 	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -1617,7 +1617,7 @@ void SpeakerQuinn3385::proc15() {
 	}
 }
 
-void SpeakerQuinn3395::proc15() {
+void SpeakerQuinn3395::animateSpeaker() {
 	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -1672,7 +1672,7 @@ void SpeakerQuinn3395::proc15() {
 	}
 }
 
-void SpeakerQuinn3400::proc15() {
+void SpeakerQuinn3400::animateSpeaker() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -1721,7 +1721,7 @@ void SpeakerQuinn3400::proc15() {
 	}
 }
 
-void SpeakerQuinn3600::proc15() {
+void SpeakerQuinn3600::animateSpeaker() {
 	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -1787,7 +1787,7 @@ void SpeakerQuinn3700::setText(const Common::String &msg) {
 	VisualSpeaker::setText(msg);
 }
 
-void SpeakerQuinn3700::proc15() {
+void SpeakerQuinn3700::animateSpeaker() {
 	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -1872,7 +1872,7 @@ SpeakerRalf3245::SpeakerRalf3245() {
 	_numFrames = 0;
 }
 
-void SpeakerRalf3245::proc15() {
+void SpeakerRalf3245::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3245 *scene = (Scene3245 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1924,7 +1924,7 @@ SpeakerRocko::SpeakerRocko() {
 	_numFrames = 0;
 }
 
-void SpeakerRocko3200::proc15() {
+void SpeakerRocko3200::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1947,7 +1947,7 @@ void SpeakerRocko3200::proc15() {
 	}
 }
 
-void SpeakerRocko3220::proc15() {
+void SpeakerRocko3220::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3220 *scene = (Scene3220 *)R2_GLOBALS._sceneManager._scene;
 
@@ -1970,7 +1970,7 @@ void SpeakerRocko3220::proc15() {
 	}
 }
 
-void SpeakerRocko3230::proc15() {
+void SpeakerRocko3230::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3230 *scene = (Scene3230 *)R2_GLOBALS._sceneManager._scene;
 
@@ -2009,7 +2009,7 @@ SpeakerSeeker::SpeakerSeeker(): VisualSpeaker() {
 	_numFrames = 0;
 }
 
-void SpeakerSeeker300::proc15() {
+void SpeakerSeeker300::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -2045,7 +2045,7 @@ void SpeakerSeeker300::proc15() {
 	}
 }
 
-void SpeakerSeeker500::proc15() {
+void SpeakerSeeker500::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -2082,7 +2082,7 @@ void SpeakerSeeker500::proc15() {
 	}
 }
 
-void SpeakerSeeker1100::proc15() {
+void SpeakerSeeker1100::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -2142,7 +2142,7 @@ void SpeakerSeeker1100::proc15() {
 	}
 }
 
-void SpeakerSeeker1900::proc15() {
+void SpeakerSeeker1900::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -2173,7 +2173,7 @@ void SpeakerSeeker1900::proc15() {
 	}
 }
 
-void SpeakerSeeker2435::proc15() {
+void SpeakerSeeker2435::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -2200,7 +2200,7 @@ void SpeakerSeeker2435::proc15() {
 	}
 }
 
-void SpeakerSeeker2450::proc15() {
+void SpeakerSeeker2450::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -2226,7 +2226,7 @@ void SpeakerSeeker2450::proc15() {
 	}
 }
 
-void SpeakerSeeker3375::proc15() {
+void SpeakerSeeker3375::animateSpeaker() {
 	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -2275,7 +2275,7 @@ void SpeakerSeeker3375::proc15() {
 	}
 }
 
-void SpeakerSeeker3385::proc15() {
+void SpeakerSeeker3385::animateSpeaker() {
 	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -2324,7 +2324,7 @@ void SpeakerSeeker3385::proc15() {
 	}
 }
 
-void SpeakerSeeker3395::proc15() {
+void SpeakerSeeker3395::animateSpeaker() {
 	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -2373,7 +2373,7 @@ void SpeakerSeeker3395::proc15() {
 	}
 }
 
-void SpeakerSeeker3400::proc15() {
+void SpeakerSeeker3400::animateSpeaker() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -2432,7 +2432,7 @@ void SpeakerSeeker3400::proc15() {
 	}
 }
 
-void SpeakerSeeker3600::proc15() {
+void SpeakerSeeker3600::animateSpeaker() {
 	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -2492,7 +2492,7 @@ void SpeakerSeeker3700::setText(const Common::String &msg) {
 	VisualSpeaker::setText(msg);
 }
 
-void SpeakerSeeker3700::proc15() {
+void SpeakerSeeker3700::animateSpeaker() {
 	Scene3700 *scene = (Scene3700 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -2572,7 +2572,7 @@ SpeakerSocko3200::SpeakerSocko3200() {
 	_numFrames = 0;
 }
 
-void SpeakerSocko3200::proc15() {
+void SpeakerSocko3200::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3200 *scene = (Scene3200 *)R2_GLOBALS._sceneManager._scene;
 
@@ -2611,7 +2611,7 @@ SpeakerSoldier::SpeakerSoldier(int color) {
 	_numFrames = 0;
 }
 
-void SpeakerSoldier300::proc15() {
+void SpeakerSoldier300::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -2655,7 +2655,7 @@ SpeakerTealMode7::SpeakerTealMode7(): SpeakerTeal() {
 	_displayMode = 7;
 }
 
-void SpeakerTeal180::proc15() {
+void SpeakerTeal180::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -2690,7 +2690,7 @@ void SpeakerTeal180::proc15() {
 	}
 }
 
-void SpeakerTeal300::proc15() {
+void SpeakerTeal300::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -2714,7 +2714,7 @@ void SpeakerTeal300::proc15() {
 	}
 }
 
-void SpeakerTeal1625::proc15() {
+void SpeakerTeal1625::animateSpeaker() {
 	int v = _speakerMode;
 
 	if (!_object2) {
@@ -2738,7 +2738,7 @@ void SpeakerTeal1625::proc15() {
 	}
 }
 
-void SpeakerTeal3240::proc15() {
+void SpeakerTeal3240::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene;
 
@@ -2761,7 +2761,7 @@ void SpeakerTeal3240::proc15() {
 	}
 }
 
-void SpeakerTeal3400::proc15() {
+void SpeakerTeal3400::animateSpeaker() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -2818,7 +2818,7 @@ void SpeakerTeal3400::proc15() {
 	}
 }
 
-void SpeakerTeal3600::proc15() {
+void SpeakerTeal3600::animateSpeaker() {
 	Scene3600 *scene = (Scene3600 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -2890,7 +2890,7 @@ SpeakerTomko3245::SpeakerTomko3245() {
 	_numFrames = 0;
 }
 
-void SpeakerTomko3245::proc15() {
+void SpeakerTomko3245::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3245 *scene = (Scene3245 *)R2_GLOBALS._sceneManager._scene;
 
@@ -2942,7 +2942,7 @@ SpeakerWebbster::SpeakerWebbster(int color) {
 	_numFrames = 0;
 }
 
-void SpeakerWebbster180::proc15() {
+void SpeakerWebbster180::animateSpeaker() {
 	Scene180 *scene = (Scene180 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -2983,7 +2983,7 @@ void SpeakerWebbster180::proc15() {
 	}
 }
 
-void SpeakerWebbster3240::proc15() {
+void SpeakerWebbster3240::animateSpeaker() {
 	int v = _speakerMode;
 	Scene3240 *scene = (Scene3240 *)R2_GLOBALS._sceneManager._scene;
 
@@ -3006,7 +3006,7 @@ void SpeakerWebbster3240::proc15() {
 	}
 }
 
-void SpeakerWebbster3375::proc15() {
+void SpeakerWebbster3375::animateSpeaker() {
 	Scene3375 *scene = (Scene3375 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -3050,7 +3050,7 @@ void SpeakerWebbster3375::proc15() {
 	}
 }
 
-void SpeakerWebbster3385::proc15() {
+void SpeakerWebbster3385::animateSpeaker() {
 	Scene3385 *scene = (Scene3385 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -3094,7 +3094,7 @@ void SpeakerWebbster3385::proc15() {
 	}
 }
 
-void SpeakerWebbster3395::proc15() {
+void SpeakerWebbster3395::animateSpeaker() {
 	Scene3395 *scene = (Scene3395 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -3138,7 +3138,7 @@ void SpeakerWebbster3395::proc15() {
 	}
 }
 
-void SpeakerWebbster3400::proc15() {
+void SpeakerWebbster3400::animateSpeaker() {
 	Scene3400 *scene = (Scene3400 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
@@ -3197,7 +3197,7 @@ SpeakerDutyOfficer180::SpeakerDutyOfficer180(): VisualSpeaker() {
 	_numFrames = 0;
 }
 
-void SpeakerDutyOfficer180::proc15() {
+void SpeakerDutyOfficer180::animateSpeaker() {
 	Scene180 *scene = (Scene180 *)R2_GLOBALS._sceneManager._scene;
 
 	int v = _speakerMode;
-- 
cgit v1.2.3