summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2018-10-22 00:33:15 +0200
committerGitHub <noreply@github.com>2018-10-22 00:33:15 +0200
commit9deff52b5b081307107e0eafdf1cc771c8cd63a6 (patch)
treec7a6d5850875e2cf68b0de8eb05d12befebdce1a /src
parent370d3290b4b17cef8da86789a847507644de210d (diff)
parent8641e32cafdff80552dadc6c96f3aaec1af123be (diff)
downloadhercules-9deff52b5b081307107e0eafdf1cc771c8cd63a6.tar.gz
hercules-9deff52b5b081307107e0eafdf1cc771c8cd63a6.tar.bz2
hercules-9deff52b5b081307107e0eafdf1cc771c8cd63a6.tar.xz
hercules-9deff52b5b081307107e0eafdf1cc771c8cd63a6.zip
Merge pull request #2250 from Asheraf/pr2
change showevent icon validation to use function from questinfo
Diffstat (limited to 'src')
-rw-r--r--src/map/script.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/map/script.c b/src/map/script.c
index fbf842f18..e89d36be4 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -21330,18 +21330,7 @@ static BUILDIN(showevent)
}
}
-#if PACKETVER >= 20170315
- if (icon < 0 || (icon > 10 && icon != 9999))
- icon = 9999;
-#elif PACKETVER >= 20120410
- if (icon < 0 || (icon > 8 && icon != 9999) || icon == 7)
- icon = 9999; // Default to nothing if icon id is invalid.
-#else
- if (icon < 0 || icon > 7)
- icon = 0;
- else
- icon = icon + 1;
-#endif
+ icon = quest->questinfo_validate_icon(icon);
clif->quest_show_event(sd, &nd->bl, icon, color);
return true;