summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-24 04:19:56 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-24 04:19:56 +0000
commit8c752b6915b68304e484439e5048e4e65c1ec2fe (patch)
tree4efbe306d9b50d6452b52323a8f8e19ae4793456
parentb201c7119eb5da8b519de795a241ebe5e251029b (diff)
downloadhercules-8c752b6915b68304e484439e5048e4e65c1ec2fe.tar.gz
hercules-8c752b6915b68304e484439e5048e4e65c1ec2fe.tar.bz2
hercules-8c752b6915b68304e484439e5048e4e65c1ec2fe.tar.xz
hercules-8c752b6915b68304e484439e5048e4e65c1ec2fe.zip
- Fixed mob_clone_spawn completely ignoring the mode variable.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8462 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/mob.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index eb5774441..830cc2ada 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/23
+ * Fixed mob_clone_spawn completely ignoring the mode variable. [Skotlex]
* Fixed Energy Coat reducing and consuming more than it should when you
have 100% SP [Skotlex]
* Cleaned up getmapxy script function, also added support for type 4 so
diff --git a/src/map/mob.c b/src/map/mob.c
index 18c845baf..19f258b3f 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2863,7 +2863,9 @@ int mob_clone_spawn(struct map_session_data *sd, int m, int x, int y, const char
mob_db_data[class_]->status.rhw.atk2+=
sd->base_status.rhw.atk + sd->base_status.rhw.atk2 +
sd->base_status.lhw->atk + sd->base_status.lhw->atk2; //Max ATK
- if (flag&1) //Friendly Character, remove looting.
+ if (mode) //User provided mode.
+ mob_db_data[class_]->status.mode = mode;
+ else if (flag&1) //Friendly Character, remove looting.
mob_db_data[class_]->status.mode &= ~MD_LOOTER;
mob_db_data[class_]->status.hp = mob_db_data[class_]->status.max_hp;
mob_db_data[class_]->status.sp = mob_db_data[class_]->status.max_sp;