summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-20 00:44:46 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-20 00:44:46 +0000
commit6bd4e62a427a7d583b287e6969a682a0fa1c5230 (patch)
treed23ee25bad04957dfec63b000521cc73a65286cf
parent3830f63b39fd4bda72fdb367b94140da761c9473 (diff)
downloadhercules-6bd4e62a427a7d583b287e6969a682a0fa1c5230.tar.gz
hercules-6bd4e62a427a7d583b287e6969a682a0fa1c5230.tar.bz2
hercules-6bd4e62a427a7d583b287e6969a682a0fa1c5230.tar.xz
hercules-6bd4e62a427a7d583b287e6969a682a0fa1c5230.zip
* Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14470 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/script.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8b4f90dbe..72c556c78 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -9,6 +9,7 @@ Date Added
- Fixed functions in db.c not being returned as pointer, causing warnings on VC6.
* Fixed plug-in version getting checked against itself and a wrong operator being used for the check (bugreport:3952, since r9631). [Ai4rei]
* Fixed WFIFOL being used instead of WFIFOW for a short field of packet 0x2710 (bugreport:2819). [Ai4rei]
+ * Made script command getmapxy print a warning, if an invalid type is supplied (related r69, r8459). [Ai4rei]
2010/11/16
* Added a missing argument to a warning containing a format specifier. [Paradox924X]
2010/11/15
diff --git a/src/map/script.c b/src/map/script.c
index 68f291f2c..d823ae597 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11575,6 +11575,10 @@ BUILDIN_FUNC(getmapxy)
if (sd && sd->hd)
bl = &sd->hd->bl;
break;
+ default:
+ ShowWarning("script: buildin_getmapxy: Invalid type %d\n", type);
+ script_pushint(st,-1);
+ return 1;
}
if (!bl) { //No object found.
script_pushint(st,-1);