GameSurface::Redraw() を GameSurface::Draw() に改名。 / Rename GameSurface::Redraw() to...

diff --git a/Deeangband/GameEngine.cpp b/Deeangband/GameEngine.cpp
index 32874a3..7307b84 100644 (file)
--- a/Deeangband/GameEngine.cpp
+++ b/Deeangband/GameEngine.cpp
@@ -35,7 +35,7 @@ namespace Deeangband
                GAME_COMMAND commandID;
                PLAY_EXIT_CODE code = PLAY_EXIT_NONE;
                ACTION_IT actionIt;
-               gameSurface->Redraw(gameWorld->GetPlayerCreature());
+               gameSurface->Draw(gameWorld->GetPlayerCreature());
 
                while(code == PLAY_EXIT_NONE)
                {
@@ -64,14 +64,14 @@ namespace Deeangband
                        gameSurface->ViewCreatureStatus(gameWorld->GetPlayerCreature()->second.get());
                        break;
                case GAME_COMMAND_REDRAW:
-                       gameSurface->Redraw(playerIt);
+                       gameSurface->Draw(playerIt);
                        break;
                case GAME_COMMAND_DEBUG_XML_SAVE:
                        gameWorld->XMLSave();
                        gameSurface->SystemMessage("XML\82É\95Û\91¶\82µ\82Ü\82µ\82½\81B");
                        break;
                case GAME_COMMAND_DEBUG_XML_LOAD:
-                       gameSurface->Redraw(playerIt);
+                       gameSurface->Draw(playerIt);
                        gameWorld->XMLLoad();
                        gameSurface->SystemMessage("XML\82©\82ç\8cÄ\82Ñ\8fo\82µ\82Ü\82µ\82½\81B");
                        break;

diff --git a/Deeangband/GameSurface.h b/Deeangband/GameSurface.h
index c000464..929f947 100644 (file)
--- a/Deeangband/GameSurface.h
+++ b/Deeangband/GameSurface.h
@@ -53,7 +53,7 @@ namespace Deeangband
                * @brief \83Q\81[\83\80\89æ\96Ê\95\\8e¦\82ð\8dX\90V\82·\82é\81B
                * @return \82È\82µ
                */
-               virtual void GameSurface::Redraw(const CREATURE_IT& subjectCreatureIt) { subjectCreatureIt; }
+               virtual void GameSurface::Draw(const CREATURE_IT& subjectCreatureIt) { subjectCreatureIt; }
 
                /*!
                * @brief \83Q\81[\83\80\89æ\96Ê\82É\83N\83\8a\81[\83`\83\83\81[\8fî\95ñ\82ð\95\\8e¦\82·\82é\81B

diff --git a/Deeangband/GameSurfaceSDL.cpp b/Deeangband/GameSurfaceSDL.cpp
index 45cf0f1..0ed76d0 100644 (file)
--- a/Deeangband/GameSurfaceSDL.cpp
+++ b/Deeangband/GameSurfaceSDL.cpp
@@ -115,7 +115,7 @@ namespace Deeangband
                SDL_Event event;
                do 
                {
-                       this->Redraw(subjectCreatureIt);
+                       this->Draw(subjectCreatureIt);
                        SDL_PollEvent(&event);
                } while(event.type != SDL_KEYDOWN);
        }
@@ -212,7 +212,7 @@ namespace Deeangband
                this->windowSurface = SDL_GetWindowSurface(this->window);
        }
 
-       void GameSurfaceSDL::Redraw(const CREATURE_IT& subjectCreatureIt)
+       void GameSurfaceSDL::Draw(const CREATURE_IT& subjectCreatureIt)
        {
                SDL_Rect rectTemp = {0, 0, 0, 0};
                Coordinates mapDrawingSize;
@@ -510,7 +510,7 @@ namespace Deeangband
                SDL_Event event;
                SDL_Keycode key;
 
-               this->Redraw(subjectCreatureIt);
+               this->Draw(subjectCreatureIt);
                while (SDL_PollEvent(&event))
                {
 
@@ -585,7 +585,7 @@ namespace Deeangband
                                default:
                                        break;
                                }
-                               this->Redraw(subjectCreatureIt);
+                               this->Draw(subjectCreatureIt);
                                break;
 
                        case SDL_QUIT:
@@ -726,7 +726,7 @@ void GameSurfaceSDL::drawField(const CREATURE_IT &subjectCreatureIt, GameWorld *
        void GameSurfaceSDL::drawTimeStatus(void)
        {
                SDL_Rect messageRect = {0, 0, 200, 50};
-               SDL_Rect messagePositon = {10, 480, 210, 530}; 
+               SDL_Rect messagePositon = {10, 480, 200, 50}; 
                SDL_RenderCopy(renderer, gameTimeStatusTexture, &messageRect, &messagePositon);
        }
 

diff --git a/Deeangband/GameSurfaceSDL.h b/Deeangband/GameSurfaceSDL.h
index 735ca2d..05f0e10 100644 (file)
--- a/Deeangband/GameSurfaceSDL.h
+++ b/Deeangband/GameSurfaceSDL.h
@@ -188,7 +188,7 @@ namespace Deeangband
                 * @param subjectCreatureIt \8eå\8aÏ\82Æ\82È\82é\83N\83\8a\81[\83`\83\83\81[\83C\83e\83\8c\81[\83^
                 * @return \82È\82µ
                 */
-               void GameSurfaceSDL::Redraw(const CREATURE_IT& subjectCreatureIt);
+               void GameSurfaceSDL::Draw(const CREATURE_IT& subjectCreatureIt);
 
                /*!
                 * @brief \83Q\81[\83\80\8e\9e\8aÔ\95\\8e¦\82ð\8dX\90V\82·\82é