summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-08-24 23:16:11 +0200
committerGitHub <noreply@github.com>2018-08-24 23:16:11 +0200
commitdbfe2391f4481cb88dac3c86902a58e71cf22920 (patch)
treec1ca659d93e5ee3213bd49cc0b0051be545df4ff /src
parentb64dac4392e312aacc09496941e929ebdbc749b3 (diff)
parent32d0e9d40aef79b1c8c0cff29ea9537f4e9e5c42 (diff)
downloadhercules-dbfe2391f4481cb88dac3c86902a58e71cf22920.tar.gz
hercules-dbfe2391f4481cb88dac3c86902a58e71cf22920.tar.bz2
hercules-dbfe2391f4481cb88dac3c86902a58e71cf22920.tar.xz
hercules-dbfe2391f4481cb88dac3c86902a58e71cf22920.zip
Merge pull request #2175 from EyesOfAHawk/skill_attack_warning
Supress warning in skill_attack when MAGIC_REFLECTION_TYPE is 0.
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index a4ebff9f1..7d47cfcb6 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2745,7 +2745,11 @@ static int skill_magic_reflect(struct block_list *src, struct block_list *bl, in
static int skill_attack(int attack_type, struct block_list *src, struct block_list *dsrc, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int64 tick, int flag)
{
struct Damage dmg;
+#if MAGIC_REFLECTION_TYPE
struct status_data *sstatus, *tstatus;
+#else
+ struct status_data *tstatus;
+#endif
struct status_change *sc;
struct map_session_data *sd, *tsd;
int type;
@@ -2780,7 +2784,9 @@ static int skill_attack(int attack_type, struct block_list *src, struct block_li
)
return 0;
+#if MAGIC_REFLECTION_TYPE
sstatus = status->get_status_data(src);
+#endif
tstatus = status->get_status_data(bl);
sc = status->get_sc(bl);
if (sc && !sc->count) sc = NULL; //Don't need it.