aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2015-10-19 00:20:09 +0200
committerStrangerke2015-10-19 00:20:09 +0200
commit3488f05585a1c3491e90e3aa5d14fb34fcfb17d5 (patch)
tree34f3680d87ba4c4171cf241d0ead70be16a421d1 /engines
parent7a56c52c89d8a6afc391b1f8181dcad56ad3997e (diff)
downloadscummvm-rg350-3488f05585a1c3491e90e3aa5d14fb34fcfb17d5.tar.gz
scummvm-rg350-3488f05585a1c3491e90e3aa5d14fb34fcfb17d5.tar.bz2
scummvm-rg350-3488f05585a1c3491e90e3aa5d14fb34fcfb17d5.zip
MADS: Phantom: Some renaming in scene 108
Diffstat (limited to 'engines')
-rw-r--r--engines/mads/phantom/phantom_scenes1.cpp8
-rw-r--r--engines/mads/phantom/phantom_scenes1.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp
index 14b5be30a8..0e50bf55e7 100644
--- a/engines/mads/phantom/phantom_scenes1.cpp
+++ b/engines/mads/phantom/phantom_scenes1.cpp
@@ -5132,7 +5132,7 @@ void Scene108::enter() {
void Scene108::step() {
if (_anim0ActvFl)
- handle_animation_char ();
+ handleCharAnimation ();
if ((_globals[kWalkerConverse] == 2) || (_globals[kWalkerConverse] == 3)) {
++_conversationCount;
@@ -5143,7 +5143,7 @@ void Scene108::step() {
void Scene108::actions() {
if (_vm->_gameConv->_running == 2) {
- process_conversation_charles();
+ handleCharlesConversation();
_action._inProgress = false;
return;
}
@@ -5303,7 +5303,7 @@ void Scene108::actions() {
void Scene108::preActions() {
}
-void Scene108::handle_animation_char() {
+void Scene108::handleCharAnimation() {
if (_scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame() == _charFrame)
return;
@@ -5502,7 +5502,7 @@ void Scene108::handle_animation_char() {
}
}
-void Scene108::process_conversation_charles() {
+void Scene108::handleCharlesConversation() {
switch (_action._activeAction._verbId) {
case 1:
case 25:
diff --git a/engines/mads/phantom/phantom_scenes1.h b/engines/mads/phantom/phantom_scenes1.h
index 7a3b3fb38e..99146ae3c3 100644
--- a/engines/mads/phantom/phantom_scenes1.h
+++ b/engines/mads/phantom/phantom_scenes1.h
@@ -243,8 +243,8 @@ private:
int _conversationCount;
int _prevShutUpFrame;
- void handle_animation_char();
- void process_conversation_charles();
+ void handleCharAnimation();
+ void handleCharlesConversation();
public:
Scene108(MADSEngine *vm);