aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/World
diff options
context:
space:
mode:
authorRat <gmstreetrat@gmail.com>2011-11-20 18:28:18 +0100
committerRat <gmstreetrat@gmail.com>2011-11-20 18:28:18 +0100
commitd1affc4340ecb55a8d5251aaab0de7a106bc375c (patch)
tree396fa7223920b947008a9454032d1f439b3ee3c2 /src/server/game/World
parent10b89d976fe7ce19db8bcb1f829b3789cc9785af (diff)
Initial Commit for client version change to 4.2.2 (14545)
- added known opcodes (handlers are commented till not updated) - added bitstream support to bytebuffer - updated realm auth for 14545 - updated world auth - fixed char_enum,create,delete handlers - added DB2 reader - added opcode logging to debuglogmask (ignores loglevel) - fixed compile in win64, others not yet tested - using db2 values for item models at char_enum to prevent client crash Lots of Thanks to All SingularityCore Members
Diffstat (limited to 'src/server/game/World')
-rwxr-xr-xsrc/server/game/World/World.cpp5
-rwxr-xr-xsrc/server/game/World/World.h6
2 files changed, 9 insertions, 2 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 408db187aae..e15ef02058f 100755
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -45,6 +45,7 @@
#include "GroupMgr.h"
#include "Chat.h"
#include "DBCStores.h"
+#include "DB2Stores.h"
#include "LootMgr.h"
#include "ItemEnchantmentMgr.h"
#include "MapManager.h"
@@ -1257,6 +1258,7 @@ void World::SetInitialWorldSettings()
///- Load the DBC files
sLog->outString("Initialize data stores...");
LoadDBCStores(m_dataPath);
+ LoadDB2Stores(m_dataPath);
DetectDBCLang();
sLog->outString("Loading spell dbc data corrections...");
@@ -1739,6 +1741,9 @@ void World::SetInitialWorldSettings()
else
sLog->SetLogDB(false);
+ sLog->outString("Initializing Opcodes...");
+ InitOpcodes();
+
uint32 startupDuration = GetMSTimeDiffToNow(startupBegin);
sLog->outString();
sLog->outString("WORLD: World initialized in %u minutes %u seconds", (startupDuration / 60000), ((startupDuration % 60000) / 1000) );
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index b493b8b0c7b..e08e78a50bd 100755
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -213,8 +213,10 @@ enum WorldIntConfigs
CONFIG_START_PLAYER_MONEY,
CONFIG_MAX_HONOR_POINTS,
CONFIG_START_HONOR_POINTS,
- CONFIG_MAX_ARENA_POINTS,
- CONFIG_START_ARENA_POINTS,
+ CONFIG_MAX_JUSTICE_POINTS,
+ CONFIG_START_JUSTICE_POINTS,
+ CONFIG_MAX_ARENA_POINTS,//todo: remove
+ CONFIG_START_ARENA_POINTS,//todo: remove
CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL,
CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL_DIFFERENCE,
CONFIG_INSTANCE_RESET_TIME_HOUR,