summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-01-20 14:59:11 -0200
committershennetsind <ind@henn.et>2013-01-20 14:59:11 -0200
commite6ac0ecf225d839ed67335f6dc7c15cd0d296df0 (patch)
tree4ad5b3c6688798c343991e391dd27b4424bfe605
parent2bf913eebcc0a18057c9012be187585a7afb2f72 (diff)
downloadhercules-e6ac0ecf225d839ed67335f6dc7c15cd0d296df0.tar.gz
hercules-e6ac0ecf225d839ed67335f6dc7c15cd0d296df0.tar.bz2
hercules-e6ac0ecf225d839ed67335f6dc7c15cd0d296df0.tar.xz
hercules-e6ac0ecf225d839ed67335f6dc7c15cd0d296df0.zip
Fixed 3 logical errors (1 that would cause CH_PALMSTRIKE to crash the server when either caster or target were out of sc data)
Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/skill.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 31c3cc53c..961e3bf0c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5255,7 +5255,7 @@ void clif_skill_produce_mix_list(struct map_session_data *sd, int skill_id , int
for(i=0,c=0;i<MAX_SKILL_PRODUCE_DB;i++){
if( skill_can_produce_mix(sd,skill_produce_db[i].nameid, trigger, 1) &&
- ( skill_id > 0 && skill_produce_db[i].req_skill == skill_id || skill_id < 0 )
+ ( ( skill_id > 0 && skill_produce_db[i].req_skill == skill_id ) || skill_id < 0 )
){
if((view = itemdb_viewid(skill_produce_db[i].nameid)) > 0)
WFIFOW(fd,c*8+ 4)= view;
diff --git a/src/map/skill.c b/src/map/skill.c
index 8718c3b58..a465410b2 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3283,8 +3283,8 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr_t data)
{
struct status_change* tsc = status_get_sc(target);
struct status_change* sc = status_get_sc(src);
- if( tsc && tsc->option&OPTION_HIDE ||
- sc && sc->option&OPTION_HIDE ){
+ if( ( tsc && tsc->option&OPTION_HIDE ) ||
+ ( sc && sc->option&OPTION_HIDE ) ){
skill_blown(src,target,skill_get_blewcount(skl->skill_id, skl->skill_lv), -1, 0x0 );
break;
}
@@ -3730,7 +3730,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
if( dir > 2 && dir < 6 ) y = -i;
else if( dir == 7 || dir < 2 ) y = i;
else y = 0;
- if( (mbl == src || !map_flag_gvg(src->m) && !map[src->m].flag.battleground) && // only NJ_ISSEN don't have slide effect in GVG
+ if( (mbl == src || (!map_flag_gvg(src->m) && !map[src->m].flag.battleground) ) && // only NJ_ISSEN don't have slide effect in GVG
unit_movepos(src, mbl->x+x, mbl->y+y, 1, 1) ) {
clif_slide(src, src->x, src->y);
//uncomment this if you want to remove MO_EXTREMITYFIST glitchy walking effect. [malufett]