Coalesce printf() statements in main.cpp, make them translatable.

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

diff --git a/src/player.cpp b/src/player.cpp
index 77661d8096cfa1787637faab72a20e6cd97f8df5..8a0c36fd4f0a657027b099ac4a769c6c8f0fcf46 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2004 Parallel Realities
+Copyright (C) 2004-2011 Parallel Realities
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -56,7 +56,7 @@ int medalWorker(void *data)
        
        SDL_mutexV(medalServer.lock);
        
-       delete tname;
+       delete[] tname;
        
        return type;
 }
@@ -66,9 +66,9 @@ void presentPlayerMedal(const char *tname)
        // Copy the input, so that threading
        // doesn't trip us up!
        char *data = new char[128];
-       strncpy(data, tname, sizeof data);
+       strlcpy(data, tname, 128);
        
-       SDL_Thread *thread = SDL_CreateThread(medalWorker, (void*)data);
+       SDL_Thread *thread = SDL_CreateThread(medalWorker, "MedalWorker", (void*)data);
        
        if (thread == NULL)
        {
@@ -290,7 +290,7 @@ void doPlayer()
                                        Math::addBit(&player.flags, ENT_FLIES);
                                        player.setSprites(graphics.getSprite("JPBobRight", true), graphics.getSprite("JPBobLeft", true), graphics.getSprite("BobSpin", true));
                                }
-                               else if ((player.environment == ENV_WATER))
+                               else if (player.environment == ENV_WATER)
                                {
                                        engine.setInfoMessage("Jetpack cannot be used underwater", 0, INFO_NORMAL);
                                }
@@ -430,15 +430,15 @@ void doPlayer()
        }
        
        #if DEBUG
-       if (engine.keyState[SDLK_1])
+       if (engine.keyState[SDL_SCANCODE_1])
                player.currentWeapon = &weapon[WP_PISTOL];
-       else if (engine.keyState[SDLK_2])
+       else if (engine.keyState[SDL_SCANCODE_2])
                player.currentWeapon = &weapon[WP_MACHINEGUN];
-       else if (engine.keyState[SDLK_3])
+       else if (engine.keyState[SDL_SCANCODE_3])
                player.currentWeapon = &weapon[WP_GRENADES];
-       else if (engine.keyState[SDLK_4])
+       else if (engine.keyState[SDL_SCANCODE_4])
                player.currentWeapon = &weapon[WP_LASER];
-       else if (engine.keyState[SDLK_5])
+       else if (engine.keyState[SDL_SCANCODE_5])
                player.currentWeapon = &weapon[WP_SPREAD];
        #endif