summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-29 04:13:21 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-29 04:13:21 +0000
commit0f706ea86d7972f88c2b7d06dfc35e178911070e (patch)
treeb89bc2d0a2c1e340581b3b70fd1a9aadd31f02ac /src/map/battle.c
parent4db583138b9556f72b13df7f66eeeace6a67ce3e (diff)
downloadhercules-0f706ea86d7972f88c2b7d06dfc35e178911070e.tar.gz
hercules-0f706ea86d7972f88c2b7d06dfc35e178911070e.tar.bz2
hercules-0f706ea86d7972f88c2b7d06dfc35e178911070e.tar.xz
hercules-0f706ea86d7972f88c2b7d06dfc35e178911070e.zip
- Clones can't be class-changed now
- Readded the class == -1 distance check in npc_checknear - Replaced check sd->trade_partner for sd->state.trading in clif.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6356 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 16132afab..15dabe24d 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2226,7 +2226,8 @@ static struct Damage battle_calc_weapon_attack(
}
}
- if(sd && sd->classchange && tmd && !(t_mode&MD_BOSS) && !tmd->guardian_data && (tmd->class_ < 1324 || tmd->class_ > 1363) && (rand()%10000 < sd->classchange))
+ if(sd && sd->classchange && tmd && !(t_mode&MD_BOSS) && !tmd->guardian_data && (tmd->class_ < 1324 || tmd->class_ > 1363)
+ && !mob_is_clone(tmd->class_) && (rand()%10000 < sd->classchange))
{ //Classchange:
struct mob_db *mob;
int k, class_;