summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-11-23 02:07:17 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-11-23 02:07:17 +0000
commit943371d5abcbaad9e653c37c955e62be98a6d5f2 (patch)
tree425c0b5ff0ca54f72e385bd0cf767ffbff8c6a61
parent1bb03e1549a9050049bc027566a448a530298b64 (diff)
downloadhercules-943371d5abcbaad9e653c37c955e62be98a6d5f2.tar.gz
hercules-943371d5abcbaad9e653c37c955e62be98a6d5f2.tar.bz2
hercules-943371d5abcbaad9e653c37c955e62be98a6d5f2.tar.xz
hercules-943371d5abcbaad9e653c37c955e62be98a6d5f2.zip
* Readded code that was removed from atcommand_showmobs by mistake in the previous commit. (r13383)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13384 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/atcommand.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7f77e45ef..4f1430d6a 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.
2008/11/22
+ * Readded code that was removed from atcommand_showmobs by mistake in the previous commit. (r13383)
* Hunted down improper uses of va_list variables.
* Hunted down the simpler 64bit pointer truncations. [FlavioJS]
2008/11/18
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index f3cca853a..643c7c1f4 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -7054,6 +7054,9 @@ int atcommand_showmobs(const int fd, struct map_session_data* sd, const char* co
if( md == NULL )
break;// no more mobs
+ if( md->special_state.ai || md->master_id )
+ continue;//Hide slaves and player summoned mobs. [Skotlex]
+
if( mob_id == -1 || md->class_ == mob_id )
{
++number;