summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/extras/worldserver.conf6
-rw-r--r--modules/dep/PackageList.txt2
-rw-r--r--modules/dep/mysqllite/CMakeLists.txt2
-rw-r--r--revision.h.in.cmake4
-rw-r--r--src/cmake/macros/FindACE.cmake2
-rw-r--r--src/cmake/showoptions.cmake4
-rw-r--r--src/server/authserver/Authentication/AuthCodes.cpp2
-rw-r--r--src/server/authserver/authserver.rc1
-rw-r--r--src/server/collision/DynamicTree.h3
-rw-r--r--src/server/game/ArenaSpectator/ArenaSpectator.h4
-rw-r--r--src/server/game/Battlegrounds/ArenaTeam.h4
-rw-r--r--src/server/game/Chat/Chat.h4
-rw-r--r--src/server/game/Chat/ChatLink.h4
-rw-r--r--src/server/game/Entities/Corpse/Corpse.h4
-rw-r--r--src/server/game/Entities/Creature/Creature.h4
-rw-r--r--src/server/game/Entities/Creature/GossipDef.h4
-rw-r--r--src/server/game/Entities/Creature/TemporarySummon.h4
-rw-r--r--src/server/game/Entities/DynamicObject/DynamicObject.h4
-rw-r--r--src/server/game/Entities/GameObject/GameObject.h4
-rw-r--r--src/server/game/Entities/Item/Item.h4
-rw-r--r--src/server/game/Entities/Pet/Pet.h4
-rw-r--r--src/server/game/Entities/Pet/PetDefines.h4
-rw-r--r--src/server/game/Entities/Totem/Totem.h4
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp2
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp2
-rw-r--r--src/server/game/Globals/ObjectMgr.h2
-rw-r--r--src/server/game/Groups/Group.h4
-rw-r--r--src/server/game/Guilds/Guild.h4
-rw-r--r--src/server/game/Quests/QuestDef.h4
-rw-r--r--src/server/game/Spells/Auras/SpellAuraEffects.cpp2
-rw-r--r--src/server/scripts/Commands/cs_server.cpp2
-rw-r--r--src/server/shared/Common.h4
-rw-r--r--src/server/shared/Database/DatabaseWorkerPool.h4
-rw-r--r--src/server/shared/Debugging/Errors.h4
-rw-r--r--src/server/shared/Logging/Log.h4
-rw-r--r--src/server/shared/Packets/WorldPacket.h4
-rw-r--r--src/server/shared/SystemConfig.h2
-rw-r--r--src/server/worldserver/Main.cpp4
-rw-r--r--src/server/worldserver/worldserver.conf.dist4
39 files changed, 66 insertions, 68 deletions
diff --git a/data/extras/worldserver.conf b/data/extras/worldserver.conf
index f804986262..a7de42e1fb 100644
--- a/data/extras/worldserver.conf
+++ b/data/extras/worldserver.conf
@@ -57,7 +57,7 @@ RealmID = 1
# DataDir
# Description: Data directory setting.
# Important: DataDir needs to be quoted, as the string might contain space characters.
-# Example: "@prefix@/share/sunwellcore"
+# Example: "/home/youruser/azeroth-server/data"
# Default: "."
DataDir = "./"
@@ -1353,9 +1353,9 @@ BeepAtStart = 1
# Motd
# Description: Message of the Day, displayed at login.
# Use '@' for a newline and be sure to escape special characters.
-# Example: "Welcome to John\'s Server@This server runs on SunwellCore."
+# Example: "Welcome to John\'s Server@This server runs on AzerothCore."
-Motd = "Welcome to X Server.@This server runs on SunwellCore."
+Motd = "Welcome to X Server.@This server runs on AzerothCore."
#
# Server.LoginInfo
diff --git a/modules/dep/PackageList.txt b/modules/dep/PackageList.txt
index dcf07e7ab4..41edd5348f 100644
--- a/modules/dep/PackageList.txt
+++ b/modules/dep/PackageList.txt
@@ -1,4 +1,4 @@
-SunwellCore uses (parts of or in whole) the following opensource software :
+AzerothCore uses (parts of or in whole) the following opensource software :
ACE (ADAPTIVE Communication Environment)
http://www.cs.wustl.edu/~schmidt/ACE.html
diff --git a/modules/dep/mysqllite/CMakeLists.txt b/modules/dep/mysqllite/CMakeLists.txt
index 19a1f0519c..919648e7dc 100644
--- a/modules/dep/mysqllite/CMakeLists.txt
+++ b/modules/dep/mysqllite/CMakeLists.txt
@@ -42,7 +42,7 @@ set(MYSQL_DATADIR "${DEFAULT_MYSQL_HOME}/data")
set(DEFAULT_CHARSET_HOME "${DEFAULT_MYSQL_HOME}")
set(PLUGINDIR "${DEFAULT_MYSQL_HOME}/lib/plugin")
-set(COMPILATION_COMMENT "Source distribution lite for SunwellCore")
+set(COMPILATION_COMMENT "Source distribution lite for AzerothCore")
# Run platform tests
include(${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake)
diff --git a/revision.h.in.cmake b/revision.h.in.cmake
index 528cfd1647..7e47858115 100644
--- a/revision.h.in.cmake
+++ b/revision.h.in.cmake
@@ -3,8 +3,8 @@
#define _REVISION "@rev_id_str@"
#define _HASH "@rev_hash@"
#define _DATE "@rev_date@"
- #define VER_COMPANYNAME_STR "SunwellCore"
- #define VER_LEGALCOPYRIGHT_STR "SunwellCore"
+ #define VER_COMPANYNAME_STR "AzerothCore"
+ #define VER_LEGALCOPYRIGHT_STR "AzerothCore"
#define VER_FILEVERSION 0,0,0
#define VER_FILEVERSION_STR "@rev_date@ (@rev_hash@)"
#define VER_PRODUCTVERSION VER_FILEVERSION
diff --git a/src/cmake/macros/FindACE.cmake b/src/cmake/macros/FindACE.cmake
index 340c7899e1..10d762f301 100644
--- a/src/cmake/macros/FindACE.cmake
+++ b/src/cmake/macros/FindACE.cmake
@@ -70,7 +70,7 @@ if ( UNIX )
include(EnsureVersion)
ENSURE_VERSION( "${ACE_EXPECTED_VERSION}" "${ACE_VERSION}" ACE_FOUND)
if (NOT ACE_FOUND)
- message(FATAL_ERROR "SunwellCore needs ACE version ${ACE_EXPECTED_VERSION} but found version ${ACE_VERSION}")
+ message(FATAL_ERROR "AzerothCore needs ACE version ${ACE_EXPECTED_VERSION} but found version ${ACE_VERSION}")
endif()
message( STATUS "Found ACE library: ${ACE_LIBRARY}")
diff --git a/src/cmake/showoptions.cmake b/src/cmake/showoptions.cmake
index ccddd0e1da..f1cbc263c5 100644
--- a/src/cmake/showoptions.cmake
+++ b/src/cmake/showoptions.cmake
@@ -1,8 +1,8 @@
# output generic information about the core and buildtype chosen
message("")
-message("* SunwellCore revision : ${rev_hash} ${rev_date} (${rev_branch} branch)")
+message("* AzerothCore revision : ${rev_hash} ${rev_date} (${rev_branch} branch)")
if( UNIX )
- message("* SunwellCore buildtype : ${CMAKE_BUILD_TYPE}")
+ message("* AzerothCore buildtype : ${CMAKE_BUILD_TYPE}")
endif()
message("")
diff --git a/src/server/authserver/Authentication/AuthCodes.cpp b/src/server/authserver/Authentication/AuthCodes.cpp
index ff77bdc79c..560e8352bd 100644
--- a/src/server/authserver/Authentication/AuthCodes.cpp
+++ b/src/server/authserver/Authentication/AuthCodes.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C)
+ * Copyright (C) MaNGOS, TrinityCore, SunwellCore and AzerothCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/authserver/authserver.rc b/src/server/authserver/authserver.rc
index 497bf5f96c..f0108fc805 100644
--- a/src/server/authserver/authserver.rc
+++ b/src/server/authserver/authserver.rc
@@ -1,6 +1,5 @@
/*
* Copyright (C)
- * Copyright (C)
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/collision/DynamicTree.h b/src/server/collision/DynamicTree.h
index 4a4351f213..111208383f 100644
--- a/src/server/collision/DynamicTree.h
+++ b/src/server/collision/DynamicTree.h
@@ -1,6 +1,5 @@
/*
- * Copyright (C)
- * Copyright (C)
+ * Copyright (C) MaNGOS, TrinityCore, SunwellCore and AzerothCore
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
diff --git a/src/server/game/ArenaSpectator/ArenaSpectator.h b/src/server/game/ArenaSpectator/ArenaSpectator.h
index 994b1d2e2c..d9c9dc6b47 100644
--- a/src/server/game/ArenaSpectator/ArenaSpectator.h
+++ b/src/server/game/ArenaSpectator/ArenaSpectator.h
@@ -1,6 +1,6 @@
-#ifndef SUNWELLCORE_ARENASPECTATOR_H
-#define SUNWELLCORE_ARENASPECTATOR_H
+#ifndef AZEROTHCORE_ARENASPECTATOR_H
+#define AZEROTHCORE_ARENASPECTATOR_H
#include "Player.h"
#include "World.h"
diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h
index dc9594d21c..8f98adc1e1 100644
--- a/src/server/game/Battlegrounds/ArenaTeam.h
+++ b/src/server/game/Battlegrounds/ArenaTeam.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_ARENATEAM_H
-#define SUNWELLCORE_ARENATEAM_H
+#ifndef AZEROTHCORE_ARENATEAM_H
+#define AZEROTHCORE_ARENATEAM_H
#include "QueryResult.h"
#include "Map.h"
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 24e7b87ea7..962744fdc6 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_CHAT_H
-#define SUNWELLCORE_CHAT_H
+#ifndef AZEROTHCORE_CHAT_H
+#define AZEROTHCORE_CHAT_H
#include "SharedDefines.h"
#include "WorldSession.h"
diff --git a/src/server/game/Chat/ChatLink.h b/src/server/game/Chat/ChatLink.h
index 0665b10995..20225ae6cf 100644
--- a/src/server/game/Chat/ChatLink.h
+++ b/src/server/game/Chat/ChatLink.h
@@ -15,8 +15,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_CHATLINK_H
-#define SUNWELLCORE_CHATLINK_H
+#ifndef AZEROTHCORE_CHATLINK_H
+#define AZEROTHCORE_CHATLINK_H
#include "SharedDefines.h"
#include <sstream>
diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h
index f0885a1803..3c33cd7b26 100644
--- a/src/server/game/Entities/Corpse/Corpse.h
+++ b/src/server/game/Entities/Corpse/Corpse.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_CORPSE_H
-#define SUNWELLCORE_CORPSE_H
+#ifndef AZEROTHCORE_CORPSE_H
+#define AZEROTHCORE_CORPSE_H
#include "Object.h"
#include "DatabaseEnv.h"
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index b44fece4f7..d456558be2 100644
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_CREATURE_H
-#define SUNWELLCORE_CREATURE_H
+#ifndef AZEROTHCORE_CREATURE_H
+#define AZEROTHCORE_CREATURE_H
#include "Common.h"
#include "Unit.h"
diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h
index e1c1d14a2c..1de91fc361 100644
--- a/src/server/game/Entities/Creature/GossipDef.h
+++ b/src/server/game/Entities/Creature/GossipDef.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_GOSSIP_H
-#define SUNWELLCORE_GOSSIP_H
+#ifndef AZEROTHCORE_GOSSIP_H
+#define AZEROTHCORE_GOSSIP_H
#include "Common.h"
#include "QuestDef.h"
diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h
index e5dab557d1..376eede7b6 100644
--- a/src/server/game/Entities/Creature/TemporarySummon.h
+++ b/src/server/game/Entities/Creature/TemporarySummon.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_TEMPSUMMON_H
-#define SUNWELLCORE_TEMPSUMMON_H
+#ifndef AZEROTHCORE_TEMPSUMMON_H
+#define AZEROTHCORE_TEMPSUMMON_H
#include "Creature.h"
diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h
index 4a8e4ca276..f35a4d57dd 100644
--- a/src/server/game/Entities/DynamicObject/DynamicObject.h
+++ b/src/server/game/Entities/DynamicObject/DynamicObject.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_DYNAMICOBJECT_H
-#define SUNWELLCORE_DYNAMICOBJECT_H
+#ifndef AZEROTHCORE_DYNAMICOBJECT_H
+#define AZEROTHCORE_DYNAMICOBJECT_H
#include "Object.h"
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
index e8f7d48b8e..2c74333797 100644
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_GAMEOBJECT_H
-#define SUNWELLCORE_GAMEOBJECT_H
+#ifndef AZEROTHCORE_GAMEOBJECT_H
+#define AZEROTHCORE_GAMEOBJECT_H
#include "Common.h"
#include "SharedDefines.h"
diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h
index b5be3cceed..7e602575bc 100644
--- a/src/server/game/Entities/Item/Item.h
+++ b/src/server/game/Entities/Item/Item.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_ITEM_H
-#define SUNWELLCORE_ITEM_H
+#ifndef AZEROTHCORE_ITEM_H
+#define AZEROTHCORE_ITEM_H
#include "Common.h"
#include "Object.h"
diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h
index c9db736fc9..6315946922 100644
--- a/src/server/game/Entities/Pet/Pet.h
+++ b/src/server/game/Entities/Pet/Pet.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_PET_H
-#define SUNWELLCORE_PET_H
+#ifndef AZEROTHCORE_PET_H
+#define AZEROTHCORE_PET_H
#include "PetDefines.h"
#include "TemporarySummon.h"
diff --git a/src/server/game/Entities/Pet/PetDefines.h b/src/server/game/Entities/Pet/PetDefines.h
index fd25f181c8..fa562a774c 100644
--- a/src/server/game/Entities/Pet/PetDefines.h
+++ b/src/server/game/Entities/Pet/PetDefines.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_PET_DEFINES_H
-#define SUNWELLCORE_PET_DEFINES_H
+#ifndef AZEROTHCORE_PET_DEFINES_H
+#define AZEROTHCORE_PET_DEFINES_H
enum PetType
{
diff --git a/src/server/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h
index f8f10ea6b0..d49edb2436 100644
--- a/src/server/game/Entities/Totem/Totem.h
+++ b/src/server/game/Entities/Totem/Totem.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_TOTEM_H
-#define SUNWELLCORE_TOTEM_H
+#ifndef AZEROTHCORE_TOTEM_H
+#define AZEROTHCORE_TOTEM_H
#include "TemporarySummon.h"
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index fb7b070b45..73eae5329b 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -9306,7 +9306,7 @@ bool Unit::Attack(Unit* victim, bool meleeAttack)
if (GetTypeId() == TYPEID_PLAYER && IsMounted())
return false;
- //if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED)) // pussywizard: wtf? why having this flag prevents from entering combat? it should just prevent melee attack >_> tc retards https://github.com/SunwellCore/SunwellCore/commit/06f50110713feec2d6957e68ce2c5a5d2a997d6a
+ //if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED)) // pussywizard: wtf? why having this flag prevents from entering combat? it should just prevent melee attack
// return false;
// nobody can attack GM in GM-mode
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index e0a5e0944d..9dfaf98729 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -106,7 +106,7 @@ std::string GetScriptCommandName(ScriptCommands command)
case SCRIPT_COMMAND_LOAD_PATH: res = "SCRIPT_COMMAND_LOAD_PATH"; break;
case SCRIPT_COMMAND_CALLSCRIPT_TO_UNIT: res = "SCRIPT_COMMAND_CALLSCRIPT_TO_UNIT"; break;
case SCRIPT_COMMAND_KILL: res = "SCRIPT_COMMAND_KILL"; break;
- // SunwellCore only
+ // AzerothCore only
case SCRIPT_COMMAND_ORIENTATION: res = "SCRIPT_COMMAND_ORIENTATION"; break;
case SCRIPT_COMMAND_EQUIP: res = "SCRIPT_COMMAND_EQUIP"; break;
case SCRIPT_COMMAND_MODEL: res = "SCRIPT_COMMAND_MODEL"; break;
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index c95d24ce8d..0805a21d76 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -117,7 +117,7 @@ enum ScriptCommands
SCRIPT_COMMAND_CALLSCRIPT_TO_UNIT = 21, // source = WorldObject (if present used as a search center), datalong = script id, datalong2 = unit lowguid, dataint = script table to use (see ScriptsType)
SCRIPT_COMMAND_KILL = 22, // source/target = Creature, dataint = remove corpse attribute
- // SunwellCore only
+ // AzerothCore only
SCRIPT_COMMAND_ORIENTATION = 30, // source = Unit, target (datalong > 0) = Unit, datalong = > 0 turn source to face target, o = orientation
SCRIPT_COMMAND_EQUIP = 31, // soucre = Creature, datalong = equipment id
SCRIPT_COMMAND_MODEL = 32, // source = Creature, datalong = model id
diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h
index 12934ef77f..876c8c5762 100644
--- a/src/server/game/Groups/Group.h
+++ b/src/server/game/Groups/Group.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_GROUP_H
-#define SUNWELLCORE_GROUP_H
+#ifndef AZEROTHCORE_GROUP_H
+#define AZEROTHCORE_GROUP_H
#include "DBCEnums.h"
#include "GroupRefManager.h"
diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h
index 5fda1d63e0..d25f00df10 100644
--- a/src/server/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_GUILD_H
-#define SUNWELLCORE_GUILD_H
+#ifndef AZEROTHCORE_GUILD_H
+#define AZEROTHCORE_GUILD_H
#include "World.h"
#include "Item.h"
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index 5e1396e779..6d0db549b9 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_QUEST_H
-#define SUNWELLCORE_QUEST_H
+#ifndef AZEROTHCORE_QUEST_H
+#define AZEROTHCORE_QUEST_H
#include "Define.h"
#include "DatabaseEnv.h"
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index af65286d51..f82e26ac6c 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -2568,7 +2568,7 @@ void AuraEffect::HandleAuraModPacify(AuraApplication const* aurApp, uint8 mode,
if (apply)
{
target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
- //target->AttackStop(); // pussywizard: wtf? why having this flag prevents from being in combat? it should just prevent melee attack >_> tc retards https://github.com/SunwellCore/SunwellCore/commit/06f50110713feec2d6957e68ce2c5a5d2a997d6a
+ //target->AttackStop(); // pussywizard: wtf? why having this flag prevents from being in combat? it should just prevent melee attack
}
else
{
diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
index cdcbd9a0e2..545f17750a 100644
--- a/src/server/scripts/Commands/cs_server.cpp
+++ b/src/server/scripts/Commands/cs_server.cpp
@@ -118,7 +118,7 @@ public:
uint32 avgUpdateTime = avgDiffTracker.getAverage();
handler->PSendSysMessage("%s Realm, revision: %s.", realmName.c_str(), _REVISION);
- handler->PSendSysMessage("This server runs on SunwellCore.");
+ handler->PSendSysMessage("This server runs on AzerothCore.");
if (!queuedSessionCount)
handler->PSendSysMessage("Connected players: %u. Characters in world: %u.", activeSessionCount, playerCount);
else
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index 769c392925..c3620f2073 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_COMMON_H
-#define SUNWELLCORE_COMMON_H
+#ifndef AZEROTHCORE_COMMON_H
+#define AZEROTHCORE_COMMON_H
// config.h needs to be included 1st
/// @todo this thingy looks like hack, but its not, need to
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index c5326938fb..c844c523cc 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -57,7 +57,7 @@ class DatabaseWorkerPool
_connections.resize(IDX_SIZE);
WPFatal(mysql_thread_safe(), "Used MySQL library isn't thread-safe.");
- WPFatal(mysql_get_client_version() >= MIN_MYSQL_CLIENT_VERSION, "SunwellCore does not support MySQL versions below 5.1");
+ WPFatal(mysql_get_client_version() >= MIN_MYSQL_CLIENT_VERSION, "AzerothCore does not support MySQL versions below 5.1");
}
~DatabaseWorkerPool()
@@ -79,7 +79,7 @@ class DatabaseWorkerPool
T* t = new T(_queue, _connectionInfo);
res &= t->Open();
if (res) // only check mysql version if connection is valid
- WPFatal(mysql_get_server_version(t->GetHandle()) >= MIN_MYSQL_SERVER_VERSION, "SunwellCore does not support MySQL versions below 5.1");
+ WPFatal(mysql_get_server_version(t->GetHandle()) >= MIN_MYSQL_SERVER_VERSION, "AzerothCore does not support MySQL versions below 5.1");
_connections[IDX_ASYNC][i] = t;
++_connectionCount[IDX_ASYNC];
}
diff --git a/src/server/shared/Debugging/Errors.h b/src/server/shared/Debugging/Errors.h
index f17084fc7d..4192f22a3b 100644
--- a/src/server/shared/Debugging/Errors.h
+++ b/src/server/shared/Debugging/Errors.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_ERRORS_H
-#define SUNWELLCORE_ERRORS_H
+#ifndef AZEROTHCORE_ERRORS_H
+#define AZEROTHCORE_ERRORS_H
#include "Define.h"
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index edf33c4c9b..c7f857272f 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_LOG_H
-#define SUNWELLCORE_LOG_H
+#ifndef AZEROTHCORE_LOG_H
+#define AZEROTHCORE_LOG_H
#include "Common.h"
#include <ace/Singleton.h>
diff --git a/src/server/shared/Packets/WorldPacket.h b/src/server/shared/Packets/WorldPacket.h
index 1a4458f99c..74ac0c0c80 100644
--- a/src/server/shared/Packets/WorldPacket.h
+++ b/src/server/shared/Packets/WorldPacket.h
@@ -16,8 +16,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SUNWELLCORE_WORLDPACKET_H
-#define SUNWELLCORE_WORLDPACKET_H
+#ifndef AZEROTHCORE_WORLDPACKET_H
+#define AZEROTHCORE_WORLDPACKET_H
#include "Common.h"
#include "ByteBuffer.h"
diff --git a/src/server/shared/SystemConfig.h b/src/server/shared/SystemConfig.h
index 9605f76250..ebf0ef67f4 100644
--- a/src/server/shared/SystemConfig.h
+++ b/src/server/shared/SystemConfig.h
@@ -24,7 +24,7 @@
#include "Define.h"
#include "revision.h"
-#define _PACKAGENAME "SunwellCore"
+#define _PACKAGENAME "AzerothCore"
#if TRINITY_ENDIAN == TRINITY_BIGENDIAN
# define _ENDIAN_STRING "big-endian"
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 0a00f1d1b7..aeb6547819 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -38,8 +38,8 @@
#ifdef _WIN32
#include "ServiceWin32.h"
char serviceName[] = "worldserver";
-char serviceLongName[] = "SunwellCore world service";
-char serviceDescription[] = "SunwellCore World of Warcraft emulator world service";
+char serviceLongName[] = "AzerothCore world service";
+char serviceDescription[] = "AzerothCore World of Warcraft emulator world service";
/*
* -1 - not in service mode
* 0 - stopped
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 048ffb8fa1..31fb37e757 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -58,7 +58,7 @@ RealmID = 1
# DataDir
# Description: Data directory setting.
# Important: DataDir needs to be quoted, as the string might contain space characters.
-# Example: "@prefix@/share/sunwellcore"
+# Example: "/home/youruser/azeroth-server/data"
# Default: "."
DataDir = "."
@@ -1436,7 +1436,7 @@ AccountInstancesPerHour = 5
#
# BirthdayTime
-# Description: Set to date of project's birth in UNIX time. By default the date when SunwellCore was started (Thu Oct 2, 2008)
+# Description: Set to date of project's birth in UNIX time. By default Thu Oct 2, 2008
# Default: 1222964635
#
#