Fix xrGameLA, part 4

ixray-team · Dec 8, 2024 · 06b1a91 · 06b1a91
1 parent 07fb07d
commit 06b1a91
Show file tree

Hide file tree

Showing 306 changed files with 1,050 additions and 4,857 deletions.
diff --git a/src/Editors/LevelEditor/AI/patrol_path_storage.h b/src/Editors/LevelEditor/AI/patrol_path_storage.h
@@ -13,7 +13,7 @@ class ILevelGraph;
 class IGameLevelCrossTable;
 class IGameGraph;
 
-#include "../xrServerEntities/object_interfaces.h"
+#include "../xrCore/object_interfaces.h"
 #include "../XrCore/associative_vector.h"
 
 class CPatrolPathStorage : public IPureSerializeObject<IReader,IWriter>

diff --git a/src/Editors/LevelEditor/AI/patrol_point.h b/src/Editors/LevelEditor/AI/patrol_point.h
@@ -13,7 +13,7 @@ class ILevelGraph;
 class IGameLevelCrossTable;
 class IGameGraph;
 
-#include "../xrServerEntities/object_interfaces.h"
+#include "../xrCore/object_interfaces.h"
 #include "../xrEngine/AI/game_graph_space.h"
 
 class CPatrolPoint : public IPureSerializeObject<IReader,IWriter> {

diff --git a/src/Editors/LevelEditor/AI/server_entity_wrapper.h b/src/Editors/LevelEditor/AI/server_entity_wrapper.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../xrServerEntities/object_interfaces.h"
+#include "../xrCore/object_interfaces.h"
 
 class CSE_Abstract;
 

diff --git a/src/xrServerEntities/object_broker.h → src/xrCore/object_broker.h b/src/xrServerEntities/object_broker.h → src/xrCore/object_broker.h
diff --git a/src/xrServerEntities/object_cloner.h → src/xrCore/object_cloner.h b/src/xrServerEntities/object_cloner.h → src/xrCore/object_cloner.h
diff --git a/src/xrServerEntities/object_comparer.h → src/xrCore/object_comparer.h b/src/xrServerEntities/object_comparer.h → src/xrCore/object_comparer.h
diff --git a/src/xrServerEntities/object_destroyer.h → src/xrCore/object_destroyer.h b/src/xrServerEntities/object_destroyer.h → src/xrCore/object_destroyer.h
diff --git a/src/xrGameLA/object_interfaces.h → src/xrCore/object_interfaces.h b/src/xrGameLA/object_interfaces.h → src/xrCore/object_interfaces.h
diff --git a/src/xrServerEntities/object_loader.h → src/xrCore/object_loader.h b/src/xrServerEntities/object_loader.h → src/xrCore/object_loader.h
diff --git a/src/xrServerEntities/object_saver.h → src/xrCore/object_saver.h b/src/xrServerEntities/object_saver.h → src/xrCore/object_saver.h
diff --git a/src/xrEngine/AI/graph_abstract.h b/src/xrEngine/AI/graph_abstract.h
@@ -10,7 +10,7 @@
 
 #include "graph_vertex.h"
 #include "graph_edge.h"
-#include "../xrServerEntities/object_broker.h"
+#include "../xrCore/object_broker.h"
 
 template <
 	typename _data_type = Loki::EmptyType,

diff --git a/src/xrEngine/AI/graph_vertex.h b/src/xrEngine/AI/graph_vertex.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../xrServerEntities/object_broker.h"
+#include "../xrCore/object_broker.h"
 
 template <
 	typename _data_type,

diff --git a/src/xrEngine/Environment_misc.cpp b/src/xrEngine/Environment_misc.cpp
@@ -7,7 +7,7 @@
 #include "Rain.h"
 
 #include "IGame_Level.h"
-#include "../xrServerEntities/object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "../xrServerEntities/LevelGameDef.h"
 #include "../xrServerEntities/ShapeData.h"
 

diff --git a/src/xrEngine/line_edit_control.cpp b/src/xrEngine/line_edit_control.cpp
@@ -9,7 +9,7 @@
 #include "line_edit_control.h"
 
 #include "../xrCore/os_clipboard.h"
-#include "../xrServerEntities/object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "xr_input.h"
 
 #include "edit_actions.h"

diff --git a/src/xrEngine/xr_efflensflare.cpp b/src/xrEngine/xr_efflensflare.cpp
@@ -11,7 +11,7 @@
 #include "../Include/xrRender/Kinematics.h"
 #include "cl_intersect.h"
 
-#include "../xrServerEntities/object_broker.h"
+#include "../xrCore/object_broker.h"
 
 #ifdef _EDITOR
     #include "ui_toolscustom.h"

diff --git a/src/xrGame/ActorCondition.cpp b/src/xrGame/ActorCondition.cpp
@@ -12,7 +12,7 @@
 #include "ai_space.h"
 #include "script_game_object.h"
 #include "game_object_space.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "Weapon.h"
 
 #include "PDA.h"

diff --git a/src/xrGame/ActorEffector.cpp b/src/xrGame/ActorEffector.cpp
@@ -4,7 +4,7 @@
 #include "PostprocessAnimator.h"
 #include "../xrEngine/EffectorPP.h"
 #include "../xrEngine/ObjectAnimator.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "Actor.h"
 
 void AddEffector		(CActor* A, int type, const shared_str& sect_name)

diff --git a/src/xrGame/CameraFirstEye.cpp b/src/xrGame/CameraFirstEye.cpp
@@ -4,7 +4,7 @@
 #include "CameraFirstEye.h"
 #include "../xrEngine/xr_level_controller.h"
 #include "../xrEngine/xr_object.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction

diff --git a/src/xrGame/CarWeapon.cpp b/src/xrGame/CarWeapon.cpp
@@ -3,7 +3,7 @@
 #include "../xrPhysics/PhysicsShell.h"
 #include "PhysicsShellHolder.h"
 #include "../Include/xrRender/Kinematics.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "../xrSound/ai_sounds.h"
 #include "WeaponAmmo.h"
 #include "../xrEngine/xr_level_controller.h"

diff --git a/src/xrGame/DemoInfo.cpp b/src/xrGame/DemoInfo.cpp
@@ -4,7 +4,7 @@
 #include "Level.h"
 #include "DemoInfo.h"
 #include "../xrCore/stream_reader.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 
 LPCSTR GameTypeToString(EGameIDs gt, bool bShort);
 

diff --git a/src/xrGame/DemoInfo_Loader.cpp b/src/xrGame/DemoInfo_Loader.cpp
@@ -2,7 +2,7 @@
 #include "DemoInfo_Loader.h"
 #include "../xrCore/stream_reader.h"
 #include "Level.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 
 demo_info_loader::demo_info_loader()
 {

diff --git a/src/xrGame/EntityCondition.cpp b/src/xrGame/EntityCondition.cpp
@@ -9,7 +9,7 @@
 #include "entity_alive.h"
 #include "../Include/xrRender/KinematicsAnimated.h"
 #include "../Include/xrRender/Kinematics.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "ActorHelmet.h"
 
 #define MAX_HEALTH 1.0f

diff --git a/src/xrGame/GameTask.cpp b/src/xrGame/GameTask.cpp
@@ -16,7 +16,7 @@
 #include "alife_simulator.h"
 #include "alife_story_registry.h"
 #include "game_object_space.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "../../xrUI/UITextureMaster.h"
 
 

diff --git a/src/xrGame/GametaskManager.h b/src/xrGame/GametaskManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "GameTaskDefs.h"
-#include "object_interfaces.h"
+#include "../xrCore/object_interfaces.h"
 
 class CGameTaskWrapper;
 class CGameTask;

diff --git a/src/xrGame/InfoPortion.cpp b/src/xrGame/InfoPortion.cpp
@@ -1,7 +1,7 @@
 #include "StdAfx.h"
 #include "pch_script.h"
 #include "xml_str_id_loader.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 /*
 #include "InfoPortion.h"
 #include "GameObject.h"

diff --git a/src/xrGame/MainMenu.cpp b/src/xrGame/MainMenu.cpp
@@ -24,7 +24,7 @@
 
 #include <shellapi.h>
 
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 
 #include "account_manager.h"
 #include "login_manager.h"

diff --git a/src/xrGame/UIGameAHunt.cpp b/src/xrGame/UIGameAHunt.cpp
@@ -11,7 +11,7 @@
 #include "ui/UIRankIndicator.h"
 #include "UIHelperGame.h"
 #include "UITeamPanels.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 
 #define TEAM_PANELS_AHUNT_XML_NAME "ui_team_panels_ahunt.xml"
 

diff --git a/src/xrGame/UIGameCTA.cpp b/src/xrGame/UIGameCTA.cpp
@@ -17,7 +17,7 @@
 #include "WeaponKnife.h"
 #include "../xrEngine/xr_level_controller.h"
 
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "WeaponKnife.h"
 
 #include "ui/UISkinSelector.h"

diff --git a/src/xrGame/UIGameCustom.cpp b/src/xrGame/UIGameCustom.cpp
@@ -4,7 +4,7 @@
 #include "Level.h"
 #include "UIHelperGame.h"
 #include "../xrUI/Widgets/UIStatic.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "../xrEngine/string_table.h"
 
 #include "InventoryOwner.h"

diff --git a/src/xrGame/UIGameCustom.h b/src/xrGame/UIGameCustom.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "../xrScripts/script_export_space.h"
-#include "object_interfaces.h"
+#include "../xrCore/object_interfaces.h"
 #include "inventory_space.h"
 #include "gametype_chooser.h"
 #include "../xrUI/Widgets/UIDialogHolder.h"

diff --git a/src/xrGame/UIGameDM.cpp b/src/xrGame/UIGameDM.cpp
@@ -20,7 +20,7 @@
 #include "ui/UIActorMenu.h"
 #include "UIHelperGame.h"
 #include "UITeamPanels.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 
 #define MSGS_OFFS 510
 

diff --git a/src/xrGame/UIGameSP.cpp b/src/xrGame/UIGameSP.cpp
@@ -12,7 +12,7 @@
 #include "game_cl_single.h"
 #include "ActorCondition.h"
 #include "../xrEngine/XR_IOConsole.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "GametaskManager.h"
 #include "GameTask.h"
 

diff --git a/src/xrGame/UIGameTDM.cpp b/src/xrGame/UIGameTDM.cpp
@@ -7,7 +7,7 @@
 
 #include "ui/TeamInfo.h"
 
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 
 #include "UITeamPanels.h"
 #include "ui/UIMoneyIndicator.h"

diff --git a/src/xrGame/Weapon.cpp b/src/xrGame/Weapon.cpp
@@ -12,7 +12,7 @@
 #include "../Include/xrRender/Kinematics.h"
 #include "ai_object_location.h"
 #include "../xrPhysics/MathUtils.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "player_hud.h"
 #include "GamePersistent.h"
 #include "EffectorFall.h"

diff --git a/src/xrGame/WeaponBinoculars.cpp b/src/xrGame/WeaponBinoculars.cpp
@@ -6,7 +6,7 @@
 #include "Level.h"
 #include "../../xrUI/Widgets/UIFrameWindow.h"
 #include "WeaponBinocularsVision.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "Inventory.h"
 
 CWeaponBinoculars::CWeaponBinoculars()

diff --git a/src/xrGame/WeaponBinocularsVision.cpp b/src/xrGame/WeaponBinocularsVision.cpp
@@ -6,7 +6,7 @@
 #include "Actor.h"
 #include "actor_memory.h"
 #include "relation_registry.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 
 #include "game_base_space.h"
 #include "Level.h"

diff --git a/src/xrGame/WeaponMagazined.cpp b/src/xrGame/WeaponMagazined.cpp
@@ -13,7 +13,7 @@
 #include "EffectorZoomInertion.h"
 #include "../xrEngine/xr_level_controller.h"
 #include "UIGameCustom.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "../xrEngine/string_table.h"
 #include "MPPlayersBag.h"
 #include "../../xrUI/UIXmlInit.h"

diff --git a/src/xrGame/WeaponMagazinedWGrenade.cpp b/src/xrGame/WeaponMagazinedWGrenade.cpp
@@ -7,7 +7,7 @@
 #include "Actor.h"
 #include "../xrEngine/xr_level_controller.h"
 #include "Level.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "game_base_space.h"
 #include "../xrPhysics/MathUtils.h"
 #include "player_hud.h"

diff --git a/src/xrGame/WeaponStatMgun.cpp b/src/xrGame/WeaponStatMgun.cpp
@@ -3,7 +3,7 @@
 #include "../Include/xrRender/Kinematics.h"
 #include "../xrPhysics/PhysicsShell.h"
 #include "WeaponAmmo.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "../xrSound/ai_sounds.h"
 #include "Actor.h"
 #include "ActorEffector.h"

diff --git a/src/xrGame/agent_member_manager.cpp b/src/xrGame/agent_member_manager.cpp
@@ -9,7 +9,7 @@
 #include "StdAfx.h"
 #include "agent_member_manager.h"
 #include "ai/stalker/ai_stalker.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "agent_manager.h"
 #include "agent_memory_manager.h"
 #include "Explosive.h"

diff --git a/src/xrGame/ai/monsters/rats/ai_rat.cpp b/src/xrGame/ai/monsters/rats/ai_rat.cpp
@@ -26,7 +26,7 @@
 
 #include "../../../rat_state_manager.h"
 #include "../../../rat_states.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "../ai_monster_squad_manager.h"
 #include "../ai_monster_squad.h"
 #include "../../../patrol_path_storage.h"

diff --git a/src/xrGame/ai/trader/ai_trader.cpp b/src/xrGame/ai/trader/ai_trader.cpp
@@ -17,7 +17,7 @@
 #include "../../Artefact.h"
 #include "../../xrServer.h"
 #include "../../relation_registry.h"
-#include "../../../xrServerEntities/object_broker.h"
+#include "../../../xrCore/object_broker.h"
 #include "../../sound_player.h"
 #include "../../Level.h"
 #include "../../game_object_space.h"

diff --git a/src/xrGame/alife_abstract_registry.h b/src/xrGame/alife_abstract_registry.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "object_interfaces.h"
-#include "object_broker.h"
+#include "../xrCore/object_interfaces.h"
+#include "../xrCore/object_broker.h"
 
 template <typename _index_type, typename _data_type>
 class CALifeAbstractRegistry : public IPureSerializeObject<IReader,IWriter> {

diff --git a/src/xrGame/alife_monster_movement_manager.cpp b/src/xrGame/alife_monster_movement_manager.cpp
@@ -10,7 +10,7 @@
 #include "alife_monster_movement_manager.h"
 #include "alife_monster_detail_path_manager.h"
 #include "alife_monster_patrol_path_manager.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "movement_manager_space.h"
 
 CALifeMonsterMovementManager::CALifeMonsterMovementManager	(object_type *object)

diff --git a/src/xrGame/alife_online_offline_group_brain.cpp b/src/xrGame/alife_online_offline_group_brain.cpp
@@ -8,7 +8,7 @@
 
 #include "StdAfx.h"
 #include "alife_online_offline_group_brain.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "xrServer_Objects_ALife_Monsters.h"
 
 #ifdef XRGAME_EXPORTS

diff --git a/src/xrGame/alife_registry_container.cpp b/src/xrGame/alife_registry_container.cpp
@@ -8,7 +8,7 @@
 
 #include "StdAfx.h"
 #include "alife_registry_container.h"
-#include "object_interfaces.h"
+#include "../xrCore/object_interfaces.h"
 #include "alife_space.h"
 #include "../xrCore/object_type_traits.h"
 

diff --git a/src/xrGame/alife_simulator_base.h b/src/xrGame/alife_simulator_base.h
@@ -11,7 +11,7 @@
 #include "random32.h"
 #include "alife_space.h"
 #include "game_graph_space.h"
-#include "object_interfaces.h"
+#include "../xrCore/object_interfaces.h"
 
 class xrServer;
 class CALifeSimulatorHeader;

diff --git a/src/xrGame/alife_simulator_header.h b/src/xrGame/alife_simulator_header.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "object_interfaces.h"
+#include "../xrCore/object_interfaces.h"
 #include "alife_space.h"
 
 class CALifeSimulatorHeader {

diff --git a/src/xrGame/alife_spawn_registry.cpp b/src/xrGame/alife_spawn_registry.cpp
@@ -8,7 +8,7 @@
 
 #include "StdAfx.h"
 #include "alife_spawn_registry.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 #include "game_base.h"
 #include "ai_space.h"
 #include "game_graph.h"

diff --git a/src/xrGame/alife_time_manager.h b/src/xrGame/alife_time_manager.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "object_interfaces.h"
+#include "../xrCore/object_interfaces.h"
 #include "alife_space.h"
 
 class CALifeTimeManager {

diff --git a/src/xrGame/cameralook.cpp b/src/xrGame/cameralook.cpp
@@ -5,7 +5,7 @@
 #include "../xrEngine/CameraManager.h"
 #include "../xrEngine/xr_level_controller.h"
 #include "Actor.h"
-#include "object_broker.h"
+#include "../xrCore/object_broker.h"
 
 #include "../xrEngine/GameMtlLib.h"
 #include "CustomRocket.h"