- Fixed the compile error in mob.c
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7293 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
67ff295ba4
commit
aa47683c94
@ -1873,7 +1873,7 @@ static struct Damage battle_calc_weapon_attack(
|
|||||||
wd.damage2 = 0;
|
wd.damage2 = 0;
|
||||||
flag.rh=1;
|
flag.rh=1;
|
||||||
flag.lh=0;
|
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
|
{ //Dual-wield
|
||||||
if (wd.damage)
|
if (wd.damage)
|
||||||
{
|
{
|
||||||
|
@ -625,12 +625,13 @@ int mob_spawn (struct mob_data *md)
|
|||||||
md->db = mob_db(md->class_);
|
md->db = mob_db(md->class_);
|
||||||
if (md->spawn)
|
if (md->spawn)
|
||||||
memcpy(md->name,md->spawn->name,NAME_LENGTH);
|
memcpy(md->name,md->spawn->name,NAME_LENGTH);
|
||||||
|
/*
|
||||||
// Redundant? mob_parse_dataset already have the name copied. [Lance]
|
// Redundant? mob_parse_dataset already have the name copied. [Lance]
|
||||||
/*else if (battle_config.override_mob_names == 1)
|
else if (battle_config.override_mob_names == 1)
|
||||||
memcpy(md->name,md->db->name,NAME_LENGTH);
|
memcpy(md->name,md->db->name,NAME_LENGTH);
|
||||||
else
|
else
|
||||||
memcpy(md->name,md->db->jname,NAME_LENGTH);*/
|
memcpy(md->name,md->db->jname,NAME_LENGTH);
|
||||||
}
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
if (md->spawn) { //Respawn data
|
if (md->spawn) { //Respawn data
|
||||||
|
Loading…
x
Reference in New Issue
Block a user