- Fixed a bug on "select" when skipping empty entries when the selected entry is the last.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8839 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,6 +4,8 @@ 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/09/21
+	* Fixed a bug on "select" when skipping empty entries when the selected
+	  entry is the last. [Skotlex]
 	* Improved a bit RFIFOFLUSH as suggested by Harbin. [Skotlex]
 2006/09/20
 	* A mob's HP is set temporarily to 0 before invoking it's on-death script,

src/map/script.c

@@ -10220,7 +10220,7 @@ int buildin_select(struct script_state *st)
 		st->state=END;
 	} else {
 		//Skip empty menu entries which weren't displayed on the client (Skotlex)
-		for(i=st->start+2;i<= (st->start+sd->npc_menu) && sd->npc_menu<(st->end-st->start);i++) {
+		for(i=st->start+2;i< (st->start+2+sd->npc_menu) && sd->npc_menu < (st->end-st->start-2);i++) {
 			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.