Forcing LF as the line ending style through SVN properties. No actual code changes here.

2011-01-28 06:00:51 +00:00
parent 8156619d49
commit 32cabc15c2
20 changed files with 6391 additions and 6391 deletions
--- a/projects/mtg/include/GameStateDuel.h
+++ b/projects/mtg/include/GameStateDuel.h
@@ -1,76 +1,76 @@
-#ifndef _GAME_STATE_DUEL_H_
-#define _GAME_STATE_DUEL_H_
-
-#include "GameState.h"
-#include "SimpleMenu.h"
-#include "SimplePopup.h"
-#include "DeckMenu.h"
-#include "MTGDeck.h"
-#include "GameObserver.h"
-
-#define CHOOSE_OPPONENT 7
-
-#ifdef TESTSUITE
-class TestSuite;
-#endif
-class Credits;
-class Rules;
-
-class GameStateDuel: public GameState, public JGuiListener
-{
-private:
-#ifdef TESTSUITE
-    TestSuite * testSuite;
-#endif
-    Credits * credits;
-    int mGamePhase;
-    Player * mCurrentPlayer;
-    Player * mPlayers[2];
-    MTGPlayerCards * deck[2];
-    GameObserver * game;
-    DeckMenu * deckmenu;
-    DeckMenu * opponentMenu;
-    SimpleMenu * menu;
-    SimplePopup * popupScreen; // used for informational screens, modal
-    static int selectedPlayerDeckId;
-    static int selectedAIDeckId;
-
-    bool premadeDeck;
-    int OpponentsDeckid;
-    string musictrack;
-    Rules * rules;
-
-    bool MusicExist(string FileName);
-    void loadPlayer(int playerId, int decknb = 0, int isAI = 0);
-    void ConstructOpponentMenu(); //loads the opponentMenu if it doesn't exist
-    void initScroller();
-
-public:
-    GameStateDuel(GameApp* parent);
-    virtual ~GameStateDuel();
-#ifdef TESTSUITE
-    void loadTestSuitePlayers();
-#endif
-    virtual void ButtonPressed(int ControllerId, int ControlId);
-    virtual void Start();
-    virtual void End();
-    virtual void Update(float dt);
-    virtual void Render();
-    void initRand(unsigned seed = 0);
-
-    enum ENUM_DUEL_STATE_MENU_ITEM
-    {
-        MENUITEM_CANCEL = kCancelMenuID,
-        MENUITEM_NEW_DECK = -10,
-        MENUITEM_RANDOM_PLAYER = -11,
-        MENUITEM_RANDOM_AI = -12,
-        MENUITEM_MAIN_MENU = -13,
-        MENUITEM_EVIL_TWIN = -14,
-        MENUITEM_MULLIGAN = -15,
-        MENUITEM_MORE_INFO = kInfoMenuID
-    };
-
-};
-
-#endif
-
+#ifndef _GAME_STATE_DUEL_H_
+#define _GAME_STATE_DUEL_H_
+
+#include "GameState.h"
+#include "SimpleMenu.h"
+#include "SimplePopup.h"
+#include "DeckMenu.h"
+#include "MTGDeck.h"
+#include "GameObserver.h"
+
+#define CHOOSE_OPPONENT 7
+
+#ifdef TESTSUITE
+class TestSuite;
+#endif
+class Credits;
+class Rules;
+
+class GameStateDuel: public GameState, public JGuiListener
+{
+private:
+#ifdef TESTSUITE
+    TestSuite * testSuite;
+#endif
+    Credits * credits;
+    int mGamePhase;
+    Player * mCurrentPlayer;
+    Player * mPlayers[2];
+    MTGPlayerCards * deck[2];
+    GameObserver * game;
+    DeckMenu * deckmenu;
+    DeckMenu * opponentMenu;
+    SimpleMenu * menu;
+    SimplePopup * popupScreen; // used for informational screens, modal
+    static int selectedPlayerDeckId;
+    static int selectedAIDeckId;
+
+    bool premadeDeck;
+    int OpponentsDeckid;
+    string musictrack;
+    Rules * rules;
+
+    bool MusicExist(string FileName);
+    void loadPlayer(int playerId, int decknb = 0, int isAI = 0);
+    void ConstructOpponentMenu(); //loads the opponentMenu if it doesn't exist
+    void initScroller();
+
+public:
+    GameStateDuel(GameApp* parent);
+    virtual ~GameStateDuel();
+#ifdef TESTSUITE
+    void loadTestSuitePlayers();
+#endif
+    virtual void ButtonPressed(int ControllerId, int ControlId);
+    virtual void Start();
+    virtual void End();
+    virtual void Update(float dt);
+    virtual void Render();
+    void initRand(unsigned seed = 0);
+
+    enum ENUM_DUEL_STATE_MENU_ITEM
+    {
+        MENUITEM_CANCEL = kCancelMenuID,
+        MENUITEM_NEW_DECK = -10,
+        MENUITEM_RANDOM_PLAYER = -11,
+        MENUITEM_RANDOM_AI = -12,
+        MENUITEM_MAIN_MENU = -13,
+        MENUITEM_EVIL_TWIN = -14,
+        MENUITEM_MULLIGAN = -15,
+        MENUITEM_MORE_INFO = kInfoMenuID
+    };
+
+};
+
+#endif
+