Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Annoying ass bug with overwriting a pilot that is dead!!

Browse Source
This commit is contained in:
Allanis 2013-06-01 18:11:56 +01:00
parent f91505b950
commit 3ff2885fd2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/player.c
View File

@ -256,7 +256,6 @@ static void player_newMake(void) {
// Create the player and start the game. // Create the player and start the game.
player_newShip(ship, x, y, 0., 0., RNG(0, 359)/180.*M_PI); player_newShip(ship, x, y, 0., 0., RNG(0, 359)/180.*M_PI);
space_init(system); space_init(system);
map_clear(); // Set the map up.
// Clear the map. // Clear the map.
map_clear(); map_clear();
@ -493,8 +492,9 @@ void player_render(void) {
// Pilot is dead, just render her and stop. // Pilot is dead, just render her and stop.
if(player_isFlag(PLAYER_DESTROYED) || pilot_isFlag(player, PILOT_DEAD)) { if(player_isFlag(PLAYER_DESTROYED) || pilot_isFlag(player, PILOT_DEAD)) {
if(player_isFlag(PLAYER_DESTROYED)) { if(player_isFlag(PLAYER_DESTROYED)) {
if(!toolkit && (SDL_GetTicks() > player_timer)) if(!toolkit && (player != NULL) && (SDL_GetTicks() > player_timer)) {
menu_death(); menu_death();
}
} else } else
pilot_render(player); pilot_render(player);
@ -1528,6 +1528,7 @@ int player_load(xmlNodePtr parent) {
xmlNodePtr node; xmlNodePtr node;
// Some cleanup. // Some cleanup.
player_flags = 0;
player_cleanup(); player_cleanup();
var_cleanup(); var_cleanup();
missions_cleanup(); missions_cleanup();