- Fixed a compile warning. Some minor format cleanups.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7733 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-07-18 16:14:44 +00:00
parent b974a6b765
commit f7535ef5a9
3 changed files with 2 additions and 12 deletions

View File

@ -626,13 +626,6 @@ int mob_spawn (struct mob_data *md)
md->db = mob_db(md->class_);
if (md->spawn)
memcpy(md->name,md->spawn->name,NAME_LENGTH);
/*
// Redundant? mob_parse_dataset already have the name copied. [Lance]
else if (battle_config.override_mob_names == 1)
memcpy(md->name,md->db->name,NAME_LENGTH);
else
memcpy(md->name,md->db->jname,NAME_LENGTH);
*/
}
if (md->spawn) { //Respawn data
@ -784,11 +777,9 @@ static int mob_ai_sub_hard_activesearch(struct block_list *bl,va_list ap)
switch (bl->type)
{
case BL_PC:
{
if (((TBL_PC*)bl)->state.gangsterparadise &&
!(status_get_mode(&md->bl)&MD_BOSS))
return 0; //Gangster paradise protection.
}
default:
if ((*target) && (*target)->type == BL_HOMUNCULUS && bl->type != BL_HOMUNCULUS)
return 0; //For some reason Homun targets are never overriden.

View File

@ -647,7 +647,7 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t
//Set here because we need the inventory data for weapon sprite parsing.
status_set_viewdata(&sd->bl, sd->status.class_);
unit_dataset(&sd->bl);
sd->guild_x = -1;
sd->guild_y = -1;
@ -4747,7 +4747,6 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
merc_stop_attack(sd->hd) ;
merc_hom_delete(sd->hd,0);
}
// Leave duel if you die [LuzZza]
if(battle_config.duel_autoleave_when_die) {

View File

@ -768,7 +768,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, int skill_num, int
//TODO: here we should place and correct skills that should target homun automatically. However some work still needs be done as "dead homuns" are deleted from memory, and as such, you can't really target them. [Skotlex]
case AM_REST:
// case AM_RESURRECTHOMUN:
target = sd->hd;
target = (struct block_list*)sd->hd;
if (!target) {
clif_skill_fail(sd,skill_num,0,0);
return 0;