Final release

DorianHawkmoon · Jan 14, 2016 · e0ac655 · e0ac655
1 parent 781442f
commit e0ac655
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 1 deletion.
diff --git a/SDLGame/Main.cpp b/SDLGame/Main.cpp
@@ -2,6 +2,7 @@
 #include "Globals.h"
 #include "Application.h"
 
+
 enum main_states {
 	MAIN_CREATION,
 	MAIN_INIT,

diff --git a/SDLGame/ModulePlayer.cpp b/SDLGame/ModulePlayer.cpp
@@ -104,7 +104,9 @@ bool ModulePlayer::cleanUp(){
 		delete deadBody;
 		deadBody = nullptr;
 	}
-	player->cleanUp();
+	if (player != nullptr) {
+		player->cleanUp();
+	}
 	return true;
 }
 

diff --git a/resources/audio/effects/enemy_caveman_die.wav b/resources/audio/effects/enemy_caveman_die.wav
diff --git a/resources/audio/effects/enemy_caveman_run.wav b/resources/audio/effects/enemy_caveman_run.wav
diff --git a/resources/audio/effects/enemy_caveman_run_start.wav b/resources/audio/effects/enemy_caveman_run_start.wav
diff --git a/resources/audio/effects/enemy_hit.wav b/resources/audio/effects/enemy_hit.wav
diff --git a/resources/audio/effects/player_die.wav b/resources/audio/effects/player_die.wav
diff --git a/resources/fonts/arcadepix.png b/resources/fonts/arcadepix.png
diff --git a/resources/fonts/ARCADEPI.TTF → resources/fonts/arcadepix.ttf b/resources/fonts/ARCADEPI.TTF → resources/fonts/arcadepix.ttf
diff --git a/resources/images/Definitivos/Armas.png b/resources/images/Definitivos/Armas.png
diff --git a/resources/images/Definitivos/baseFirstLevel.png b/resources/images/Definitivos/baseFirstLevel.png
diff --git a/resources/images/Definitivos/troglodita.png b/resources/images/Definitivos/troglodita.png