summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-20 15:01:47 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-20 15:01:47 +0000
commitf5c3250ad6d0801dfe2249370246418867f48187 (patch)
tree1ead7d741feaace79bb53bb572a9dba042cf3cb5
parent930cbe9d946f40e3698765b05b03f97df52fa471 (diff)
downloadhercules-f5c3250ad6d0801dfe2249370246418867f48187.tar.gz
hercules-f5c3250ad6d0801dfe2249370246418867f48187.tar.bz2
hercules-f5c3250ad6d0801dfe2249370246418867f48187.tar.xz
hercules-f5c3250ad6d0801dfe2249370246418867f48187.zip
* jA1983 script.c buildin_menu fix. Thanks to End_of_exam.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6665 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/script.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8d3a9e057..48c2a956e 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/05/19
+ * jA1983 script.c buildin_menu fix. Thanks to End_of_exam. [Lance]
* Abit of alterations to login-server. [Lance]
2006/05/19
* Minor unsigned/signed alteration in pc_additem to shut the compiler up. [Lance]
diff --git a/src/map/script.c b/src/map/script.c
index 8dbcb0122..318ac4345 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2810,6 +2810,7 @@ int buildin_menu(struct script_state *st)
//Skip empty menu entries which weren't displayed on the client (blackhole89)
for(i=st->start+2;i<=(st->start+sd->npc_menu*2) && sd->npc_menu<(st->end-st->start)/2;i+=2)
{
+ conv_str(st,& (st->stack->stack_data[i])); // we should convert variables to strings before access it [jA1983] [EoE]
if((int)strlen(st->stack->stack_data[i].u.str) < 1)
sd->npc_menu++; //Empty selection which wasn't displayed on the client.
}