diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/battle.c | 4 | ||||
| -rw-r--r-- | src/map/script.c | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 9bbcce01e..bde86cbe5 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3440,6 +3440,10 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f if(((TBL_PET *)t_bl)->msd->bl.id == md->master_id)
state |= BCT_PARTY;
break;
+ case BL_HOMUNCULUS:
+ if(((struct homun_data *)t_bl)->master->bl.id == md->master_id)
+ state |= BCT_PARTY;
+ break;
}
state |= BCT_ENEMY;
break;
diff --git a/src/map/script.c b/src/map/script.c index 04f5532cc..b726e6b2f 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -10306,8 +10306,15 @@ int buildin_rid2name(struct script_state *st){ case BL_NPC:
push_str(st->stack,C_CONSTSTR,((struct npc_data *)bl)->exname);
break;
+ case BL_PET:
+ push_str(st->stack,C_CONSTSTR,((struct pet_data *)bl)->name);
+ break;
+ case BL_HOMUNCULUS:
+ push_str(st->stack,C_CONSTSTR,((struct homun_data *)bl)->name);
+ break;
default:
ShowError("buildin_rid2name: BL type unknown.\n");
+ push_str(st->stack,C_CONSTSTR,"");
break;
}
}
|