No code change just reformatting of header files.
finishing up my reformatting of the source from November/December following the guidelines that were posted. some extra things I added: * Any empty virtual declarations were kept to one line. * Enums were split up into separate lines to promote uniformity across all headers. ( each header file had a different style for enums)
This commit is contained in:
@@ -9,52 +9,51 @@
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
||||
|
||||
// private class only used by Navigator, see implementation file
|
||||
class CardZone;
|
||||
|
||||
class Navigator : public CardSelectorBase
|
||||
|
||||
class Navigator: public CardSelectorBase
|
||||
{
|
||||
public:
|
||||
|
||||
Navigator(DuelLayers* inDuelLayers);
|
||||
virtual ~Navigator();
|
||||
Navigator(DuelLayers* inDuelLayers);
|
||||
virtual ~Navigator();
|
||||
|
||||
// Inherited functions from GuiLayer
|
||||
bool CheckUserInput(JButton inKey);
|
||||
bool CheckUserInput(int x, int y);
|
||||
void Update(float dt);
|
||||
void Render();
|
||||
// Inherited functions from GuiLayer
|
||||
bool CheckUserInput(JButton inKey);
|
||||
bool CheckUserInput(int x, int y);
|
||||
void Update(float dt);
|
||||
void Render();
|
||||
|
||||
//Limitor operations
|
||||
void PushLimitor();
|
||||
void PopLimitor();
|
||||
void Limit(LimitorFunctor<PlayGuiObject>* inLimitor, CardView::SelectorZone inZone);
|
||||
//Limitor operations
|
||||
void PushLimitor();
|
||||
void PopLimitor();
|
||||
void Limit(LimitorFunctor<PlayGuiObject>* inLimitor, CardView::SelectorZone inZone);
|
||||
|
||||
virtual void Add(PlayGuiObject*);
|
||||
virtual void Remove(PlayGuiObject*);
|
||||
virtual void Push() {}
|
||||
virtual void Pop() {}
|
||||
virtual void Add(PlayGuiObject*);
|
||||
virtual void Remove(PlayGuiObject*);
|
||||
virtual void Push() {}
|
||||
virtual void Pop() {}
|
||||
|
||||
protected:
|
||||
PlayGuiObject* GetCurrentCard();
|
||||
PlayGuiObject* GetCurrentCard();
|
||||
|
||||
/**
|
||||
** Helper function that translates a card type into an internal zone ID (used as the index for the card zone map)
|
||||
*/
|
||||
int CardToCardZone(PlayGuiObject* card);
|
||||
/**
|
||||
** Helper function that translates a card type into an internal zone ID (used as the index for the card zone map)
|
||||
*/
|
||||
int CardToCardZone(PlayGuiObject* card);
|
||||
|
||||
void HandleKeyStroke(JButton inKey);
|
||||
void HandleKeyStroke(JButton inKey);
|
||||
|
||||
private:
|
||||
std::map<int, CardZone*> mCardZones;
|
||||
CardZone* mCurrentZone;
|
||||
Pos mDrawPosition;
|
||||
std::map<int, CardZone*> mCardZones;
|
||||
CardZone* mCurrentZone;
|
||||
Pos mDrawPosition;
|
||||
|
||||
DuelLayers* mDuelLayers;
|
||||
DuelLayers* mDuelLayers;
|
||||
|
||||
bool mLimitorEnabled;
|
||||
std::stack<CardZone*> mCurrentZoneStack;
|
||||
bool mLimitorEnabled;
|
||||
std::stack<CardZone*> mCurrentZoneStack;
|
||||
};
|
||||
|
||||
#endif //NAVIGATOR_H
|
||||
|
||||
Reference in New Issue
Block a user