Merge branch 'master' of o_ggy@git.sourceforge.jp:/gitroot/moflib/moflib

[moflib/moflib.git] / saisei-1.0 / rpg / rpg / oldcode / FightingMenu.h

diff --git a/saisei-1.0/rpg/rpg/oldcode/FightingMenu.h b/saisei-1.0/rpg/rpg/oldcode/FightingMenu.h
index fdf5cc2..d59e9d9 100644 (file)
--- a/saisei-1.0/rpg/rpg/oldcode/FightingMenu.h
+++ b/saisei-1.0/rpg/rpg/oldcode/FightingMenu.h
@@ -1,24 +1,24 @@
-#pragma once\r
-#include "MyFrame.h"\r
-#include "mof/Texture.h"\r
-#include "BattleData.h"\r
-\r
-namespace et{\r
-\r
-       class FightingMenu : public MyFrame\r
-       {\r
-               mof::Window* addSelectableTextItem(mof::Window* pOwner , std::vector<mof::Window*>& selectables , TCHAR* text , int size);\r
-               \r
-               mof::SelectionModel* m_pSelector;\r
-               mof::TextureManager* m_pTextureManager;\r
-               et::BattleData* m_pBattleData;\r
-       public:\r
-               FightingMenu(mof::TextureManager* pTextureManager , et::BattleData* pBattleData);\r
-               virtual ~FightingMenu(void);\r
-               virtual void setVisible(bool visible);\r
-               virtual mof::SelectionModel* getSelectionModel(){return m_pSelector;}\r
-               virtual MyFrame* performAction();\r
-       };\r
-\r
-\r
+#pragma once
+#include "MyFrame.h"
+#include "mof/Texture.h"
+#include "BattleData.h"
+
+namespace et{
+
+       class FightingMenu : public MyFrame
+       {
+               mof::Window* addSelectableTextItem(mof::Window* pOwner , std::vector<mof::Window*>& selectables , TCHAR* text , int size);
+               
+               mof::SelectionModel* m_pSelector;
+               mof::TextureManager* m_pTextureManager;
+               et::BattleData* m_pBattleData;
+       public:
+               FightingMenu(mof::TextureManager* pTextureManager , et::BattleData* pBattleData);
+               virtual ~FightingMenu(void);
+               virtual void setVisible(bool visible);
+               virtual mof::SelectionModel* getSelectionModel(){return m_pSelector;}
+               virtual MyFrame* performAction();
+       };
+
+
 };
\ No newline at end of file