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)
2011-01-21 18:01:14 +00:00
parent 6d3d4c1792
commit e53c16f700
101 changed files with 6128 additions and 4684 deletions
--- a/projects/mtg/include/GameStateShop.h
+++ b/projects/mtg/include/GameStateShop.h
@@ -11,7 +11,6 @@
 #include "DeckDataWrapper.h"
 #include "Tasks.h"

-
 #define STATE_BUY 1
 #define STATE_SELL 2
 #define STAGE_SHOP_MENU 3
@@ -30,94 +29,96 @@
 class MTGPack;
 class MTGPacks;

-class BoosterDisplay:public CardDisplay {
+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);
+    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{
+class ShopBooster
+{
 public:
-  ShopBooster();
-  string getName();
-  void randomize(MTGPacks * packlist);
-  int basePrice();
-  int maxInventory();
-  void addToDeck(MTGDeck * d, WSrcCards * srcCards);
-  string getSort();
+    ShopBooster();
+    string getName();
+    void randomize(MTGPacks * packlist);
+    int basePrice();
+    int maxInventory();
+    void addToDeck(MTGDeck * d, WSrcCards * srcCards);
+    string getSort();
 #ifdef TESTSUITE
-  bool unitTest();
+    bool unitTest();
 #endif
 private:
-  void randomCustom(MTGPacks * packlist);
-  void randomStandard();
-  MTGPack * pack;
-  MTGSetInfo * mainSet;
-  MTGSetInfo * altSet;
+    void randomCustom(MTGPacks * packlist);
+    void randomStandard();
+    MTGPack * pack;
+    MTGSetInfo * mainSet;
+    MTGSetInfo * altSet;
 };

 class GameStateShop: public GameState, public JGuiListener
 {
- private:
-  JQuad * pspIcons[8];
-  WSrcCards * srcCards;
-  JTexture * altThumb[8];
-  JQuad * mBack;
-  TaskList * taskList;
-  float mElapsed;
-  WGuiMenu * shopMenu;
-  WGuiFilters * filterMenu; //Filter menu slides in sideways from right, or up from bottom.
-  WGuiCardImage * bigDisplay;
-  BoosterDisplay * boosterDisplay;
-  vector<MTGCardInstance*> subBooster;
-  MTGDeck * booster;
-  bool bListCards;
+private:
+    JQuad * pspIcons[8];
+    WSrcCards * srcCards;
+    JTexture * altThumb[8];
+    JQuad * mBack;
+    TaskList * taskList;
+    float mElapsed;
+    WGuiMenu * shopMenu;
+    WGuiFilters * filterMenu; //Filter menu slides in sideways from right, or up from bottom.
+    WGuiCardImage * bigDisplay;
+    BoosterDisplay * boosterDisplay;
+    vector<MTGCardInstance*> subBooster;
+    MTGDeck * booster;
+    bool bListCards;

-  void beginFilters();
-  void deleteDisplay();
+    void beginFilters();
+    void deleteDisplay();

-  WSyncable bigSync;
-  SimpleMenu * menu;  
-  PriceList * pricelist;
-  PlayerData * playerdata;
-  MTGPacks * packlist;
-  bool mTouched;
-  bool needLoad;
-  int mPrices[SHOP_ITEMS];
-  int mCounts[SHOP_ITEMS];
-  int mInventory[SHOP_ITEMS];
-  int lightAlpha;
-  int alphaChange;
-  int mBuying;
+    WSyncable bigSync;
+    SimpleMenu * menu;
+    PriceList * pricelist;
+    PlayerData * playerdata;
+    MTGPacks * packlist;
+    bool mTouched;
+    bool needLoad;
+    int mPrices[SHOP_ITEMS];
+    int mCounts[SHOP_ITEMS];
+    int mInventory[SHOP_ITEMS];
+    int lightAlpha;
+    int alphaChange;
+    int mBuying;

-  DeckDataWrapper * myCollection;
-  
-  int mStage;
-  ShopBooster mBooster[BOOSTER_SLOTS];
-  
-  void load();
-  void save(bool force=false);
-  void updateCounts();
-  void beginPurchase(int controlId);
-  void purchaseCard(int controlId);
-  void purchaseBooster(int controlId);
-  void cancelCard(int controlId);
-  void cancelBooster(int controlId);
-  int purchasePrice(int offset);
-  string descPurchase(int controlId, bool tiny = false);
- public:
-  GameStateShop(GameApp* parent);
-  virtual ~GameStateShop();
-  virtual void Start();
-  virtual void End();
-  virtual void Create();
-  virtual void Destroy();
-  virtual void Update(float dt);
-  virtual void Render();
-  virtual void ButtonPressed(int controllerId, int controlId);
-  static float _x1[],_y1[],_x2[],_y2[],_x3[],_y3[],_x4[],_y4[];
+    DeckDataWrapper * myCollection;
+
+    int mStage;
+    ShopBooster mBooster[BOOSTER_SLOTS];
+
+    void load();
+    void save(bool force = false);
+    void updateCounts();
+    void beginPurchase(int controlId);
+    void purchaseCard(int controlId);
+    void purchaseBooster(int controlId);
+    void cancelCard(int controlId);
+    void cancelBooster(int controlId);
+    int purchasePrice(int offset);
+    string descPurchase(int controlId, bool tiny = false);
+public:
+    GameStateShop(GameApp* parent);
+    virtual ~GameStateShop();
+    virtual void Start();
+    virtual void End();
+    virtual void Create();
+    virtual void Destroy();
+    virtual void Update(float dt);
+    virtual void Render();
+    virtual void ButtonPressed(int controllerId, int controlId);
+    static float _x1[], _y1[], _x2[], _y2[], _x3[], _y3[], _x4[], _y4[];
 };

-
 #endif