From bb55045cc85e1c9b70bd7267de0b578e6662725b Mon Sep 17 00:00:00 2001 From: Strangerke Date: Mon, 18 Jun 2012 08:03:02 +0200 Subject: TONY: Rename two variables --- engines/tony/custom.cpp | 6 +++--- engines/tony/globals.cpp | 2 +- engines/tony/globals.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/tony') diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp index fd5d17470b..e91d6873a4 100644 --- a/engines/tony/custom.cpp +++ b/engines/tony/custom.cpp @@ -408,8 +408,8 @@ DECLARE_CUSTOM_FUNCTION(SendFullscreenMsgStart)(CORO_PARAM, uint32 nMsg, uint32 _ctx->msg = new RMMessage(nMsg); - GLOBALS.SFM_nLoc = GLOBALS._loc->TEMPGetNumLoc(); - GLOBALS.SFM_pt = GLOBALS._tony->position(); + GLOBALS._fullScreenMessageLoc = GLOBALS._loc->TEMPGetNumLoc(); + GLOBALS._fullScreenMessagePt = GLOBALS._tony->position(); if (GLOBALS._bSkipIdle) return; @@ -478,7 +478,7 @@ DECLARE_CUSTOM_FUNCTION(ClearScreen)(CORO_PARAM, uint32, uint32, uint32, uint32) DECLARE_CUSTOM_FUNCTION(SendFullscreenMsgEnd)(CORO_PARAM, uint32 bNotEnableTony, uint32, uint32, uint32) { GLOBALS.Freeze(); - GLOBALS.LoadLocation(GLOBALS.SFM_nLoc, RMPoint(GLOBALS.SFM_pt._x, GLOBALS.SFM_pt._y), RMPoint(-1, -1)); + GLOBALS.LoadLocation(GLOBALS._fullScreenMessageLoc, RMPoint(GLOBALS._fullScreenMessagePt._x, GLOBALS._fullScreenMessagePt._y), RMPoint(-1, -1)); if (!bNotEnableTony) GLOBALS._tony->show(); GLOBALS.Unfreeze(); diff --git a/engines/tony/globals.cpp b/engines/tony/globals.cpp index 48b04007b4..893322942a 100644 --- a/engines/tony/globals.cpp +++ b/engines/tony/globals.cpp @@ -74,7 +74,7 @@ Globals::Globals() { _lastMusic = 0; _lastTappeto = 0; Common::fill(&_tappeti[0], &_tappeti[200], 0); - SFM_nLoc = 0; + _fullScreenMessageLoc = 0; // MPAL global variables _mpalError = 0; diff --git a/engines/tony/globals.h b/engines/tony/globals.h index d3f5eb0849..96a61ffd9c 100644 --- a/engines/tony/globals.h +++ b/engines/tony/globals.h @@ -246,8 +246,8 @@ public: int _lastMusic, _lastTappeto; int _tappeti[200]; - RMPoint SFM_pt; - int SFM_nLoc; + RMPoint _fullScreenMessagePt; + int _fullScreenMessageLoc; /** * @defgroup MPAL variables -- cgit v1.2.3