OSDN Git Service

Fix comment out statement.
authorDeskull <deskull@users.sourceforge.jp>
Fri, 18 Apr 2014 14:43:25 +0000 (23:43 +0900)
committerDeskull <deskull@users.sourceforge.jp>
Fri, 18 Apr 2014 14:43:25 +0000 (23:43 +0900)
Deeangband/GameSurfaceSDL.cpp
Deeangband/GameSurfaceSDL.h

index 37410fb..6c77c8d 100644 (file)
@@ -36,10 +36,6 @@ namespace Deeangband
                return std::string(&lpa[0]);
        }
 
-       GameSurfaceSDL::GameSurfaceSDL(void)
-       {
-       }
-
        GameSurfaceSDL::GameSurfaceSDL(GameWorld *gameWorld) : GameSurface(gameWorld)
        {
                if(SDL_Init(SDL_INIT_VIDEO) < 0) return;
@@ -295,14 +291,12 @@ namespace Deeangband
                                if(px < floorPtr->GetWidth() && py < floorPtr->GetHeight())
                                {
                                        TAG tag = floorPtr->GetSquare(px, py)->getFeatureTag();
-                                       //Color symColor = floorPtr->GetGameWorld()->GetFeature(tag)->GetSymColor();
-                                       //Color backColor = floorPtr->GetGameWorld()->GetFeature(tag)->GetBackColor();
-                                       Color symColor = {100, 100, 100};
-                                       Color backColor = {0, 0, 0};
+                                       Color symColor = gameWorld->GetFeature(tag)->GetSymColor();
+                                       Color backColor = gameWorld->GetFeature(tag)->GetBackColor();
                                        SDL_Color sdlSymCol = {(Uint8)symColor.r, (Uint8)symColor.g, (Uint8)symColor.b, (Uint8)symColor.a};
                                        SDL_Rect blitRect = {240 + px * 24, py * 24 , 24, 24};
                                        SDL_FillRect(windowSurface, &blitRect, SDL_MapRGBA(windowSurface->format, (Uint8)backColor.r, (Uint8)backColor.g, (Uint8)backColor.b, (Uint8)backColor.a));
-                                       //sprintf_s(symBuf, 5, "%c", floorPtr->GetGameWorld()->GetFeature(tag)->GetSymbol()); 
+                                       sprintf_s(symBuf, 5, "%c", gameWorld->GetFeature(tag)->GetSymbol()); 
                                        sprintf_s(symBuf, 5, "%c", 'X'); 
 
                                        symbolSurface = TTF_RenderUTF8_Blended(font, toUTF8(symBuf).c_str(), sdlSymCol);
index 9c75d84..b57fe47 100644 (file)
@@ -83,9 +83,8 @@ namespace Deeangband
 
                /*!
                * @brief \83R\83\93\83X\83g\83\89\83N\83^
+               * @param gameWorld \8f\88\97\9d\82µ\82½\82¢GameWorld\83C\83\93\83X\83^\83\93\83X
                */
-               GameSurfaceSDL::GameSurfaceSDL(void);
-
                GameSurfaceSDL::GameSurfaceSDL(GameWorld *gameWorld);
 
                /*!