Reactor enum name, PlayExitCode to PLAY_EXIT_CODE, GameCommand to GAME_COMMAND.

diff --git a/Deeangband/Deeangband.h b/Deeangband/Deeangband.h
index a021d57..38aec7b 100644 (file)
--- a/Deeangband/Deeangband.h
+++ b/Deeangband/Deeangband.h
@@ -9,22 +9,22 @@
 /*!
  * \83Q\81[\83\80\83R\83}\83\93\83h\92è\8b`
  */
-typedef enum GameCommand 
+typedef enum GAME_COMMAND
 {
        GAME_COMMAND_VIEW_PLAYER_STATUS,
        GAME_COMMAND_REDRAW,
        GAME_COMMAND_EXIT
-} GameCommand;
+} GAME_COMMAND;
 
 /*!
  * \83v\83\8c\83C\8fI\97¹\83R\81[\83h
  */
-typedef enum PlayExitCode
+typedef enum PLAY_EXIT_CODE
 {
        PLAY_EXIT_NONE,
        PLAY_EXIT_DEAD,
        PLAY_EXIT_QUIT
-} PlayExitCode;
+} PLAY_EXIT_CODE;
 
 class Creature;
 class CreatureTemplate;

diff --git a/Deeangband/GameSurface.h b/Deeangband/GameSurface.h
index 39558f2..6be4c5c 100644 (file)
--- a/Deeangband/GameSurface.h
+++ b/Deeangband/GameSurface.h
@@ -27,9 +27,9 @@ public:
 
        /*!
         * @brief \83Q\81[\83\80\83R\83}\83\93\83h\82ð\8eó\82¯\8eæ\82é
-        * @return GameCommand\82Å\92è\8b`\82³\82ê\82½\83R\83}\83\93\83h\93à\97e
+        * @return GAME_COMMAND \82Å\92è\8b`\82³\82ê\82½\83R\83}\83\93\83h\93à\97e
         */
-       virtual GameCommand GetCommand(void)
+       virtual GAME_COMMAND GetCommand(void)
        {
                return GAME_COMMAND_REDRAW;
        }

diff --git a/Deeangband/GameSurfaceSDL.cpp b/Deeangband/GameSurfaceSDL.cpp
index 5c3a70c..fef5673 100644 (file)
--- a/Deeangband/GameSurfaceSDL.cpp
+++ b/Deeangband/GameSurfaceSDL.cpp
@@ -216,7 +216,7 @@ void GameSurfaceSDL::drawCreatureStatus(Creature *creaturePtr)
        return;
 }
 
-GameCommand GameSurfaceSDL::GetCommand(void)
+GAME_COMMAND GameSurfaceSDL::GetCommand(void)
 {
        SDL_Event event;
        SDL_Keycode key;

diff --git a/Deeangband/GameSurfaceSDL.h b/Deeangband/GameSurfaceSDL.h
index ff64959..882a98e 100644 (file)
--- a/Deeangband/GameSurfaceSDL.h
+++ b/Deeangband/GameSurfaceSDL.h
@@ -46,5 +46,5 @@ public:
 
        GameSurfaceSDL(void);
        ~GameSurfaceSDL(void);
-       GameCommand GetCommand(void);
+       GAME_COMMAND GetCommand(void);
 };

diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp
index ddd3dbb..13be601 100644 (file)
--- a/Deeangband/GameWorld.cpp
+++ b/Deeangband/GameWorld.cpp
@@ -41,10 +41,10 @@ GameWorld::~GameWorld(void)
 {
 }
 
-PlayExitCode GameWorld::PlayLoop(void)
+PLAY_EXIT_CODE GameWorld::PlayLoop(void)
 {
-       GameCommand commandID;
-       PlayExitCode code = PLAY_EXIT_NONE;
+       GAME_COMMAND commandID;
+       PLAY_EXIT_CODE code = PLAY_EXIT_NONE;
        gameSurface->Redraw();
 
        while(code == PLAY_EXIT_NONE)
@@ -56,7 +56,7 @@ PlayExitCode GameWorld::PlayLoop(void)
        return PLAY_EXIT_QUIT;
 }
 
-PlayExitCode GameWorld::DoGameCommand(GameCommand command)
+PLAY_EXIT_CODE GameWorld::DoGameCommand(GAME_COMMAND command)
 {
        Creature dammy;
        switch(command)

diff --git a/Deeangband/GameWorld.h b/Deeangband/GameWorld.h
index ab43b3b..409881c 100644 (file)
--- a/Deeangband/GameWorld.h
+++ b/Deeangband/GameWorld.h
@@ -89,10 +89,16 @@ public:
        Floor *GameWorld::GetFloor(ID id);
        Creature *GameWorld::GetCreature(ID id);
 
-       PlayExitCode PlayLoop(void);
+       /*
+        * @brief \83v\83\8c\83C\8f\88\97\9d\83\81\83C\83\93\83\8b\81[\83v
+        * @return \83Q\81[\83\80\8fI\97¹\83R\81[\83h
+        */
+       PLAY_EXIT_CODE PlayLoop(void);
 
        /*
         * @brief \8eó\82¯\8eæ\82Á\82½\83Q\81[\83\80\83R\83}\83\93\83h\82ð\8f\88\97\9d\82·\82é
+        * @param command \8eÀ\8ds\82·\82é\83Q\81[\83\80\83R\83}\83\93\83h
+        * @return \83Q\81[\83\80\8fI\97¹\83R\81[\83h
         */
-       PlayExitCode DoGameCommand(GameCommand command);
+       PLAY_EXIT_CODE DoGameCommand(GAME_COMMAND command);
 };