summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-17 15:43:59 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-17 15:43:59 +0000
commit59035dbca3d4af546f87263378168bf3c2e716ad (patch)
tree59ed099560b4cd1b84096b3e7b50388cc953b2ac /src
parent0c6a2dd50b209a3f0e6960c5382117a3273295c0 (diff)
downloadhercules-59035dbca3d4af546f87263378168bf3c2e716ad.tar.gz
hercules-59035dbca3d4af546f87263378168bf3c2e716ad.tar.bz2
hercules-59035dbca3d4af546f87263378168bf3c2e716ad.tar.xz
hercules-59035dbca3d4af546f87263378168bf3c2e716ad.zip
* Some fixes to the previous commit (apparently it didn't compile with VS 2008)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13785 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 9f7ec7b15..525beac6f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3320,12 +3320,13 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
case SA_MONOCELL:
if (dstmd)
{
- if ( dstmd->status.mode&MD_BOSS )
+ int class_;
+ if ( sd && dstmd->status.mode&MD_BOSS )
{
clif_skill_fail(sd,skillid,0,0);
break;
}
- int class_ = skillid==SA_MONOCELL?1002:mob_get_random_id(2, 1, 0);
+ class_ = skillid==SA_MONOCELL?1002:mob_get_random_id(2, 1, 0);
clif_skill_nodamage(src,bl,skillid,skilllv,1);
mob_class_change(dstmd,class_);
if( tsc && dstmd->status.mode&MD_BOSS )
@@ -3339,7 +3340,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
}
break;
case SA_DEATH:
- if ( dstmd && dstmd->status.mode&MD_BOSS )
+ if ( sd && dstmd && dstmd->status.mode&MD_BOSS )
{
clif_skill_fail(sd,skillid,0,0);
break;