Skip to content

Commit dd3f7cc

Browse files
committed
Move world networking code to subfolder
1 parent 4aa72b4 commit dd3f7cc

21 files changed

Lines changed: 25 additions & 33 deletions

src/game/CMakeLists.txt

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ set (game_SRCS
4646
UnitAuraProcHandler.cpp
4747
Weather.cpp
4848
World.cpp
49-
WorldSession.cpp
5049
AI/BasicAI.cpp
5150
AI/CreatureAI.cpp
5251
AI/CreatureAIRegistry.cpp
@@ -196,11 +195,10 @@ set (game_SRCS
196195
PlayerBots/BattleBotWaypoints.cpp
197196
PlayerBots/PlayerBotAI.cpp
198197
PlayerBots/PlayerBotMgr.cpp
199-
Protocol/Opcodes.cpp
200-
Protocol/WorldSocket.h
201-
Protocol/WorldSocket.cpp
202-
Protocol/WorldSocketMgr.h
203-
Protocol/WorldSocketMgr.cpp
198+
Server/Protocol/Opcodes.cpp
199+
Server/WorldSession.cpp
200+
Server/WorldSocket.cpp
201+
Server/WorldSocketMgr.cpp
204202
Spells/Spell.cpp
205203
Spells/SpellAuras.cpp
206204
Spells/SpellEffects.cpp
@@ -259,7 +257,6 @@ set (game_SRCS
259257
UnitEvents.h
260258
Weather.h
261259
World.h
262-
WorldSession.h
263260
WorldStates.h
264261
AI/BasicAI.h
265262
AI/CreatureAI.h
@@ -421,7 +418,11 @@ set (game_SRCS
421418
PlayerBots/BattleBotWaypoints.h
422419
PlayerBots/PlayerBotAI.h
423420
PlayerBots/PlayerBotMgr.h
424-
Protocol/Opcodes.h
421+
Server/Protocol/Opcodes.h
422+
Server/WorldPacket.h
423+
Server/WorldSession.h
424+
Server/WorldSocket.h
425+
Server/WorldSocketMgr.h
425426
Spells/Spell.h
426427
Spells/SpellAuraDefines.h
427428
Spells/SpellAuras.h
@@ -504,7 +505,8 @@ include_directories(
504505
${CMAKE_CURRENT_SOURCE_DIR}/OutdoorPvP
505506
${CMAKE_CURRENT_SOURCE_DIR}/PacketBroadcast
506507
${CMAKE_CURRENT_SOURCE_DIR}/PlayerBots
507-
${CMAKE_CURRENT_SOURCE_DIR}/Protocol
508+
${CMAKE_CURRENT_SOURCE_DIR}/Server
509+
${CMAKE_CURRENT_SOURCE_DIR}/Server/Protocol
508510
${CMAKE_CURRENT_SOURCE_DIR}/Spells
509511
${CMAKE_CURRENT_SOURCE_DIR}/Threat
510512
${CMAKE_CURRENT_SOURCE_DIR}/Transports
@@ -601,15 +603,14 @@ if((${CMAKE_VERSION} VERSION_LESS "3.16") OR USE_PCH_OLD)
601603
else()
602604
if(USE_PCH)
603605
target_precompile_headers(game PRIVATE
604-
Protocol/WorldSocket.h
606+
Server/WorldSocket.h
605607
../shared/Common.h
606-
607608
Maps/MapManager.h
608609
../shared/Log.h
609610
ObjectAccessor.h
610611
ObjectGuid.h
611612
Database/SQLStorages.h
612-
Protocol/Opcodes.h
613+
Server/Protocol/Opcodes.h
613614
SharedDefines.h
614615
Guild/GuildMgr.h
615616
ObjectMgr.h
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// if this class definition not complite then VS for x64 release use different size for
3333
// struct OpcodeHandler in this header and Opcode.cpp and get totally wrong data from
3434
// table opcodeTable in source when Opcode.h included but WorldSession.h not included
35-
#include "WorldSession.h"
35+
#include "../WorldSession.h"
3636

3737
// List of Opcodes
3838
#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_11_2

0 commit comments

Comments
 (0)