diff options
| -rw-r--r-- | src/char_sql/int_homun.c | 5 | ||||
| -rw-r--r-- | src/map/npc.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 12 |
3 files changed, 3 insertions, 16 deletions
diff --git a/src/char_sql/int_homun.c b/src/char_sql/int_homun.c index 427559d30..206a6a5c1 100644 --- a/src/char_sql/int_homun.c +++ b/src/char_sql/int_homun.c @@ -219,7 +219,6 @@ int inter_delete_homunculus(int hom_id) { ShowSQL("DB error - %s\n",mysql_error(&mysql_handle)); ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql); - mapif_homunculus_deleted(fd, 0); return 0; } @@ -228,17 +227,15 @@ int inter_delete_homunculus(int hom_id) { ShowSQL("DB error - %s\n",mysql_error(&mysql_handle)); ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql); - mapif_homunculus_deleted(fd, 0); return 0; } - mapif_homunculus_deleted(fd, 1); return 1; } int mapif_delete_homunculus(int fd) { RFIFOHEAD(fd); - inter_delete_homunculus(RFIFOL(fd,2)); + mapif_homunculus_deleted(fd, inter_delete_homunculus(RFIFOL(fd,2))); } int mapif_rename_homun_ack(int fd, int account_id, int char_id, unsigned char flag, char *name){ diff --git a/src/map/npc.c b/src/map/npc.c index a996b2112..afdbb6b25 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1012,7 +1012,7 @@ int npc_touch_areanpc2(struct block_list *bl) int npc_check_areanpc(int flag,int m,int x,int y,int range) { int i; - int x0,y0,y0,y1; + int x0,y0,x1,y1; int xs,ys; if (range < 0) return 0; diff --git a/src/map/skill.c b/src/map/skill.c index 7259fa6c0..5ac920fe6 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6245,7 +6245,7 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s } if (sc && sc->data[SC_MAGICPOWER].timer != -1) - status_change_end(&sd->bl,SC_MAGICPOWER,-1); + status_change_end(src,SC_MAGICPOWER,-1); if (sd && !(flag&1) && sd->state.arrow_atk) //Consume arrow if a ground skill was not invoked. [Skotlex] battle_consume_ammo(sd, skillid, skilllv); @@ -7814,16 +7814,6 @@ static int skill_check_condition_mob_master_sub (struct block_list *bl, va_list return 1; } -static int skill_check_condition_hermod_sub(struct block_list *bl,va_list ap) -{ - struct npc_data *nd; - nd=(struct npc_data*)bl; - - if (nd->bl.subtype == WARP) - return 1; - return 0; -} - /*========================================== * Determines if a given skill should be made to consume ammo * when used by the player. [Skotlex] |