Initial conversion to SDL2.

[quix0rs-blobwars.git] / src / map.cpp

diff --git a/src/map.cpp b/src/map.cpp
index 4a72b8573b36743fdbba669f91b158bd14cd5268..07eb4aabb94e8cd40615c5b63ce42c42f5f50e3c 100644 (file)
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -293,7 +293,7 @@ void showMap(int centerX, int centerY)
        
        SDL_Surface *panel = graphics.createSurface(320, 240);
        SDL_Surface *background = graphics.loadImage("gfx/main/mapBackground.png");
-       SDL_SetAlpha(background, SDL_SRCALPHA|SDL_RLEACCEL, 130);
+       SDL_SetSurfaceAlphaMod(background, 130);
        
        graphics.blit(background, 0, 0, panel, false);
        
@@ -412,7 +412,7 @@ void showMap(int centerX, int centerY)
                graphics.drawRect(160, 120, 320, 240, graphics.black, graphics.white, graphics.screen);
                graphics.blit(panel, 160, 120, graphics.screen, false);
 
-               if ((config.isControl(CONTROL::MAP)) || (config.isControl(CONTROL::PAUSE)) || (engine.keyState[SDLK_ESCAPE]))
+               if ((config.isControl(CONTROL::MAP)) || (config.isControl(CONTROL::PAUSE)) || (engine.keyState[SDL_SCANCODE_ESCAPE]))
                {
                        break;
                }