* Documented @set command from r16123.

* Fixed a waitingroom bug in Wizard job quest (bugreport:7189).
* Fixed getequipname() returning -1 instead of an empty string (bugreport:7186).

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17100 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 20 insertions, 14 deletions

diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index a8d00ef19..a0afa043c 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= rAthena Dev Team
 //===== Current Version: =====================================
-//= 20121223
+//= 20130115
 //===== Description: =========================================
 //= List of available atcommands and their functions.
 //============================================================
@@ -1145,6 +1145,14 @@ Reloads the specified configuration file.
 
 ---------------------------------------
 
+@set <variable> {<value>}
+
+Changes a player or account variable to the specified value.
+If no value is given, the variable's current value will be displayed.
+Note that the value of a string variable may be typed with or without double quotes.
+
+---------------------------------------
+
 @setbattleflag <flag> <value>
 
 Changes a battle_config flag without rebooting the server.
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index b24728a24..6598a0cc2 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -4,7 +4,7 @@
 //= (Aegis) Translated by yoshiki, converted by kobra_k88
 //= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 3.2
+//= 3.3
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -26,6 +26,7 @@
 //= 3.0 Added Quest Log commands. [Kisuka]
 //= 3.1 Removed the need for use of 'goto.' [L0ne_W0lf]
 //= 3.2 Modified the quest to renewal. [Vali] (Thanks to Muad_Dib for the necessary info).
+//= 3.3 Fixed waitingroom bug. [Euphy]
 //============================================================ 
 
 gef_tower,111,37,4	script	Wizard Guildsman	70,{
@@ -1067,11 +1068,9 @@ job_wiz,50,165,4	script	Arena Assistant	700,{
 	mes "Each person may take approximately 5 to 10 minutes.";
 	mes "If you would like to leave the arena, please log off anytime.";
 	close;
-}
 
-job_wiz,50,165,4	script	Waiting Room#wiz	700,{
 OnInit:
-	waitingroom "Waiting Room",20,"Waiting Room#wiz::OnStartArena",1;
+	waitingroom "Waiting Room",20,"Arena Assistant::OnStartArena",1;
 	enablewaitingroomevent;
 	end;
 
@@ -1079,7 +1078,6 @@ OnStartArena:
 	killmonsterall "job_wiz";
 	warpwaitingpc "job_wiz",114,169;
 	donpcevent "Room of Water::OnEnable";
-	disablenpc "Waiting Room#wiz";
 	disablewaitingroomevent;
 	end;
 
@@ -1180,7 +1178,7 @@ OnTimer185000:
 OnTimer186000:
 	disablenpc "Room of Water#Failed";
 	donpcevent "Room of Water::OnDisable";
-	donpcevent "Waiting Room#wiz::OnStart";
+	donpcevent "Arena Assistant::OnStart";
 	end;
 }
 
@@ -1246,7 +1244,7 @@ OnTimer62000:
 OnTimer63000:
 	disablenpc "Room of Water#Failed";
 	donpcevent "Room of Water#Door::OnDisable";
-	donpcevent "Waiting Room#wiz::OnStart";
+	donpcevent "Arena Assistant::OnStart";
 	end;
 }
 
@@ -1354,7 +1352,7 @@ OnTimer185000:
 OnTimer186000:
 	disablenpc "Room of Earth#Failed";
 	donpcevent "Room of Earth::OnDisable";
-	donpcevent "Waiting Room#wiz::OnStart";
+	donpcevent "Arena Assistant::OnStart";
 	end;
 }
 
@@ -1426,7 +1424,7 @@ OnTimer62000:
 OnTimer63000:
 	disablenpc "Room of Earth#Failed";
 	donpcevent "Room of Earth#Door::OnDisable";
-	donpcevent "Waiting Room#wiz::OnStart";
+	donpcevent "Arena Assistant::OnStart";
 	end;
 }
 
@@ -1532,7 +1530,7 @@ OnTimer185000:
 OnTimer186000:
 	disablenpc "Room of Fire#Failed";
 	donpcevent "Room of Fire::OnDisable";
-	donpcevent "Waiting Room#wiz::OnStart";
+	donpcevent "Arena Assistant::OnStart";
 	end;
 }
 
@@ -1610,7 +1608,7 @@ OnTimer122000:
 OnTimer123000:
 	disablenpc "Room of Fire#Failed";
 	donpcevent "Room of Fire#Door::OnDisable";
-	donpcevent "Waiting Room#wiz::OnStart";
+	donpcevent "Arena Assistant::OnStart";
 }
 
 job_wiz,46,99,0	script	Room of Fire#Failed	-1,16,16,{
@@ -1656,7 +1654,7 @@ OnTimer7000:
 
 OnTimer9000:
 	donpcevent "Test Helper#wiz::OnDisable";
-	donpcevent "Waiting Room#wiz::OnStart";
+	donpcevent "Arena Assistant::OnStart";
 	stopnpctimer;
 	end;
 }
diff --git a/src/map/script.c b/src/map/script.c
index 3e65a4f25..4099820f1 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -7414,7 +7414,7 @@ BUILDIN_FUNC(getequipname)
 	i = pc_checkequip(sd,equip[num]);
 	if( i < 0 )
 	{
-		script_pushint(st,-1);
+		script_pushconststr(st,"");
 		return 0;
 	}