summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-04-28 16:40:47 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-04-28 16:40:47 +0000
commit7b6da851f876885e3c1a5cd7ad0d364d77404bf0 (patch)
treec2fc4213bfee3a3d53f96ddad816f2fa07a1f16d
parentb6666e976aa42fa01aef323ceb87fed7603f2a9d (diff)
downloadhercules-7b6da851f876885e3c1a5cd7ad0d364d77404bf0.tar.gz
hercules-7b6da851f876885e3c1a5cd7ad0d364d77404bf0.tar.bz2
hercules-7b6da851f876885e3c1a5cd7ad0d364d77404bf0.tar.xz
hercules-7b6da851f876885e3c1a5cd7ad0d364d77404bf0.zip
* Fixed @makehomun not checking for existing homunculus properly and thus allowing to create a homunculus when one is already present but inactive (bugreport:4879, since r10272).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14806 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/atcommand.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8df118895..99a3ffbbb 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2011/04/28
+ * Fixed @makehomun not checking for existing homunculus properly and thus allowing to create a homunculus when one is already present but inactive (bugreport:4879, since r10272). [Ai4rei]
* Updated packet 0x163 (ZC_BAN_LIST) to reflect change in packet layout introduced with 2010-08-03aRagexeRE (bugreport:4881, follow up to r14718). [Ai4rei]
* Fixed formatted broadcast messages not working with 2010-11-24aRagexeRE and later (bugreport:4872, since r14120). [Ai4rei]
2011/04/27
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 44c341cab..80f0c84f3 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -7166,7 +7166,7 @@ ACMD_FUNC(makehomun)
int homunid;
nullpo_retr(-1, sd);
- if ( merc_is_hom_active(sd->hd) ) {
+ if ( sd->status.hom_id ) {
clif_displaymessage(fd, msg_txt(450));
return -1;
}