From fe88d08c257ab266bef6f41b0b20736c84253f08 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Mon, 10 Sep 2018 22:32:05 +0200 Subject: [PATCH 1/3] Version bump --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5df9180..5b0a8cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(breakhack C) set(breakhack_GAME_TITLE "BreakHack") set(breakhack_MAJOR_VERSION 1) set(breakhack_MINOR_VERSION 1) -set(breakhack_PATCH_VERSION 1) +set(breakhack_PATCH_VERSION 2) set(breakhack_RELEASE_TYPE "") include(FindLua) From cc627dc0c3649b2b645ff8758523b064424bd093 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 11 Sep 2018 15:47:14 +0200 Subject: [PATCH 2/3] Take damage if ending charge on a damaging object - Currently, ending charge in fire or smoke doesn't damage the player --- src/skill.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/skill.c b/src/skill.c index a27d432..1bcc680 100644 --- a/src/skill.c +++ b/src/skill.c @@ -499,6 +499,12 @@ skill_charge(Skill *skill, SkillData *data) else if (destSpace->trap) trap_activate(destSpace->trap, player); + LinkedList *objects = destSpace->objects; + while (objects) { + object_damage(objects->data, player); + objects = objects->next; + } + return true; } From cfbd8cea4dfc2d5ff2282bfd1318efd978d185ec Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 11 Sep 2018 15:48:52 +0200 Subject: [PATCH 3/3] Patch version bump --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b0a8cf..30d089a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(breakhack C) set(breakhack_GAME_TITLE "BreakHack") set(breakhack_MAJOR_VERSION 1) set(breakhack_MINOR_VERSION 1) -set(breakhack_PATCH_VERSION 2) +set(breakhack_PATCH_VERSION 3) set(breakhack_RELEASE_TYPE "") include(FindLua)