summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-02 06:19:20 +0000
committer(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-02 06:19:20 +0000
commit8b2d63b9588da55825a0311042e9f639fb06fc94 (patch)
treead52066c0ad6922858aa6e8623b3a3d82023a445
parent9b5c358e45804e93eb9e6a9a33a9f8d3cfb4a8eb (diff)
downloadhercules-8b2d63b9588da55825a0311042e9f639fb06fc94.tar.gz
hercules-8b2d63b9588da55825a0311042e9f639fb06fc94.tar.bz2
hercules-8b2d63b9588da55825a0311042e9f639fb06fc94.tar.xz
hercules-8b2d63b9588da55825a0311042e9f639fb06fc94.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1021 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt2
-rw-r--r--src/map/skill.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 69debaf75..e04adfd81 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
02/02
+ * Removed nullpo check in skillnotok() -- otherwise it will display fail
+ messages for monster skills [celest]
* Added crash check for Ice Wall [celest]
* Added some optimisations by Ilpalazzo-sama [celest]
- reduce mob_data->size variable to 1 bytes
diff --git a/src/map/skill.c b/src/map/skill.c
index ed6cf3436..2d3f07aac 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -811,7 +811,8 @@ int skill_count_target(struct block_list *bl, va_list ap );
// [MouseJstr] - skill ok to cast? and when?
int skillnotok(int skillid, struct map_session_data *sd) {
- nullpo_retr (1, sd);
+ if (sd == 0)
+ return 0;
if (!(skillid >= 10000 && skillid < 10015))
if ((skillid > MAX_SKILL) || (skillid < 0))