From 077ab10c0536d3f375a7af03f13071ad5418a6b6 Mon Sep 17 00:00:00 2001 From: Tobias Loose Date: Thu, 5 Dec 2013 22:11:48 +0100 Subject: [PATCH] Rename Button to ButtonPressed --- projects/mtg/include/DeckView.h | 2 +- projects/mtg/src/DeckView.cpp | 2 +- projects/mtg/src/GameStateDeckViewer.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/mtg/include/DeckView.h b/projects/mtg/include/DeckView.h index d5d7dca5b..c17d67657 100644 --- a/projects/mtg/include/DeckView.h +++ b/projects/mtg/include/DeckView.h @@ -39,7 +39,7 @@ public: virtual void Render() = 0; virtual MTGCard * Click(int x, int y) = 0; - bool Button(Buttons button); + bool ButtonPressed(Buttons button); virtual MTGCard *getActiveCard() = 0; virtual void changePosition(int offset) = 0; virtual void changeFilter(int offset) = 0; diff --git a/projects/mtg/src/DeckView.cpp b/projects/mtg/src/DeckView.cpp index 6c1e8e277..7d733d7ab 100644 --- a/projects/mtg/src/DeckView.cpp +++ b/projects/mtg/src/DeckView.cpp @@ -42,7 +42,7 @@ void DeckView::Update(float dt) } } -bool DeckView::Button(Buttons button) +bool DeckView::ButtonPressed(Buttons button) { switch(button) { diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp index d358eed84..dc22d2669 100644 --- a/projects/mtg/src/GameStateDeckViewer.cpp +++ b/projects/mtg/src/GameStateDeckViewer.cpp @@ -424,7 +424,7 @@ void GameStateDeckViewer::Update(float dt) case JGE_BTN_DOWN: if(last_user_activity > 0.2) { - mView->Button(button); + mView->ButtonPressed(button); last_user_activity = 0; mStage = STAGE_WAITING; }