diff --git a/projects/mtg/include/ActionLayer.h b/projects/mtg/include/ActionLayer.h index 0a4c4b20a..2d180984b 100644 --- a/projects/mtg/include/ActionLayer.h +++ b/projects/mtg/include/ActionLayer.h @@ -23,7 +23,7 @@ class ActionLayer: public GuiLayer, public JGuiListener{ int stuffHappened; virtual void Render(); virtual void Update(float dt); - int unstopableRenderInProgress(); + int unstoppableRenderInProgress(); bool CheckUserInput(u32 key); ActionLayer(int id, GameObserver* _game):GuiLayer(id, _game){ menuObject = NULL; abilitiesMenu = NULL; stuffHappened = 0;}; ~ActionLayer(); diff --git a/projects/mtg/include/GuiLayers.h b/projects/mtg/include/GuiLayers.h index f5c1a2fb0..6c01a9b33 100644 --- a/projects/mtg/include/GuiLayers.h +++ b/projects/mtg/include/GuiLayers.h @@ -35,7 +35,7 @@ class GuiLayer{ virtual ~GuiLayer(); virtual void Update(float dt); virtual bool CheckUserInput(u32 key){ return false; }; - virtual int unstopableRenderInProgress(){return 0;}; + virtual int unstoppableRenderInProgress(){return 0;}; int getIndexOf(JGuiObject * object); JGuiObject * getByIndex (int index); virtual void Render(); @@ -55,7 +55,7 @@ class GuiLayers{ void Render(); void Add(GuiLayer * layer); void Remove(); - int unstopableRenderInProgress(); + int unstoppableRenderInProgress(); ~GuiLayers(); }; diff --git a/projects/mtg/src/ActionLayer.cpp b/projects/mtg/src/ActionLayer.cpp index 51b7971d5..a44d1768b 100644 --- a/projects/mtg/src/ActionLayer.cpp +++ b/projects/mtg/src/ActionLayer.cpp @@ -27,7 +27,7 @@ int ActionLayer::reactToTargetClick(ActionElement* ability, Targetable * card){ return result; } -int ActionLayer::unstopableRenderInProgress(){ +int ActionLayer::unstoppableRenderInProgress(){ for (int i=0;iunstopableRenderInProgress()) + if (objects[i]->unstoppableRenderInProgress()) return 1; } return 0;