From 9a610d5f88931061cdc63289bdf540c458590559 Mon Sep 17 00:00:00 2001
From: Linus Probert <linus.probert@gmail.com>
Date: Wed, 15 Aug 2018 08:08:18 +0200
Subject: [PATCH] Adds window icon

- Fixes bug where you could move when falling.
---
 assets/Extras/icon.png | Bin 0 -> 640 bytes
 src/main.c             |   4 ++++
 src/player.c           |   2 +-
 src/skill.c            |   2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 assets/Extras/icon.png

diff --git a/assets/Extras/icon.png b/assets/Extras/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e82c43b6cdd30c188b2e369a8285c0e1474dcab6
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;s_4~ItDdL@)-aC02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00HPpL_t(I%Y~CMXxmT_hCijD
zIN%{r8DwyVP=|UcRNxF9GI-F~AxlBoQfQzZ3f7RpLx&6+I;ha0hITNWJQTWU^q|3m
z3kk@efCUP;gCT+l)IozNhSx#0uw{qdcK7c7`|s|5@XzFOO-$p7(CSSApw*i~t2c#Q
zt_itZ%VX1clKTML6wETuFgl2q@eW--q~E_J4jg)42f{MXis@`EJIP>((fPu&7f&;=
z>m+}Bex%ZRbwM&1t^i2O&Vt(MYmKq(tt6HXs*Hv%08uiNHjWS_Gf6Jj#Mt(5!w{#v
z3qb4RZ`7rndq)6J6$MLAv#uv9rIW055i8o-65TMw9?LlGT~hA|0H^I@kGD4hNX39w
zZwfaIF<SEKb({!QQF4E9b0w_-X!WLO^tx2N3D$XMZL~(O3&1b)f;6~gaC0TC@v3?g
zM)r4%4<@>Ph;^OdpT42d>r(ph8GuGZ#s}oECbpKlTY8FPeF7j39QyrBs@`O!!Q1!e
zImp@-7K<|Hb9_G{4jkgZ$(aEhYZ(jQk2VWQRTQlK3IN9RE?eM!1!H<g>7bg?_ajC_
zmnfM@_g-NkUw|~YWf7wws0YPjOHX;UQ--}KjD{|iKbeeQKAvM9KjhobbVZFD|HA)l
a8Q?F(t<Aq0g(R*30000<MNUMnLSTZmRS;nS

literal 0
HcmV?d00001

diff --git a/src/main.c b/src/main.c
index 7291ef5..39876fc 100644
--- 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
index f4ee913..8af18d4 100644
--- 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
index e82b5d1..c303ea1 100644
--- 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;