From fa608091cde4da71d99b78ce1563ee654189228a Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Fri, 23 Dec 2011 15:42:11 +0100
Subject: Prevented use of getareausers when possible

---
 world/map/npc/005-4/bossfight.txt |  2 +-
 world/map/npc/029-3/parua.txt     | 14 +++++++-------
 world/map/npc/031-4/cindyCave.txt |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/world/map/npc/005-4/bossfight.txt b/world/map/npc/005-4/bossfight.txt
index d4616363..9fc06005 100644
--- a/world/map/npc/005-4/bossfight.txt
+++ b/world/map/npc/005-4/bossfight.txt
@@ -12,7 +12,7 @@
     if ($@ELE_CAVE_STATUS != 0) goto L_Enjoy; // Prevent from starting level 1 from two different players
 
     set $@ELE_CAVE_STATUS, 1;
-    set $@ELE_CAVE_PLAYER_COUNT, getareausers("005-4.gat", 19, 19, 54, 37);
+    set $@ELE_CAVE_PLAYER_COUNT, getmapusers("005-4.gat");
 
     startnpctimer;
 
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index a8ba664b..17a69bba 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -19,7 +19,7 @@
         goto L_CallPlayers;
 
 L_Paying:
-    if (getareausers("029-3.gat", 20, 20, 70, 60) < 5)
+    if (getmapusers("029-3.gat") < 5)
         goto L_NotEnoughPlayers;
     if (Zeny < 20000)
         goto L_NotEnough;
@@ -29,12 +29,12 @@ L_Paying:
     set Zeny, Zeny - 20000;
 
 L_StartFight:
-    if (getareausers("029-3.gat", 20, 20, 70, 60) < 5)
+    if (getmapusers("029-3.gat") < 5)
         goto L_NotEnoughPlayers;
     npctalk "Let the battle begin!";
     set $@FIGHT_CAVE_STATUS, 1;
     set $@FIGHT_CAVE_LEVEL, 1;
-    set $@FIGHT_CAVE_PLAYER_COUNT, getareausers("029-3.gat", 20, 20, 70, 60);
+    set $@FIGHT_CAVE_PLAYER_COUNT, getmapusers("029-3.gat");
     startnpctimer;
     goto L_Exit;
 
@@ -58,7 +58,7 @@ L_CallPlayers:
 // Do not charge the money if the fight or the announces were already started by someone else
     if ($@FIGHT_CAVE_STATUS != 0)
         close;
-    if (getareausers("029-3.gat", 20, 20, 70, 60) < 5)
+    if (getmapusers("029-3.gat") < 5)
         goto L_NotEnoughPlayers;
     if (Zeny < 20000 + 3000)
         goto L_NotEnough_Announce;
@@ -206,19 +206,19 @@ L_GlobalAnnounce:
 L_Five_Minutes:
     if ($@ANNOUNCE_TIME - gettimetick(2) > 300)
         end;
-    announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getareausers("029-3.gat", 20, 20, 70, 60) + " fighter(s) in the cave.", 0;
+    announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. It is almost time! The fight will start in 5 minutes and, at the moment, there are only " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0;
     set $@FIGHT_CAVE_STATUS, 2;
     end;
 
 L_Fifteen_Minutes:
     if ($@ANNOUNCE_TIME - gettimetick(2) > 900)
         end;
-    announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 15 minutes. Right now, there are " + getareausers("029-3.gat", 20, 20, 70, 60) + " fighter(s) in the cave.", 0;
+    announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. You still have time to prepare yourself for this fight, since it will only start in 15 minutes. Right now, there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0;
     set $@FIGHT_CAVE_STATUS, 3;
     end;
 
 L_Thirty_Minutes:
-    announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in 30 minutes, so prepare yourself and call your friends. At the moment there are " + getareausers("029-3.gat", 20, 20, 70, 60) + " fighter(s) in the cave.", 0;
+    announce "Parua: " + $@SPONSOR$ + " invites everyone to a challenge against the powers that sleep in Candor. The fight will start in 30 minutes, so prepare yourself and call your friends. At the moment there are " + getmapusers("029-3.gat") + " fighter(s) in the cave.", 0;
     set $@FIGHT_CAVE_STATUS, 4;
     end;
 
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 0c964708..6e6e143b 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -63,7 +63,7 @@ L_Try_Cage:
     set $@FIGHT_YETI_STATUS, 1;
     set $@FIGHT_YETI_WAVE, 0;
     set $@YETI_COUNT, 1;
-    set $@FIGHT_YETI_PLAYER_COUNT, getareausers("031-4.gat", 0, 0, 95, 91);
+    set $@FIGHT_YETI_PLAYER_COUNT, getmapusers("031-4.gat");
     // this yeti is spawned because of some timing problems
     // without it, the first and second wave start nearly the same time
     areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, 1, "Cindy::onPetDeath";
-- 
cgit v1.2.3-60-g2f50