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
commite8f7c830abf5626ad0ffe446f8f2b1a9733682fb (patch)
tree25f5be3a32ca7007d1ab327d17f4025c072394db
parent716ed99459500f3e6f0164e0fad0afc28b29edce (diff)
downloadhercules-e8f7c830abf5626ad0ffe446f8f2b1a9733682fb.tar.gz
hercules-e8f7c830abf5626ad0ffe446f8f2b1a9733682fb.tar.bz2
hercules-e8f7c830abf5626ad0ffe446f8f2b1a9733682fb.tar.xz
hercules-e8f7c830abf5626ad0ffe446f8f2b1a9733682fb.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/branches/renewal@14470 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Renewal.txt1
-rw-r--r--src/map/script.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Renewal.txt b/Changelog-Renewal.txt
index 8b4f90dbe..72c556c78 100644
--- a/Changelog-Renewal.txt
+++ b/Changelog-Renewal.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);