Adds window icon

- Fixes bug where you could move when falling.
Oliveshark · Aug 15, 2018 · 9a610d5 · 9a610d5
1 parent 6af8d9d
commit 9a610d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/assets/Extras/icon.png b/assets/Extras/icon.png
diff --git a/src/main.c b/src/main.c
@@ -51,6 +51,7 @@
 #include "input.h"
 #include "screen.h"
 #include "hiscore.h"
+#include "io_util.h"
 
 typedef enum Turn_t {
 	PLAYER,
@@ -143,6 +144,9 @@ bool initSDL(void)
 		return false;
 	}
 
+	// Set the window icon
+	SDL_SetWindowIcon(gWindow, IMG_Load_RW(io_load_rwops("Extras/icon.png"), true));
+
 	gRenderer = SDL_CreateRenderer(gWindow, -1,
 				       SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE);
 	if (gRenderer == NULL)

diff --git a/src/player.c b/src/player.c
@@ -576,7 +576,7 @@ void player_update(UpdateData *data)
 		return;
 
 	check_skill_activation(data);
-	if (!check_skill_trigger(data))
+	if (player->state != FALLING && !check_skill_trigger(data))
 		handle_next_move(data);
 
 	if (player->state == FALLING && player->stats.hp > 0) {

diff --git a/src/skill.c b/src/skill.c
@@ -434,7 +434,7 @@ skill_create(enum SkillType t)
 			return NULL;
 	}
 
-#ifdef DEBUG
+#ifdef DEBUG_SKILLS
 	skill->levelcap = 1;
 #endif
 	return skill;