summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-22 13:38:17 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-22 13:38:17 +0000
commit1db8c4a322c26f54801304014ea8b6d88fe3f14c (patch)
tree916f2c297567daae98c62cbc0a17b69f2c100752
parent53cee1c9a4415b8a092c744c6612d2a152e06762 (diff)
downloadhercules-1db8c4a322c26f54801304014ea8b6d88fe3f14c.tar.gz
hercules-1db8c4a322c26f54801304014ea8b6d88fe3f14c.tar.bz2
hercules-1db8c4a322c26f54801304014ea8b6d88fe3f14c.tar.xz
hercules-1db8c4a322c26f54801304014ea8b6d88fe3f14c.zip
- Fixed the compile error in mob.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7293 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/mob.c17
2 files changed, 10 insertions, 9 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 91541270f..90260a74e 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -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)
{
diff --git a/src/map/mob.c b/src/map/mob.c
index f462b9aa8..e4f94679d 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -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