GameSurface::GameMessage() の宣言を追加。 / Add declaration of GameSurface::GameMessage().

diff --git a/Deeangband/GameSurface.h b/Deeangband/GameSurface.h
index 9f9b395..c0e7050 100644 (file)
--- a/Deeangband/GameSurface.h
+++ b/Deeangband/GameSurface.h
@@ -76,19 +76,26 @@ namespace Deeangband
                virtual void GameSurface::FocusField(int x, int y) { x; y; }
 
                /*!
-               * @brief \83t\83\8d\83A\95\\8e¦\82Ì\83t\83H\81[\83J\83X\82ð\95Ï\8dX\82·\82é
-               * @param coord \8aî\8f\80\8dÀ\95W
-               * @return \82È\82µ
-               */
+                * @brief \83t\83\8d\83A\95\\8e¦\82Ì\83t\83H\81[\83J\83X\82ð\95Ï\8dX\82·\82é
+                * @param coord \8aî\8f\80\8dÀ\95W
+                * @return \82È\82µ
+                */
                virtual void GameSurface::FocusField(Coordinates coord) { coord; }
 
                /*!
-               * @brief \83V\83X\83e\83\80\83\81\83b\83Z\81[\83W\82ð\95\\8e¦\82·\82é
-               * @param message \83\81\83b\83Z\81[\83W
-               * @return \82È\82µ
-               */
+                * @brief \83V\83X\83e\83\80\83\81\83b\83Z\81[\83W\82ð\95\\8e¦\82·\82é
+                * @param message \83\81\83b\83Z\81[\83W
+                * @return \82È\82µ
+                */
                virtual void GameSurface::SystemMessage(std::string message) { message; }
 
+               /*!
+                * @brief \83Q\81[\83\80\83\81\83b\83Z\81[\83W\82ð\92Ç\89Á\82·\82é
+                * @param message \83\81\83b\83Z\81[\83W
+                * @return \82È\82µ
+                */
+               virtual void GameSurface::GameMessage(std::string message) { message; }
+
        };
 
 }
\ No newline at end of file

diff --git a/Deeangband/GameSurfaceSDL.cpp b/Deeangband/GameSurfaceSDL.cpp
index eeec4cb..5e8c605 100644 (file)
--- a/Deeangband/GameSurfaceSDL.cpp
+++ b/Deeangband/GameSurfaceSDL.cpp
@@ -540,24 +540,28 @@ void GameSurfaceSDL::drawField(GameWorld *gameWorld, Field *fieldPtr, int x, int
                SDL_Rect messageRect = {0, 0, 200, 200};
                SDL_Rect messagePositon = {220, 180, 0, 0}; 
                SDL_Rect windowRect = {210, 170, 420, 220};
-               SDL_FillRect(windowSurface, &windowRect, SDL_MapRGBA(messageSurface->format, 0, 0, 0, 120));
-               SDL_BlitSurface(messageSurface, &messageRect, windowSurface, &messagePositon); 
+               SDL_FillRect(windowSurface, &windowRect, SDL_MapRGBA(systemMessageSurface->format, 0, 0, 0, 120));
+               SDL_BlitSurface(systemMessageSurface, &messageRect, windowSurface, &messagePositon); 
        }
 
        void GameSurfaceSDL::drawGameMessage(void)
        {
        }
 
-
        void GameSurfaceSDL::SystemMessage(std::string message)
        {
                this->currentMessage = message;
-               messageSurface = TTF_RenderUTF8_Blended(font, toUTF8(this->currentMessage.c_str()).c_str(), color);
+               systemMessageSurface = TTF_RenderUTF8_Blended(font, toUTF8(this->currentMessage.c_str()).c_str(), color);
                pushAnyKey();
                this->currentMessage.erase();
-               SDL_FreeSurface(messageSurface);
+               SDL_FreeSurface(systemMessageSurface);
        }
 
+       void GameSurfaceSDL::GameMessage(std::string message)
+       {
+       }
+
+
        void GameSurfaceSDL::updateCreatureGraphics(std::map<ID, boost::shared_ptr<Creature>>::iterator creatureIt)
        {
                SDL_Rect symbolRect = {0, 0, 24, 24};

diff --git a/Deeangband/GameSurfaceSDL.h b/Deeangband/GameSurfaceSDL.h
index 8d916d5..b9e7d2c 100644 (file)
--- a/Deeangband/GameSurfaceSDL.h
+++ b/Deeangband/GameSurfaceSDL.h
@@ -52,7 +52,7 @@ namespace Deeangband
                SDL_Surface *windowSurface;  //!< \83Q\81[\83\80\83E\83B\83\93\83h\83E\82ÌSurface\8eQ\8fÆ
 
                SDL_Surface *titleSurface;   //!< \83Q\81[\83\80\83^\83C\83g\83\8b\83O\83\89\83t\83B\83b\83N\82ÌSurface\8eQ\8fÆ
-               SDL_Surface *messageSurface; //!< \83\81\83b\83Z\81[\83W\83O\83\89\83t\83B\83b\83N\82ÌSurface\8eQ\8fÆ
+               SDL_Surface *systemMessageSurface; //!< \83\81\83b\83Z\81[\83W\83O\83\89\83t\83B\83b\83N\82ÌSurface\8eQ\8fÆ
                SDL_Surface *creatureStatusSurface;  //!< \83N\83\8a\81[\83`\83\83\81[\83X\83e\81[\83^\83X\95\\8e¦\82ÌSurface\8eQ\8fÆ
                SDL_Surface *creatureSideStatusSurface;  //!< \83T\83C\83h\83N\83\8a\81[\83`\83\83\81[\83X\83e\81[\83^\83X\95\\8e¦\82ÌSurface\8eQ\8fÆ
 
@@ -183,6 +183,13 @@ namespace Deeangband
                void GameSurfaceSDL::SystemMessage(std::string message);
 
                /*!
+                * @brief \83Q\81[\83\80\83\81\83b\83Z\81[\83W\82ð\95\\8e¦\82·\82é
+                * @param message \83\81\83b\83Z\81[\83W
+                * @return \82È\82µ
+                */
+               void GameSurfaceSDL::GameMessage(std::string message);
+
+               /*!
                 * @brief \83N\83\8a\81[\83`\83\83\81[\97p\83O\83\89\83t\83B\83b\83N\82ð\90V\8bK\8dì\90¬/\8dX\90V\82·\82é
                 * @param message \83\81\83b\83Z\81[\83W
                 * @return \82È\82µ