diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp index 16cf4497fca2..47cdcb56b5f7 100644 --- a/engines/tony/font.cpp +++ b/engines/tony/font.cpp @@ -1798,7 +1798,7 @@ void RMText::SetMaxLineLength(int max) { maxLineLength = max; } -void RMText::RemoveThis(CORO_PARAM, bool &result) { +void RMText::removeThis(CORO_PARAM, bool &result) { // Here we can do checks on the number of frames, time spent, etc. result = true; } @@ -2064,7 +2064,7 @@ void RMTextDialog::SetAlwaysDisplay(void) { m_bAlwaysDisplay = true; } -void RMTextDialog::RemoveThis(CORO_PARAM, bool &result) { +void RMTextDialog::removeThis(CORO_PARAM, bool &result) { CORO_BEGIN_CONTEXT; bool expired; CORO_END_CONTEXT(_ctx); @@ -2554,7 +2554,7 @@ void RMDialogChoice::Hide(CORO_PARAM) { } -void RMDialogChoice::RemoveThis(CORO_PARAM, bool &result) { +void RMDialogChoice::removeThis(CORO_PARAM, bool &result) { result = bRemoveFromOT; } diff --git a/engines/tony/font.h b/engines/tony/font.h index 0faaec89d490..752f142cf134 100644 --- a/engines/tony/font.h +++ b/engines/tony/font.h @@ -220,7 +220,7 @@ class RMText : public RMGfxWoodyBuffer { void WriteText(const RMString &text, RMFontColor *font, int *time = NULL); // Overloaded function to decide when you delete the object from the OT list - virtual void RemoveThis(CORO_PARAM, bool &result); + virtual void removeThis(CORO_PARAM, bool &result); // Overloading of the Draw to center the text, if necessary virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); @@ -261,7 +261,7 @@ class RMTextDialog : public RMText { void WriteText(const RMString &text, RMFontColor *font, int *time = NULL); // Overloaded function to decide when you delete the object from the OT list - virtual void RemoveThis(CORO_PARAM, bool &result); + virtual void removeThis(CORO_PARAM, bool &result); // Overloaded de-registration virtual void Unregister(void); @@ -334,7 +334,7 @@ class RMTextItemName : protected RMText { bool IsItemSelected(); bool IsNormalItemSelected(); - virtual void RemoveThis(CORO_PARAM, bool &result) { + virtual void removeThis(CORO_PARAM, bool &result) { result = true; } }; @@ -362,7 +362,7 @@ class RMDialogChoice : public RMGfxWoodyBuffer { void SetSelected(CORO_PARAM, int pos); public: - virtual void RemoveThis(CORO_PARAM, bool &result); + virtual void removeThis(CORO_PARAM, bool &result); virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); void Unregister(void); diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp index c22706cc6de6..5f8f238bffe3 100644 --- a/engines/tony/game.cpp +++ b/engines/tony/game.cpp @@ -995,7 +995,7 @@ bool RMOptionScreen::IsClosing(void) { return m_bExit; } -int RMOptionScreen::Priority() { +int RMOptionScreen::priority() { // Just below the mouse return 190; } @@ -1375,7 +1375,7 @@ void RMOptionScreen::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive CORO_END_CODE; } -void RMOptionScreen::RemoveThis(CORO_PARAM, bool &result) { +void RMOptionScreen::removeThis(CORO_PARAM, bool &result) { if (m_bExit) result = true; else @@ -1523,7 +1523,7 @@ void RMPointer::Close(void) { } -int RMPointer::Priority() { +int RMPointer::priority() { // Pointer has minimum priority so it will be drawn last return 200; } @@ -1569,7 +1569,7 @@ void RMPointer::DoFrame(RMGfxTargetBuffer *bigBuf) { m_specialPointer[m_nCurSpecialPointer - 1]->DoFrame(bigBuf, false); } -void RMPointer::RemoveThis(CORO_PARAM, bool &result) { +void RMPointer::removeThis(CORO_PARAM, bool &result) { // Always remove from the OT list, to support disabling the pointer result = true; } diff --git a/engines/tony/game.h b/engines/tony/game.h index d42a3805c8e5..5dbd81c0793b 100644 --- a/engines/tony/game.h +++ b/engines/tony/game.h @@ -93,7 +93,7 @@ class RMPointer : public RMGfxTask { void DoFrame(RMGfxTargetBuffer *bigBuf); // Overloading of priorities - int Priority(); + int priority(); // Overloading draw method virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); @@ -104,7 +104,7 @@ class RMPointer : public RMGfxTask { } // Overloading of the method to see if rising from the list - virtual void RemoveThis(CORO_PARAM, bool &result); + virtual void removeThis(CORO_PARAM, bool &result); // Sets a new action as current void SetAction(RMTonyAction action) { @@ -272,9 +272,9 @@ class RMOptionScreen : public RMGfxWoodyBuffer { bool IsClosing(); // Overloaded methods - virtual int Priority(); + virtual int priority(); virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); - virtual void RemoveThis(CORO_PARAM, bool &result); + virtual void removeThis(CORO_PARAM, bool &result); // Polling for the option screen void DoFrame(CORO_PARAM, RMInput *m_input); diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp index 2076e2af47e3..6369d9120760 100644 --- a/engines/tony/gfxcore.cpp +++ b/engines/tony/gfxcore.cpp @@ -1945,7 +1945,7 @@ void RMGfxBox::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) * RMGfxClearTask Methods \****************************************************************************/ -int RMGfxClearTask::Priority() { +int RMGfxClearTask::priority() { // Maximum priority (must be done first) return 1; } diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h index 51d27b73110e..2daa7edc6d4f 100644 --- a/engines/tony/gfxcore.h +++ b/engines/tony/gfxcore.h @@ -257,7 +257,7 @@ class RMGfxClearTask : public RMGfxTask { public: virtual ~RMGfxClearTask() { } - int Priority(); + int priority(); virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); virtual void removeThis(CORO_PARAM, bool &result); }; diff --git a/engines/tony/inventory.cpp b/engines/tony/inventory.cpp index 9b8f346aaffa..a660ad736eb9 100644 --- a/engines/tony/inventory.cpp +++ b/engines/tony/inventory.cpp @@ -231,7 +231,7 @@ void RMInventory::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pr CORO_END_CODE; } -void RMInventory::RemoveThis(CORO_PARAM, bool &result) { +void RMInventory::removeThis(CORO_PARAM, bool &result) { if (m_state == CLOSED) result = true; else diff --git a/engines/tony/inventory.h b/engines/tony/inventory.h index 87ccaa33b4c5..9ed250592d88 100644 --- a/engines/tony/inventory.h +++ b/engines/tony/inventory.h @@ -98,7 +98,7 @@ class RMInventory : public RMGfxWoodyBuffer { void Reset(void); // Overload test for removal from OT list - virtual void RemoveThis(CORO_PARAM, bool &result); + virtual void removeThis(CORO_PARAM, bool &result); // Overload the drawing of the inventory virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp index 1a7933a03dcd..6ede99b57d10 100644 --- a/engines/tony/loc.cpp +++ b/engines/tony/loc.cpp @@ -715,7 +715,7 @@ void RMItem::draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) { } -void RMItem::RemoveThis(CORO_PARAM, bool &result) { +void RMItem::removeThis(CORO_PARAM, bool &result) { // Remove from the OT list if the current frame is -1 (pattern over) result = (m_nCurSprite == -1); } @@ -861,7 +861,7 @@ RMWipe::~RMWipe() { CoroScheduler.closeEvent(m_hEndOfFade); } -int RMWipe::Priority(void) { +int RMWipe::priority(void) { return 200; } @@ -871,7 +871,7 @@ void RMWipe::Unregister(void) { CoroScheduler.setEvent(m_hUnregistered); } -void RMWipe::RemoveThis(CORO_PARAM, bool &result) { +void RMWipe::removeThis(CORO_PARAM, bool &result) { result = m_bUnregister; } @@ -1657,7 +1657,7 @@ void RMCharacter::WaitForEndMovement(CORO_PARAM) { CORO_END_CODE; } -void RMCharacter::RemoveThis(CORO_PARAM, bool &result) { +void RMCharacter::removeThis(CORO_PARAM, bool &result) { CORO_BEGIN_CONTEXT; CORO_END_CONTEXT(_ctx); @@ -1666,7 +1666,7 @@ void RMCharacter::RemoveThis(CORO_PARAM, bool &result) { if (bRemoveFromOT) result = true; else - CORO_INVOKE_1(RMItem::RemoveThis, result); + CORO_INVOKE_1(RMItem::removeThis, result); CORO_END_CODE; } diff --git a/engines/tony/loc.h b/engines/tony/loc.h index c11dac478245..282ea0fa4a15 100644 --- a/engines/tony/loc.h +++ b/engines/tony/loc.h @@ -251,13 +251,13 @@ class RMItem : public RMGfxTask { void SetScrollPosition(const RMPoint &scroll); // Overloading of check whether to remove from active list - virtual void RemoveThis(CORO_PARAM, bool &result); + virtual void removeThis(CORO_PARAM, bool &result); // Overloaded Draw virtual void draw(CORO_PARAM, RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim); // Overloaded priority: it's based on Z ordering - virtual int Priority() { + virtual int priority() { return m_z; } @@ -454,7 +454,7 @@ class RMCharacter : protected RMItem { void LinkToBoxes(RMGameBoxes *theBoxes); - virtual void RemoveThis(CORO_PARAM, bool &result); + virtual void removeThis(CORO_PARAM, bool &result); // Update the position of a character void DoFrame(CORO_PARAM, RMGfxTargetBuffer *bigBuf, int loc); @@ -517,8 +517,8 @@ class RMWipe : public RMGfxTask { void WaitForFadeEnd(CORO_PARAM); virtual void Unregister(void); - virtual void RemoveThis(CORO_PARAM, bool &result); - virtual int Priority(void); + virtual void removeThis(CORO_PARAM, bool &result); + virtual int priority(void); };