Merge pull request arcemu#242 from Ceterrec/CheckTriggerPrerequsites_fix

FIXED: "CheckTriggerPrerequsites" is now correctly spelled "CheckTriggerPrerequisites".
neo-mat · Aug 20, 2012 · 06a2989 · 06a2989
2 parents 914e8b2 + 5394163
commit 06a2989
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/configs/de/world.conf b/configs/de/world.conf
@@ -9,7 +9,7 @@
 
 /************************************************************************************************************
 * ArcEmu-World-Konfigurationsdatei
-* Deutsche �bersetzung: 07.08.2012
+* Deutsche �bersetzung: 12.08.2012
 *
 * Konfiguriere ArcEmus Worldserver weiter unten.
 ************************************************************************************************************/
@@ -782,16 +782,16 @@
 *
 *      Standard: 5 (5 Uhr morgens)
 *
-*    CheckTriggerPrerequsites
-*      Betreten und Pr�fungen. (P.S.: "prerequsites" wird eigentlich "prerequisites" geschrieben.)
+*    CheckTriggerPrerequisites
+*      Betreten und Pr�fungen.
 *
 *      Standard: 1 (aktiviert)
 */
 
 <InstanceHandling TakeGroupLeaderID = "1" 
                   SlidingExpiration = "0" 
                   DailyHeroicInstanceResetHour = "5" 
-                  CheckTriggerPrerequsites = "1">
+                  CheckTriggerPrerequisites = "1">
 
 /* Schlachtfeld-Einstellungen
 *

diff --git a/configs/world.conf b/configs/world.conf
@@ -1,6 +1,6 @@
 /***********************************************************************
 * ArcEmu World Configuration File
-* Last edited: 8/7/2012
+* Last edited: 8/12/2012
 *
 * Configure ArcEmu's world server below.
 ***********************************************************************
@@ -682,15 +682,15 @@
 *        Sets the hour of day when heroic instances will be reset on disabled SlidingExpiration.
 *        Default: 5
 *
-*    CheckTriggerPrerequsites
+*    CheckTriggerPrerequisites
 *        Entering & checks
 *        Default: 1
 ******************************************************/
 
 <InstanceHandling TakeGroupLeaderID="1" 
                   SlidingExpiration="0" 
                   DailyHeroicInstanceResetHour="5" 
-                  CheckTriggerPrerequsites="1" >
+                  CheckTriggerPrerequisites="1" >
 
 /******************************************************
 * BattleGround settings

diff --git a/src/arcemu-world/AreaTrigger.cpp b/src/arcemu-world/AreaTrigger.cpp
@@ -1,7 +1,7 @@
 /*
  * ArcEmu MMORPG Server
  * Copyright (C) 2005-2007 Ascent Team <http://www.ascentemu.com/>
- * Copyright (C) 2008-2011 <http://www.ArcEmu.org/>
+ * Copyright (C) 2008-2012 <http://www.ArcEmu.org/>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -63,7 +63,7 @@ uint32 AreaTriggerFailureMessages[] =
 	31, // 33="You must be level 70 to enter Heroic mode." 31="You must be at least level %u to pass through here."
 };
 
-uint32 CheckTriggerPrerequsites(AreaTrigger* pAreaTrigger, WorldSession* pSession, Player* pPlayer, MapInfo* pMapInfo)
+uint32 CheckTriggerPrerequisites(AreaTrigger* pAreaTrigger, WorldSession* pSession, Player* pPlayer, MapInfo* pMapInfo)
 {
 	if(!pMapInfo || !pMapInfo->HasFlag(WMI_INSTANCE_ENABLED))
 		return AREA_TRIGGER_FAILURE_UNAVAILABLE;
@@ -158,9 +158,9 @@ void WorldSession::_HandleAreaTriggerOpcode(uint32 id)
 				//only ports if player is out of pendings
 				if(GetPlayer()->GetPlayerStatus() == TRANSFER_PENDING)
 					break;
-				if(sWorld.instance_CheckTriggerPrerequsites)
+				if(sWorld.instance_CheckTriggerPrerequisites)
 				{
-					uint32 reason = CheckTriggerPrerequsites(pAreaTrigger, this, _player, WorldMapInfoStorage.LookupEntry(pAreaTrigger->Mapid));
+					uint32 reason = CheckTriggerPrerequisites(pAreaTrigger, this, _player, WorldMapInfoStorage.LookupEntry(pAreaTrigger->Mapid));
 					if(reason != AREA_TRIGGER_FAILURE_OK)
 					{
 						const char* pReason = GetPlayer()->GetSession()->LocalizedWorldSrv(AreaTriggerFailureMessages[reason]);

diff --git a/src/arcemu-world/World.cpp b/src/arcemu-world/World.cpp
@@ -1,7 +1,7 @@
 /*
  * ArcEmu MMORPG Server
  * Copyright (C) 2005-2007 Ascent Team <http://www.ascentemu.com/>
- * Copyright (C) 2008-2011 <http://www.ArcEmu.org/>
+ * Copyright (C) 2008-2012 <http://www.ArcEmu.org/>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -1439,7 +1439,7 @@ void World::Rehash(bool load)
 	instance_SlidingExpiration = Config.MainConfig.GetBoolDefault("InstanceHandling", "SlidingExpiration", false);
 	instance_DailyHeroicInstanceResetHour = Config.MainConfig.GetIntDefault("InstanceHandling", "DailyHeroicInstanceResetHour", 5);
 	// cebernic: wanna no attunement xD?
-	instance_CheckTriggerPrerequsites = Config.MainConfig.GetBoolDefault("InstanceHandling", "CheckTriggerPrerequsites", true);
+	instance_CheckTriggerPrerequisites = Config.MainConfig.GetBoolDefault("InstanceHandling", "CheckTriggerPrerequisites", true);
 
 	bgsettings.AV_MIN = Config.MainConfig.GetIntDefault("Battleground", "AV_MIN", 10);
 	bgsettings.AV_MAX = Config.MainConfig.GetIntDefault("Battleground", "AV_MAX", 40);

diff --git a/src/arcemu-world/World.h b/src/arcemu-world/World.h
@@ -1,7 +1,7 @@
 /*
  * ArcEmu MMORPG Server
  * Copyright (C) 2005-2007 Ascent Team <http://www.ascentemu.com/>
- * Copyright (C) 2008-2011 <http://www.ArcEmu.org/>
+ * Copyright (C) 2008-2012 <http://www.ArcEmu.org/>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -620,7 +620,7 @@ class SERVER_DECL World : public Singleton<World>, public EventableObject
 		bool instance_TakeGroupLeaderID;
 		bool instance_SlidingExpiration;
 		int instance_DailyHeroicInstanceResetHour;
-		bool instance_CheckTriggerPrerequsites;
+		bool instance_CheckTriggerPrerequisites;
 
 		// battleground settings
 		struct BGSettings{