Added .gitignore to ignore certain files + fixed access rights on Makefile* as

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

diff --git a/src/init.cpp b/src/init.cpp
index a274ad8a9d48a9f69c367eafe46cc0c01c5c3fbe..8d13a502bca3ad6e80c2cd0adeab52cee8000d95 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -209,6 +209,8 @@ void saveConfig()
 //
 int initMedalService(void *data)
 {
+       (void)data;
+
        SDL_mutexP(medalServer.lock);
        
        char connectMessage[1024];
@@ -293,7 +295,7 @@ void initSystem()
        }
 
        // Increase the size of the window if we have large desktop resolutions
-       SDL_DisplayMode displayMode{0};
+       SDL_DisplayMode displayMode = {};
        SDL_GetDesktopDisplayMode(0, &displayMode);
        int w = graphics.screen->w;
        int h = graphics.screen->h;
@@ -367,7 +369,6 @@ void initSystem()
        }
 
        SDL_ShowCursor(SDL_DISABLE);
-       SDL_EventState(SDL_MOUSEMOTION, SDL_DISABLE);
 
        graphics.registerEngine(&engine);
        graphics.mapColors();
@@ -386,26 +387,18 @@ void initSystem()
        debug(("Loading Fonts...\n"));
 
        #if USEPAK
-                       
-               char tempPath[PATH_MAX];
-               snprintf(tempPath, sizeof tempPath, "%sfont.ttf", engine.userHomeDirectory);    
-               remove(tempPath);
-               
                if (!engine.unpack("data/vera.ttf", PAK_FONT))
                {
                        engine.reportFontFailure();
                }
        #endif
 
-       debug(("Trying to load correct font pixel sizes using a really half arsed routine!\n"));
-       debug(("If it crashes then you'll know why!\n"));
-                       
-       graphics.loadFont(0, "data/vera.ttf", 7);
-       graphics.loadFont(1, "data/vera.ttf", 9);
-       graphics.loadFont(2, "data/vera.ttf", 11);
-       graphics.loadFont(3, "data/vera.ttf", 13);
-       graphics.loadFont(4, "data/vera.ttf", 15);
-       
+       graphics.loadFont(0, "data/vera.ttf", 12);
+       graphics.loadFont(1, "data/vera.ttf", 15);
+       graphics.loadFont(2, "data/vera.ttf", 19);
+       graphics.loadFont(3, "data/vera.ttf", 23);
+       graphics.loadFont(4, "data/vera.ttf", 24);
+
        debug(("Font sizes all loaded!!\n"));
 
        audio.loadSound(SND_CHEAT, "sound/Lock And Load!!!");
@@ -421,7 +414,7 @@ void initSystem()
        graphics.license[1] = graphics.loadImage("gfx/main/cc-by-sa.png", true);
 
        SDL_Surface *device = graphics.loadImage("gfx/main/alienDevice.png");
-
+       SDL_SetWindowIcon(graphics.window, device);
        SDL_FreeSurface(device);
        
        if (strstr(engine.userHomeDirectory, "/root"))