Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed the compile error in mob.c

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7293 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-06-22 13:38:17 +00:00
parent 67ff295ba4
commit aa47683c94
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/battle.c
View File

@ -1873,7 +1873,7 @@ static struct Damage battle_calc_weapon_attack(
wd.damage2 = 0;
flag.rh=1;
flag.lh=0;
} else if(sd->status.weapon > MAX_WEAPON_TYPE)
} else if(sd->status.weapon > MAX_WEAPON_TYPE && skill_num != ASC_BREAKER)
{ //Dual-wield
if (wd.damage)
{

17
src/map/mob.c
View File

@ -623,14 +623,15 @@ int mob_spawn (struct mob_data *md)
else if (md->vd->class_ != md->class_) {
status_set_viewdata(&md->bl, md->class_);
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)
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