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/StoryFlow.h
+++ b/projects/mtg/include/StoryFlow.h
@@ -11,143 +11,168 @@ class GameObserver;
 class MTGDeck;
 #define CAMPAIGNS_FOLDER "campaigns/"

-
-class StoryDialogElement:public JGuiObject {
+class StoryDialogElement: public JGuiObject
+{
 public:
-  float mX;
-  float mY;
- StoryDialogElement(float x, float y, int id = 0);
-   void Entering(){};
-   bool Leaving(JButton key) {return false;};
-   bool ButtonPressed() {return false;};
-   bool hasFocus() {return false;};
-   virtual float getHeight() = 0;
+    float mX;
+    float mY;
+    StoryDialogElement(float x, float y, int id = 0);
+    void Entering()
+    {
+    }
+    ;
+    bool Leaving(JButton key)
+    {
+        return false;
+    }
+    ;
+    bool ButtonPressed()
+    {
+        return false;
+    }
+    ;
+    bool hasFocus()
+    {
+        return false;
+    }
+    ;
+    virtual float getHeight() = 0;
 };

-class StoryText:public StoryDialogElement {
-public : 
-  string text;
-  int align;
-  int font;
-StoryText(string text, float mX, float mY, string align = "center", int font = 0, int id = 0);
-
-  void Render();
-  void Update(float dt);
-  virtual ostream& toString(ostream& out) const;
-  float getHeight();
-};
-class StoryImage:public StoryDialogElement {
-public :
-  string img;
-StoryImage(string img, float mX, float mY);
-  void Render();
-  void Update(float dt);
-  virtual ostream& toString(ostream& out) const;
-  float getHeight();
-};
-
-class StoryReward:public StoryText {
+class StoryText: public StoryDialogElement
+{
 public:
-  enum {
-    STORY_REWARD_CREDITS,
-    STORY_REWARD_SET,
-    STORY_REWARD_CARD,
-  };
+    string text;
+    int align;
+    int font;
+    StoryText(string text, float mX, float mY, string align = "center", int font = 0, int id = 0);

-  int rewardDone;
-  string value;
-  int type;
-
-  StoryReward(string _type, string _value, string text, float _mX, float _mY, string align = "center", int font = 0, int id = 0);
-  void Update(float dt);
-  void Render();
-
-  static bool rewardSoundPlayed;
-  static bool rewardsEnabled;
-  static MTGDeck * collection;
+    void Render();
+    void Update(float dt);
+    virtual ostream& toString(ostream& out) const;
+    float getHeight();
+};
+class StoryImage: public StoryDialogElement
+{
+public:
+    string img;
+    StoryImage(string img, float mX, float mY);
+    void Render();
+    void Update(float dt);
+    virtual ostream& toString(ostream& out) const;
+    float getHeight();
 };

-class StoryChoice:public StoryText {
+class StoryReward: public StoryText
+{
 public:
-  string pageId;
+    enum
+    {
+        STORY_REWARD_CREDITS,
+        STORY_REWARD_SET,
+        STORY_REWARD_CARD,
+    };

-  bool mHasFocus;
-  float mScale;
-  float mTargetScale;
-  StoryChoice(string id, string text, int JGOid, float mX, float mY,  string _align, int _font, bool hasFocus);
-  void Render();
-  void Update(float dt);
+    int rewardDone;
+    string value;
+    int type;

-  void Entering();
-  bool Leaving(JButton key);
-  bool ButtonPressed();
-  bool hasFocus();
-  virtual ostream& toString(ostream& out) const;
-  float getHeight();
+    StoryReward(string _type, string _value, string text, float _mX, float _mY, string align = "center", int font = 0, int id = 0);
+    void Update(float dt);
+    void Render();
+
+    static bool rewardSoundPlayed;
+    static bool rewardsEnabled;
+    static MTGDeck * collection;
+};
+
+class StoryChoice: public StoryText
+{
+public:
+    string pageId;
+
+    bool mHasFocus;
+    float mScale;
+    float mTargetScale;
+    StoryChoice(string id, string text, int JGOid, float mX, float mY, string _align, int _font, bool hasFocus);
+    void Render();
+    void Update(float dt);
+
+    void Entering();
+    bool Leaving(JButton key);
+    bool ButtonPressed();
+    bool hasFocus();
+    virtual ostream& toString(ostream& out) const;
+    float getHeight();
 };

 class StoryFlow;
-class StoryPage {
+class StoryPage
+{
 protected:
    string safeAttribute(TiXmlElement* element, string attribute);
-public: 
-  StoryFlow * mParent;
-  string musicFile;
-  StoryPage(StoryFlow * mParent);
-  virtual void Update(float dt)=0;
-  virtual void Render()=0;
-  virtual ~StoryPage(){};
-  int loadElement(TiXmlElement* element);
-};
-
-class StoryDialog:public StoryPage, public JGuiListener,public JGuiController {
-private:
-  vector<StoryDialogElement *>graphics;
-  void RenderElement(StoryDialogElement * elmt);
 public:
-  StoryDialog(TiXmlElement* el,StoryFlow * mParent);
-  ~StoryDialog();
-  void Update(float dt);
-  void Render();
-  void ButtonPressed(int,int);
-
-  static float currentY;
-  static float previousY;
+    StoryFlow * mParent;
+    string musicFile;
+    StoryPage(StoryFlow * mParent);
+    virtual void Update(float dt)=0;
+    virtual void Render()=0;
+    virtual ~StoryPage()
+    {
+    }
+    ;
+    int loadElement(TiXmlElement* element);
 };

+class StoryDialog: public StoryPage, public JGuiListener, public JGuiController
+{
+private:
+    vector<StoryDialogElement *> graphics;
+    void RenderElement(StoryDialogElement * elmt);
+public:
+    StoryDialog(TiXmlElement* el, StoryFlow * mParent);
+    ~StoryDialog();
+    void Update(float dt);
+    void Render();
+    void ButtonPressed(int, int);
+
+    static float currentY;
+    static float previousY;
+};

 class Rules;
-class StoryDuel:public StoryPage {
+class StoryDuel: public StoryPage
+{
 public:
-  string pageId;
-  string onWin, onLose;
-  string bg; //background file
-  GameObserver * game;
-  Rules * rules;
-  StoryDuel(TiXmlElement* el,StoryFlow * mParent);
-  virtual ~StoryDuel();
-  void Update(float dt);
-  void Render();
-  void init();
+    string pageId;
+    string onWin, onLose;
+    string bg; //background file
+    GameObserver * game;
+    Rules * rules;
+    StoryDuel(TiXmlElement* el, StoryFlow * mParent);
+    virtual ~StoryDuel();
+    void Update(float dt);
+    void Render();
+    void init();
 };

-class StoryFlow{
+class StoryFlow
+{
 private:
-  map<string,StoryPage *>pages;
-  bool parse(string filename);
-  StoryPage * loadPage(TiXmlElement* element);
-  bool _gotoPage(string id);
-public: 
-  string currentPageId;
-  string folder;
-  StoryFlow(string folder);
-  ~StoryFlow();
+    map<string, StoryPage *> pages;
+    bool parse(string filename);
+    StoryPage * loadPage(TiXmlElement* element);
+    bool _gotoPage(string id);
+public:
+    string currentPageId;
+    string folder;
+    StoryFlow(string folder);
+    ~StoryFlow();

-  bool gotoPage(string id);
-  bool loadPageId(string id);
-  void Update(float dt);
-  void Render();
+    bool gotoPage(string id);
+    bool loadPageId(string id);
+    void Update(float dt);
+    void Render();
 };

-
 #endif