From 3488f05585a1c3491e90e3aa5d14fb34fcfb17d5 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Mon, 19 Oct 2015 00:20:09 +0200 Subject: MADS: Phantom: Some renaming in scene 108 --- engines/mads/phantom/phantom_scenes1.cpp | 8 ++++---- engines/mads/phantom/phantom_scenes1.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engines') 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); -- cgit v1.2.3