summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-29 18:54:54 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-29 18:54:54 +0000
commit84e7380a76a1e3f5740c0a144d79405ddc4c82a2 (patch)
tree7c9db9cd8930a90717f90a2b6ed607ea58afd5e1
parent48351d48eeaf827f4f3f9215a8d7c337d7b3b902 (diff)
downloadhercules-84e7380a76a1e3f5740c0a144d79405ddc4c82a2.tar.gz
hercules-84e7380a76a1e3f5740c0a144d79405ddc4c82a2.tar.bz2
hercules-84e7380a76a1e3f5740c0a144d79405ddc4c82a2.tar.xz
hercules-84e7380a76a1e3f5740c0a144d79405ddc4c82a2.zip
Fixed nullpo in merc_hom_skillup
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7974 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/pc.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index b0e08aa33..1be02f87a 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/07/29
+ * Fixed nullpo in merc_hom_skillup [Toms]
* Added a return value to buildin_rid2name if rid is invalid [Toms]
* Made the SQL ping interval default to 7 hours. [Skotlex]
* Made skill_unitsetting remove the group when no unit-cells were placed
diff --git a/src/map/pc.c b/src/map/pc.c
index 5af6a080e..15d2637ae 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4379,7 +4379,7 @@ int pc_skillup(struct map_session_data *sd,int skill_num)
return 0;
}
- if(skill_num >= HM_SKILLBASE){
+ if(skill_num >= HM_SKILLBASE && sd->hd){
merc_hom_skillup(sd->hd, skill_num);
return 0;
}