/*
-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
SDL_mutexV(medalServer.lock);
- delete tname;
+ delete[] tname;
return type;
}
// 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)
{
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);
}
}
}
- #if !USEPAK
- if (engine.keyState[SDLK_1])
+ #if DEBUG
+ 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