Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/source/CSChaosCastle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "NewUICustomMessageBox.h"
#include "MapManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"
#include "NewUISystem.h"

Expand Down
2 changes: 1 addition & 1 deletion src/source/CSItemOption.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "Scenes/SceneCore.h"
#include "ZzzInterface.h"
#include "ZzzInventory.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "UIControls.h"
#include "NewUISystem.h"
#include "SkillManager.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/CSQuest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "CSQuest.h"
#include "UsefulDef.h"
#include "NewUIInventoryCtrl.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "NewUISystem.h"

bool bCheckNPC = false;
Expand Down
2 changes: 1 addition & 1 deletion src/source/ChangeRingManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "ZzzCharacter.h"
#include "ChangeRingManager.h"
#include "LoadData.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"

#include <algorithm>
#include <array>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/source/DuelMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "ZzzInfomation.h"
#include "ZzzCharacter.h"

#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "WSclient.h"

#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion src/source/GIPetManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "ZzzCharacter.h"
#include "ZzzInfomation.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "CSPetSystem.h"
#include "DSPlaySound.h"
#include "Input.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/GameMaps/GMCrywolf1st.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "CMVP1stDirection.h"
#include "CSChaosCastle.h"
#include "MapManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "NewUISystem.h"
#include "SkillManager.h"

Expand Down
2 changes: 1 addition & 1 deletion src/source/GameMaps/GMHellas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "DSPlaySound.h"
#include "NewUISystem.h"
#include "MapManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"
#include "Camera/CameraProjection.h"

Expand Down
2 changes: 1 addition & 1 deletion src/source/Guild/NewUIGuildInfoWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "ZzzInventory.h"
#include "ZzzInfomation.h"

#include "CharacterManager.h"
#include "Character/CharacterManager.h"

int DeleteIndex = 0;
int AppointStatus = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/source/Guild/UIGuildInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "UIGuildInfo.h"
#include "CSParts.h"
#include "NewUICommonMessageBox.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"
#include "ZzzInventory.h"

Expand Down
2 changes: 1 addition & 1 deletion src/source/MonkSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "ZzzLodTerrain.h"

#include "LoadData.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"
#include "SkillManager.h"
#include "MapManager.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIBloodCastleEnter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "NewUIBloodCastleEnter.h"
#include "NewUISystem.h"

#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"

using namespace SEASON3B;
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUICharacterInfoWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "stdafx.h"
#include "NewUICharacterInfoWindow.h"
#include "NewUISystem.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "CSItemOption.h"
#include "DSPlaySound.h"
#include "ZzzCharacter.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUICommonMessageBox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "CSQuest.h"
#include "PortalMgr.h"
#include "GambleSystem.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"
#include "NewUILuckyItemWnd.h"
#include "NewUISystem.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUICursedTempleEnter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "ZzzInterface.h"
#include "ZzzInventory.h"

#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "CSItemOption.h"
#include "CSChaosCastle.h"
#include "NewUISystem.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUICursedTempleResult.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "CSChaosCastle.h"
#include "UIControls.h"
#include "SkillManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "NewUISystem.h"

using namespace SEASON3B;
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIEnterDevilSquare.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "NewUIEnterDevilSquare.h"
#include "NewUISystem.h"
#include "ZzzCharacter.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"

using namespace SEASON3B;
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIHotKey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "ZzzEffect.h"
#include "UIMng.h"
#include "MapManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#ifdef KJH_ADD_INGAMESHOP_UI_SYSTEM
#include "GameShop/InGameShopSystem.h"
#endif // KJH_ADD_INGAMESHOP_UI_SYSTEM
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIInventoryActionController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "MapManager.h"
#include "SocketSystem.h"
#include "MonkSystem.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"
#include "ZzzInterface.h"
#include "UIManager.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIItemEnduranceInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "NewUIItemEnduranceInfo.h"
#include "NewUISystem.h"

#include "CharacterManager.h"
#include "Character/CharacterManager.h"

#ifdef PJH_FIX_SPRIT
#include "GIPetManager.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIMainFrameWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "CSItemOption.h"
#include "CSChaosCastle.h"
#include "MapManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"
#include "./Time/CTimCheck.h"
#include "MonkSystem.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIMoveCommandWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "ServerListManager.h"
#include "ZzzOpenData.h"
#include "MapManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"

