- reimplement r2609 with inheritance, and cleaned up the function code.
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-11-14 01:35:26 +00:00
parent d668fbb45c
commit b934f0a5ab
4 changed files with 22 additions and 72 deletions

View File

@@ -21,7 +21,6 @@ class CardDisplay:public PlayGuiObjectController{
void rotateLeft();
void rotateRight();
bool CheckUserInput(JButton key);
bool CheckUserInputSHOP(JButton key);
bool CheckUserInput(int x, int y);
virtual void Update(float dt);
void Render();

View File

@@ -30,6 +30,12 @@
class MTGPack;
class MTGPacks;
class BoosterDisplay:public CardDisplay {
public:
BoosterDisplay(int id, GameObserver* game, int x, int y, JGuiListener * listener = NULL, TargetChooser * tc = NULL, int nb_displayed_items = 7);
bool CheckUserInput(JButton key);
};
class ShopBooster{
public:
ShopBooster();
@@ -61,7 +67,7 @@ class GameStateShop: public GameState, public JGuiListener
WGuiMenu * shopMenu;
WGuiFilters * filterMenu; //Filter menu slides in sideways from right, or up from bottom.
WGuiCardImage * bigDisplay;
CardDisplay * boosterDisplay;
BoosterDisplay * boosterDisplay;
vector<MTGCardInstance*> subBooster;
MTGDeck * booster;
bool bListCards;