walkero
/
breakhack
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
Linus Probert 2018-09-11 15:49:43 +02:00
parent 5043a86377 cfbd8cea4d
commit 03b60f6140
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -7,7 +7,7 @@ project(breakhack C)
set(breakhack_GAME_TITLE "BreakHack") set(breakhack_GAME_TITLE "BreakHack")
set(breakhack_MAJOR_VERSION 1) set(breakhack_MAJOR_VERSION 1)
set(breakhack_MINOR_VERSION 1) set(breakhack_MINOR_VERSION 1)
set(breakhack_PATCH_VERSION 1) set(breakhack_PATCH_VERSION 3)
set(breakhack_RELEASE_TYPE "") set(breakhack_RELEASE_TYPE "")
include(FindLua) include(FindLua)

6
src/skill.c
View File

@ -499,6 +499,12 @@ skill_charge(Skill *skill, SkillData *data)
else if (destSpace->trap) else if (destSpace->trap)
trap_activate(destSpace->trap, player); trap_activate(destSpace->trap, player);
LinkedList *objects = destSpace->objects;
while (objects) {
object_damage(objects->data, player);
objects = objects->next;
}
return true; return true;
} }