using namespace SEASON3B;
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIMuHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "UIControls.h"
#include "NewUISystem.h"
#include "NewUIMuHelper.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "MUHelper/MuHelper.h"

using namespace MUHelper;
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIMyInventory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extern bool SelectFlag;
#endif // CSK_FIX_BLUELUCKYBAG_MOVECOMMAND
#include "ChangeRingManager.h"
#include "MonkSystem.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"
#include "ZzzInterface.h"

Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUINPCQuest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "NewUISystem.h"
#include "CSQuest.h"

#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"

extern bool bCheckNPC;
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIPartyListWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "NewUISystem.h"

#include "ZzzInventory.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"
#include "ZzzInterface.h"
#include "Camera/CameraProjection.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUIPetInfoWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "NewUISystem.h"

#include "GIPetManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"

using namespace SEASON3B;
Expand Down
2 changes: 1 addition & 1 deletion src/source/NewUISiegeWarBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ using namespace SEASON3B;
#include "ZzzInterface.h"
#include "ZzzInventory.h"
#include "Guild/UIGuildInfo.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"

SEASON3B::CNewUISiegeWarBase::CNewUISiegeWarBase()
Expand Down
2 changes: 1 addition & 1 deletion src/source/Scenes/CharacterScene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "stdafx.h"
#include "CharacterScene.h"
#include "SceneCore.h"
#include "../CharacterManager.h"
#include "../Character/CharacterManager.h"
#include "../MapManager.h"
#include "../ZzzOpenglUtil.h"
#include "../ZzzObject.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/SkillManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "stdafx.h"
#include "SkillManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "MapManager.h"
#include "ZzzCharacter.h"

Expand Down
2 changes: 1 addition & 1 deletion src/source/SocketSystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "ZzzCharacter.h"
#include "WSclient.h"
#include "UIControls.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"

using namespace SEASON4A;

Expand Down
6 changes: 3 additions & 3 deletions src/source/UIMng.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include "ServerSelWin.h"
#include "LoginWin.h"
#include "CreditWin.h"
#include "CharSelMainWin.h"
#include "CharMakeWin.h"
#include "CharInfoBalloonMng.h"
#include "Character/CharSelMainWin.h"
#include "Character/CharMakeWin.h"
#include "Character/CharInfoBalloonMng.h"
#include "ServerMsgWin.h"

#define UIM_SCENE_NONE 0
Expand Down
2 changes: 1 addition & 1 deletion src/source/UIWindows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "CSParts.h"
#include "SummonSystem.h"
#include "MapManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "DSPlaySound.h"
#include "NewUISystem.h"
#include "Camera/CameraProjection.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/WSclient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include "w_CursedTemple.h"
#include "SummonSystem.h"

#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"

#ifdef KJH_ADD_INGAMESHOP_UI_SYSTEM
Expand Down
2 changes: 1 addition & 1 deletion src/source/ZzzAI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "Scenes/SceneCore.h"
#include "DSPlaySound.h"
#include "ZzzPath.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"

namespace
Expand Down
2 changes: 1 addition & 1 deletion src/source/ZzzCharacter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ namespace
#include "PartyManager.h"
#include "w_CursedTemple.h"
#include "SummonSystem.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"
#include "w_MapHeaders.h"
#include "w_PetProcess.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/ZzzEffect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "CDirection.h"
#include "MapManager.h"
#include "SkillEffectMgr.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"
#include <NewUISystem.h>
#include "ZzzInterface.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/ZzzInfomation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "NewUIInventoryCtrl.h"
#include "SocketSystem.h"
#include "NewUISystem.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"

CLASS_ATTRIBUTE ClassAttribute[MAX_CLASS];
Expand Down
2 changes: 1 addition & 1 deletion src/source/ZzzInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include "ChangeRingManager.h"
#include "NewUIGensRanking.h"
#include "MonkSystem.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"
#include "MUHelper/MuHelper.h"

Expand Down
2 changes: 1 addition & 1 deletion src/source/ZzzInventory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include <vector>

#include "MapManager.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "SkillManager.h"
#include "NewUISystem.h"
#include "Camera/CameraProjection.h"
Expand Down
2 changes: 1 addition & 1 deletion src/source/ZzzObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "CComGem.h"
#include "BoneManager.h"
#include "w_CursedTemple.h"
#include "CharacterManager.h"
#include "Character/CharacterManager.h"
#include "w_MapHeaders.h"
#include "MonkSystem.h"
#include "NewUISystem.h"
Expand Down
Loading