summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-02 17:37:55 +0000
committer(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-02-02 17:37:55 +0000
commit3feff96af5d1e4f0691cd4aaa038f61853e8b0dc (patch)
treed48bbfc52134bbb351f43e8d84b61f51c44c94de /src
parent8b2d63b9588da55825a0311042e9f639fb06fc94 (diff)
downloadhercules-3feff96af5d1e4f0691cd4aaa038f61853e8b0dc.tar.gz
hercules-3feff96af5d1e4f0691cd4aaa038f61853e8b0dc.tar.bz2
hercules-3feff96af5d1e4f0691cd4aaa038f61853e8b0dc.tar.xz
hercules-3feff96af5d1e4f0691cd4aaa038f61853e8b0dc.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1022 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 2d3f07aac..674412332 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5819,7 +5819,7 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
if(!goflag)
return 0;
ts->tick=tick;
-
+
switch(sg->unit_id){
case 0x83: /* サンクチュアリ */
{
@@ -5867,7 +5867,7 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
if (sc_data[type].timer==-1)
status_change_start(bl,type,sg->skill_lv,(int)src,0,0,0,0);
else if((unit2 = (struct skill_unit *)sc_data[type].val2) && unit2 != src){
- if(unit2->group && DIFF_TICK(sg->tick,unit2->group->tick) > 0)
+ if(unit2 && unit2->group && DIFF_TICK(sg->tick,unit2->group->tick) > 0)
status_change_start(bl,type,sg->skill_lv,(int)src,0,0,0,0);
ts->tick-=sg->interval;
}
@@ -6020,7 +6020,7 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
if (sc_data[type].timer==-1)
status_change_start(bl,type,sg->skill_lv,(int)src,0,0,skill_get_time2(sg->skill_id,sg->skill_lv),0);
else if((unit2=(struct skill_unit *)sc_data[type].val2) && unit2 != src ){
- if( unit2->group && DIFF_TICK(sg->tick,unit2->group->tick)>0 )
+ if(unit2 && unit2->group && DIFF_TICK(sg->tick,unit2->group->tick)>0 )
status_change_start(bl,type,sg->skill_lv,(int)src,0,0,skill_get_time2(sg->skill_id,sg->skill_lv),0);
ts->tick-=sg->interval;
}
@@ -6057,7 +6057,7 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
status_change_start(bl,type,sg->skill_lv,sg->val1,sg->val2,
(int)src,skill_get_time2(sg->skill_id,sg->skill_lv),0);
else if( (unit2=(struct skill_unit *)sc_data[type].val4) && unit2 != src ){
- if( unit2->group && DIFF_TICK(sg->tick,unit2->group->tick)>0 )
+ if(unit2 && unit2->group && DIFF_TICK(sg->tick,unit2->group->tick)>0 )
status_change_start(bl,type,sg->skill_lv,sg->val1,sg->val2,
(int)src,skill_get_time2(sg->skill_id,sg->skill_lv),0);
ts->tick-=sg->interval;
@@ -6077,7 +6077,7 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
status_change_start(bl,type,sg->skill_lv,(sg->val1)>>16,(sg->val1)&0xffff,
(int)src,skill_get_time2(sg->skill_id,sg->skill_lv),0);
else if((unit2=(struct skill_unit *)sc_data[type].val4) && unit2 != src ){
- if( unit2->group && DIFF_TICK(sg->tick,unit2->group->tick)>0 )
+ if(unit2 && unit2->group && DIFF_TICK(sg->tick,unit2->group->tick)>0 )
status_change_start(bl,type,sg->skill_lv,(sg->val1)>>16,(sg->val1)&0xffff,
(int)src,skill_get_time2(sg->skill_id,sg->skill_lv),0);
ts->tick-=sg->interval;
@@ -6097,7 +6097,7 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
skill_additional_effect(ss,bl,sg->skill_id,sg->skill_lv,BF_MISC,tick);
}
else if( (unit2=(struct skill_unit *)sc_data[type].val4) && unit2 != src ){
- if( unit2->group && DIFF_TICK(sg->tick,unit2->group->tick)>0 ) {
+ if(unit2 && unit2->group && DIFF_TICK(sg->tick,unit2->group->tick)>0 ) {
status_change_start(bl,type,sg->skill_lv,sg->val1,sg->val2,
(int)src,skill_get_time2(sg->skill_id,sg->skill_lv),0);
skill_additional_effect(ss,bl,sg->skill_id,sg->skill_lv,BF_MISC,tick);