From 49a1674ca93891c5f42d48bef442ebf04d92f151 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Tue, 4 Mar 2014 22:15:02 +0900
Subject: [PATCH] Reactor enum name, PlayExitCode to PLAY_EXIT_CODE,
 GameCommand to GAME_COMMAND.

---
 Deeangband/Deeangband.h       |  8 ++++----
 Deeangband/GameSurface.h      |  4 ++--
 Deeangband/GameSurfaceSDL.cpp |  2 +-
 Deeangband/GameSurfaceSDL.h   |  2 +-
 Deeangband/GameWorld.cpp      |  8 ++++----
 Deeangband/GameWorld.h        | 10 ++++++++--
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Deeangband/Deeangband.h b/Deeangband/Deeangband.h
index a021d57..38aec7b 100644
--- a/Deeangband/Deeangband.h
+++ b/Deeangband/Deeangband.h
@@ -9,22 +9,22 @@
 /*!
  * ƒQ[ƒ€ƒRƒ}ƒ“ƒh’è‹`
  */
-typedef enum GameCommand 
+typedef enum GAME_COMMAND
 {
 	GAME_COMMAND_VIEW_PLAYER_STATUS,
 	GAME_COMMAND_REDRAW,
 	GAME_COMMAND_EXIT
-} GameCommand;
+} GAME_COMMAND;
 
 /*!
  * ƒvƒŒƒCI—¹ƒR[ƒh
  */
-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
--- a/Deeangband/GameSurface.h
+++ b/Deeangband/GameSurface.h
@@ -27,9 +27,9 @@ public:
 
 	/*!
 	 * @brief ƒQ[ƒ€ƒRƒ}ƒ“ƒh‚ðŽó‚¯Žæ‚é
-	 * @return GameCommand‚Å’è‹`‚³‚ꂽƒRƒ}ƒ“ƒh“à—e
+	 * @return GAME_COMMAND ‚Å’è‹`‚³‚ꂽƒRƒ}ƒ“ƒh“à—e
 	 */
-	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
--- 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
--- 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
--- 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
--- 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 ƒvƒŒƒCˆ—ƒƒCƒ“ƒ‹[ƒv
+	 * @return ƒQ[ƒ€I—¹ƒR[ƒh
+	 */
+	PLAY_EXIT_CODE PlayLoop(void);
 
 	/*
 	 * @brief Žó‚¯Žæ‚Á‚½ƒQ[ƒ€ƒRƒ}ƒ“ƒh‚ðˆ—‚·‚é
+	 * @param command ŽÀs‚·‚éƒQ[ƒ€ƒRƒ}ƒ“ƒh
+	 * @return ƒQ[ƒ€I—¹ƒR[ƒh
 	 */
-	PlayExitCode DoGameCommand(GameCommand command);
+	PLAY_EXIT_CODE DoGameCommand(GAME_COMMAND command);
 };
-- 
2.11.0