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:
techdragon.nguyen@gmail.com
2011-01-21 18:01:14 +00:00
parent 6d3d4c1792
commit e53c16f700
101 changed files with 6128 additions and 4684 deletions

View File

@@ -9,73 +9,73 @@
class GameStateMenu: public GameState, public JGuiListener
{
private:
TextScroller * scroller;
int scrollerSet;
JGuiController* mGuiController;
SimpleMenu* subMenuController;
SimpleMenu* gameTypeMenu;
int hasChosenGameType;
JQuad * mIcons[10];
JTexture * bgTexture;
JQuad * mBg;
JQuad * mSplash;
JTexture * splashTex;
float mCreditsYPos;
int currentState;
//JMusic * bgMusic;
int mVolume;
char nbcardsStr[400];
vector<string> langs;
vector<string> primitives;
string wallpaper;
int primitivesLoadCounter;
private:
TextScroller * scroller;
int scrollerSet;
JGuiController* mGuiController;
SimpleMenu* subMenuController;
SimpleMenu* gameTypeMenu;
int hasChosenGameType;
JQuad * mIcons[10];
JTexture * bgTexture;
JQuad * mBg;
JQuad * mSplash;
JTexture * splashTex;
float mCreditsYPos;
int currentState;
//JMusic * bgMusic;
int mVolume;
char nbcardsStr[400];
vector<string> langs;
vector<string> primitives;
string wallpaper;
int primitivesLoadCounter;
DIR *mDip;
struct dirent *mDit;
char mCurrentSetName[32];
char mCurrentSetFileName[512];
DIR *mDip;
struct dirent *mDit;
char mCurrentSetName[32];
char mCurrentSetFileName[512];
int mReadConf;
float timeIndex;
float angleMultiplier;
float angleW;
float yW;
void fillScroller();
int mReadConf;
float timeIndex;
float angleMultiplier;
float angleW;
float yW;
void fillScroller();
void setLang(int id);
string getLang(string s);
void loadLangMenu();
bool langChoices;
void runTest(); //!!
void listPrimitives();
void genNbCardsStr(); //computes the contents of nbCardsStr
void ensureMGuiController(); //creates the MGuiController if it doesn't exist
string loadRandomWallpaper(); //loads a list of string of textures that can be randolmy shown on the loading screen
public:
GameStateMenu(GameApp* parent);
virtual ~GameStateMenu();
virtual void Create();
virtual void Destroy();
virtual void Start();
virtual void End();
virtual void Update(float dt);
virtual void Render();
virtual void ButtonPressed(int controllerId, int controlId);
void setLang(int id);
string getLang(string s);
void loadLangMenu();
bool langChoices;
void runTest(); //!!
void listPrimitives();
void genNbCardsStr(); //computes the contents of nbCardsStr
void ensureMGuiController(); //creates the MGuiController if it doesn't exist
string loadRandomWallpaper(); //loads a list of string of textures that can be randolmy shown on the loading screen
public:
GameStateMenu(GameApp* parent);
virtual ~GameStateMenu();
virtual void Create();
virtual void Destroy();
virtual void Start();
virtual void End();
virtual void Update(float dt);
virtual void Render();
virtual void ButtonPressed(int controllerId, int controlId);
int nextDirectory(const char * root, const char * file); // Retrieves the next directory to have matching file
void resetDirectory();
void createUsersFirstDeck(int setId);
virtual ostream& toString(ostream& out) const;
int nextDirectory(const char * root, const char * file); // Retrieves the next directory to have matching file
void resetDirectory();
void createUsersFirstDeck(int setId);
virtual ostream& toString(ostream& out) const;
enum
{
MENU_CARD_PURCHASE = 2,
MENU_DECK_SELECTION = 10,
MENU_DECK_BUILDER = 11,
MENU_FIRST_DUEL_SUBMENU = 102,
MENU_LANGUAGE_SELECTION = 103,
};
enum
{
MENU_CARD_PURCHASE = 2,
MENU_DECK_SELECTION = 10,
MENU_DECK_BUILDER = 11,
MENU_FIRST_DUEL_SUBMENU = 102,
MENU_LANGUAGE_SELECTION = 103,
};
};
#endif