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

Maint: Removed duplicate code

This commit is contained in:
Linus Probert 2018-09-13 13:46:29 +02:00
parent 0fc1fed278
commit dbf9fe3931
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/skill.c
View File

@ -154,19 +154,29 @@ create_default(const char *s_label, Sprite *s)
return skill; return skill;
} }
static bool
check_skill_validity(Position *playerPos, Position *targetPos, SkillData *data)
{
*playerPos = position_to_matrix_coords(&data->player->sprite->pos);
*targetPos = *playerPos;
targetPos->x += (int) data->direction.x;
targetPos->y += (int) data->direction.y;
player_turn(data->player, &data->direction);
if (!position_in_roommatrix(targetPos)) {
return false;
}
return true;
}
static bool static bool
skill_use_flurry(Skill *skill, SkillData *data) skill_use_flurry(Skill *skill, SkillData *data)
{ {
UNUSED (skill); UNUSED (skill);
Position playerPos = position_to_matrix_coords(&data->player->sprite->pos); Position playerPos, targetPos;
Position targetPos = playerPos; if (!check_skill_validity(&playerPos, &targetPos, data)) {
targetPos.x += (int) data->direction.x;
targetPos.y += (int) data->direction.y;
player_turn(data->player, &data->direction);
if (!position_in_roommatrix(&targetPos)) {
return false; return false;
} }
@ -285,14 +295,8 @@ skill_bash(Skill *skill, SkillData *data)
{ {
UNUSED (skill); UNUSED (skill);
Position playerPos = position_to_matrix_coords(&data->player->sprite->pos); Position playerPos, targetPos;
Position targetPos = playerPos; if (!check_skill_validity(&playerPos, &targetPos, data)) {
targetPos.x += (int) data->direction.x;
targetPos.y += (int) data->direction.y;
player_turn(data->player, &data->direction);
if (!position_in_roommatrix(&targetPos)) {
return false; return false;
} }