diff options
author | Paul Gilbert | 2013-11-10 16:02:55 -0500 |
---|---|---|
committer | Paul Gilbert | 2013-11-10 16:02:55 -0500 |
commit | 2728aa0b703f769d01341b749700bf335d16f862 (patch) | |
tree | 076a8f47ab2aa7bb8d559c398d6629a8760f9e4c /engines | |
parent | a1cc19f91667f292564664a9eb0d656ff96257c3 (diff) | |
download | scummvm-rg350-2728aa0b703f769d01341b749700bf335d16f862.tar.gz scummvm-rg350-2728aa0b703f769d01341b749700bf335d16f862.tar.bz2 scummvm-rg350-2728aa0b703f769d01341b749700bf335d16f862.zip |
TSAGE: Rename VisualSpeaker methods proc15 and proc16
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/converse.cpp | 6 | ||||
-rw-r--r-- | engines/tsage/converse.h | 2 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes3.cpp | 10 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_speakers.cpp | 140 | ||||
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_speakers.h | 140 |
5 files changed, 149 insertions, 149 deletions
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp index 5a4310228d..688151803a 100644 --- a/engines/tsage/converse.cpp +++ b/engines/tsage/converse.cpp @@ -730,7 +730,7 @@ void StripManager::remove() { if (g_vm->getGameID() == GType_Ringworld2) { for (uint i = 0; i < _speakerList.size(); ++i) { if (_activeSpeaker != _speakerList[i]) - _speakerList[i]->proc16(); + _speakerList[i]->stopSpeaking(); } } @@ -952,7 +952,7 @@ void StripManager::signal() { if (speaker) { speaker->_speakerMode = obj44._speakerMode; if (!choiceList[strIndex].empty()) - speaker->proc15(); + speaker->animateSpeaker(); } if (!choiceList[strIndex].empty()) { @@ -962,7 +962,7 @@ void StripManager::signal() { _delayFrames = 1; } else { _delayFrames = 0; - speaker->proc15(); + speaker->animateSpeaker(); } } else { _textShown = true; diff --git a/engines/tsage/converse.h b/engines/tsage/converse.h index 7e57199d2f..e7b8e811ca 100644 --- a/engines/tsage/converse.h +++ b/engines/tsage/converse.h @@ -94,7 +94,7 @@ public: virtual void startSpeaking(Action *action); virtual void setText(const Common::String &msg); virtual void removeText(); - virtual void proc16() {} + virtual void stopSpeaking() {} void setTextPos(const Common::Point &pt) { _textPos = pt; } }; diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp index 4f70c74266..208e94d2b5 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp @@ -4641,7 +4641,7 @@ void Scene3600::signal() { case 3321: // Removed (useless ?) call to sub_1D227 R2_GLOBALS._scrollFollower = &R2_GLOBALS._player; - _tealSpeaker.proc16(); + _tealSpeaker.stopSpeaking(); _teal.show(); _teal.setStrip(1); _consoleLights.postInit(); @@ -4651,9 +4651,9 @@ void Scene3600::signal() { break; case 3322: // Removed (useless ?) call to sub_1D227 - _quinnSpeaker.proc16(); + _quinnSpeaker.stopSpeaking(); _quinnSpeaker._displayMode = 1; - _tealSpeaker.proc16(); + _tealSpeaker.stopSpeaking(); _tealSpeaker._displayMode = 7; R2_GLOBALS._scrollFollower = &_teal; _sceneMode = 3605; @@ -4664,14 +4664,14 @@ void Scene3600::signal() { _tealDead = true; else { // Removed (useless ?) call to sub_1D227 - _protectorSpeaker.proc16(); + _protectorSpeaker.stopSpeaking(); _protector.show(); _protector.setup(3258, 6, 1); _sceneMode = 3607; _protector.setAction(&_sequenceManager1, this, _sceneMode, &_protector, NULL); - _protectorSpeaker.proc16(); + _protectorSpeaker.stopSpeaking(); _protectorSpeaker._displayMode = 1; _quinnSpeaker._displayMode = 1; _protector.show(); 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; diff --git a/engines/tsage/ringworld2/ringworld2_speakers.h b/engines/tsage/ringworld2/ringworld2_speakers.h index a49bb1d3e5..33e34ce8f6 100644 --- a/engines/tsage/ringworld2/ringworld2_speakers.h +++ b/engines/tsage/ringworld2/ringworld2_speakers.h @@ -63,8 +63,8 @@ public: virtual void signal(); virtual void dispatch(); virtual void setText(const Common::String &msg); - virtual void proc15() {} - virtual void proc16(); + virtual void animateSpeaker() {} + virtual void stopSpeaking(); void setDelay(int delay); }; @@ -83,7 +83,7 @@ public: SpeakerCaptain3210(); virtual Common::String getClassName() { return "SpeakerCaptain3210"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Caretaker @@ -102,7 +102,7 @@ public: SpeakerChief1100(); virtual Common::String getClassName() { return "SpeakerChief1100"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Guard @@ -116,7 +116,7 @@ public: class SpeakerGuard2800 : public SpeakerGuard { public: virtual Common::String getClassName() { return "SpeakerGuard2800"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Jocko @@ -130,19 +130,19 @@ public: class SpeakerJocko3200 : public SpeakerJocko { public: virtual Common::String getClassName() { return "SpeakerJocko3200"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerJocko3220 : public SpeakerJocko { public: virtual Common::String getClassName() { return "SpeakerJocko3220"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerJocko3230 : public SpeakerJocko { public: virtual Common::String getClassName() { return "SpeakerJocko3230"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Miranda @@ -156,55 +156,55 @@ public: class SpeakerMiranda300 : public SpeakerMiranda { public: virtual Common::String getClassName() { return "SpeakerMiranda300"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerMiranda1625 : public SpeakerMiranda { public: virtual Common::String getClassName() { return "SpeakerMiranda1625"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerMiranda3255 : public SpeakerMiranda { public: virtual Common::String getClassName() { return "SpeakerMiranda3255"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerMiranda3375 : public SpeakerMiranda { public: virtual Common::String getClassName() { return "SpeakerMiranda3375"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerMiranda3385 : public SpeakerMiranda { public: virtual Common::String getClassName() { return "SpeakerMiranda3385"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerMiranda3395 : public SpeakerMiranda { public: virtual Common::String getClassName() { return "SpeakerMiranda3395"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerMiranda3400 : public SpeakerMiranda { public: virtual Common::String getClassName() { return "SpeakerMiranda3400"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerMiranda3600 : public SpeakerMiranda { public: virtual Common::String getClassName() { return "SpeakerMiranda3600"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerMiranda3700 : public SpeakerMiranda { public: virtual Common::String getClassName() { return "SpeakerMiranda3700"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Nej @@ -218,19 +218,19 @@ public: class SpeakerNej2700 : public SpeakerNej { public: virtual Common::String getClassName() { return "SpeakerNej2700"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerNej2750 : public SpeakerNej { public: virtual Common::String getClassName() { return "SpeakerNej2750"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerNej2800 : public SpeakerNej { public: virtual Common::String getClassName() { return "SpeakerNej2800"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Pharisha @@ -245,7 +245,7 @@ public: class SpeakerPharisha2435 : public SpeakerPharisha { public: virtual Common::String getClassName() { return "SpeakerPharisha2435"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Private @@ -255,7 +255,7 @@ public: SpeakerPrivate3210(); virtual Common::String getClassName() { return "SpeakerPrivate3210"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Protector @@ -265,7 +265,7 @@ public: SpeakerProtector3600(); virtual Common::String getClassName() { return "SpeakerProtector3600"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Quinn @@ -279,92 +279,92 @@ public: class SpeakerQuinn300 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn300"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn500 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn500"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn1100 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn1100"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn2435 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn2435"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn2450 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn2450"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn2700 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn2700"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn2750 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn2750"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn2800 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn2800"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn3255 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn3255"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn3375 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn3375"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn3385 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn3385"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn3395 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn3395"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn3400 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn3400"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn3600 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn3600"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerQuinn3700 : public SpeakerQuinn { public: virtual Common::String getClassName() { return "SpeakerQuinn3700"; } virtual void setText(const Common::String &msg); - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to QuinnL @@ -383,7 +383,7 @@ public: SpeakerRalf3245(); virtual Common::String getClassName() { return "SpeakerRalf3245"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Rocko @@ -397,19 +397,19 @@ public: class SpeakerRocko3200 : public SpeakerRocko { public: virtual Common::String getClassName() { return "SpeakerRocko3200"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerRocko3220 : public SpeakerRocko { public: virtual Common::String getClassName() { return "SpeakerRocko3220"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerRocko3230 : public SpeakerRocko { public: virtual Common::String getClassName() { return "SpeakerRocko3230"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Seeker @@ -423,74 +423,74 @@ public: class SpeakerSeeker300 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker300"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker500 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker500"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker1100 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker1100"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker1900 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker1900"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker2435 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker2435"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker2450 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker2450"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker3375 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker3375"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker3385 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker3385"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker3395 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker3395"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker3400 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker3400"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker3600 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker3600"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSeeker3700 : public SpeakerSeeker { public: virtual Common::String getClassName() { return "SpeakerSeeker3700"; } virtual void setText(const Common::String &msg); - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to SeekerL @@ -509,7 +509,7 @@ public: SpeakerSocko3200(); virtual Common::String getClassName() { return "SpeakerSocko3200"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Soldier @@ -524,7 +524,7 @@ class SpeakerSoldier300 : public SpeakerSoldier { public: SpeakerSoldier300() : SpeakerSoldier(60) {} virtual Common::String getClassName() { return "SpeakerSoldier300"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerSoldier1625 : public SpeakerSoldier { @@ -550,37 +550,37 @@ public: class SpeakerTeal180 : public SpeakerTeal { public: virtual Common::String getClassName() { return "SpeakerTeal180"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerTeal300 : public SpeakerTeal { public: virtual Common::String getClassName() { return "SpeakerTeal300"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerTeal1625 : public SpeakerTeal { public: virtual Common::String getClassName() { return "SpeakerTeal1625"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerTeal3240 : public SpeakerTeal { public: virtual Common::String getClassName() { return "SpeakerTeal3240"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerTeal3400 : public SpeakerTeal { public: virtual Common::String getClassName() { return "SpeakerTeal3400"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerTeal3600 : public SpeakerTealMode7 { public: virtual Common::String getClassName() { return "SpeakerTeal3600"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Tomko @@ -590,7 +590,7 @@ public: SpeakerTomko3245(); virtual Common::String getClassName() { return "SpeakerTomko3245"; } - virtual void proc15(); + virtual void animateSpeaker(); }; // Classes related to Webbster @@ -605,7 +605,7 @@ class SpeakerWebbster180 : public SpeakerWebbster { public: SpeakerWebbster180() : SpeakerWebbster(27) {} virtual Common::String getClassName() { return "SpeakerWebbster180"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerWebbster2500 : public SpeakerWebbster { @@ -619,7 +619,7 @@ public: SpeakerWebbster3240() : SpeakerWebbster(10) {} virtual Common::String getClassName() { return "SpeakerWebbster3240"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerWebbster3375 : public SpeakerWebbster { @@ -627,7 +627,7 @@ public: SpeakerWebbster3375() : SpeakerWebbster(60) {} virtual Common::String getClassName() { return "SpeakerWebbster3375"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerWebbster3385 : public SpeakerWebbster { @@ -635,7 +635,7 @@ public: SpeakerWebbster3385() : SpeakerWebbster(60) {} virtual Common::String getClassName() { return "SpeakerWebbster3385"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerWebbster3395 : public SpeakerWebbster { @@ -643,7 +643,7 @@ public: SpeakerWebbster3395() : SpeakerWebbster(60) {} virtual Common::String getClassName() { return "SpeakerWebbster3395"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerWebbster3400 : public SpeakerWebbster { @@ -651,7 +651,7 @@ public: SpeakerWebbster3400() : SpeakerWebbster(27) {} virtual Common::String getClassName() { return "SpeakerWebbster3400"; } - virtual void proc15(); + virtual void animateSpeaker(); }; class SpeakerDutyOfficer180: public VisualSpeaker { @@ -659,7 +659,7 @@ public: SpeakerDutyOfficer180(); virtual Common::String getClassName() { return "SpeakerDutyOfficer"; } - virtual void proc15(); + virtual void animateSpeaker(); }; } // End of namespace Ringworld2 |