Merge remote-tracking branch 'testing/master'v2011.09.08

2 files changed, 3 insertions, 3 deletions

diff --git a/world/map/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt
index 7d8e96ab..365c690f 100644
--- a/world/map/npc/items/restricted_item.txt
+++ b/world/map/npc/items/restricted_item.txt
@@ -8,10 +8,10 @@
 
 function	script	RestrictedItem	{
 	if (!@minLvl) set @minLvl, 60;
-	if (debug || getgmlevel(0) >= @minLvl) return; // If the active character is staff, do nothing.
+	if (debug || getgmlevel() >= @minLvl) return; // If the active character is staff, do nothing.
 	message strcharinfo(0), "This item repells you with extreme force. It does not seem to be meant for you.";
 	unequipbyid @slotId;
-	if (getgmlevel(0)) return;
+	if (getgmlevel()) return;
 	gmcommand "@wgm Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
 	gmcommand "@l Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
 	end;
diff --git a/world/map/npc/items/unreleased_item.txt b/world/map/npc/items/unreleased_item.txt
index 72d24b70..cac699f9 100644
--- a/world/map/npc/items/unreleased_item.txt
+++ b/world/map/npc/items/unreleased_item.txt
@@ -4,7 +4,7 @@
 // ------------------------------------------------------------
 
 function	script	UnreleasedItem	{
-	if (debug || getgmlevel(0)) end; // If the server allows equipping unreleased items or if the active character is staff, do nothing.
+	if (debug || getgmlevel()) end; // If the server allows equipping unreleased items or if the active character is staff, do nothing.
 	message strcharinfo(0), "You have difficulties equipping this item, as if it is not yet fully in this world.";
 	unequipbyid @slotId;
 	end;