Cleanup and reorder OpenXRay#3

Removed some useless classes. XEM OpenXRay#157 SimpleDetector(.h/.cpp) -> item/ItemDetectorSimple(.h/.cpp) XEM OpenXRay#158 AdvancedDetector(.h/.cpp) -> item/ItemDetectorAdvanced(.h/.cpp) XEM OpenXRay#159 EliteDetector(.h/.cpp) -> item/ItemDetectorElite(.h/.cpp) XEM OpenXRay#162 PDA(.h/.cpp) -> item/ItemPDA(.h/.cpp) XEM OpenXRay#171 Torch(.h/.cpp) -> item/ItemTorch(.h/.cpp) XEM OpenXRay#172 CustomDetector(.h/.cpp) -> item/ItemDetectorCustom(.h/.cpp)
zcaliptium · Sep 15, 2015 · d012bf2 · d012bf2
1 parent 87d8358
commit d012bf2
Show file tree

Hide file tree

Showing 49 changed files with 140 additions and 289 deletions.
diff --git a/src/engine.sln b/src/engine.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}"
 EndProject
@@ -637,13 +637,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{901F5C6A-BA06-4727-B9BC-762891749A46} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
-		{68CB7CEC-F907-47AD-B624-B8432F53AAE3} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
-		{AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
-		{1BF75FEB-87DD-486C-880B-227987D191C2} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
-		{566551F4-4EF1-4CB4-A131-F982E7606907} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
-		{0899B131-F1D4-4876-9BA1-67AC821DB9E1} = {3FC858CB-4888-42FF-ABC5-82DAECB59C2C}
-		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
 		{C961EA19-716C-4A6D-BB13-689F8FB78B01} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{2FAAC8BA-369F-465E-B465-2235963FD377} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{65CBB9D0-FBC6-41A4-8316-F5E9B5D7FB33} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
@@ -655,26 +648,33 @@ Global
 		{A4ABD75E-825B-4D09-B3B2-2709682E40C8} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{F1836CE2-59EF-4189-8B9C-D103A511CB27} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{3AD26FD3-4F52-4E22-A4CF-AD4C49E74C61} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
-		{F573DE85-0866-4775-955F-6C3241D2AE80} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
-		{6BA3121A-ACBC-4685-9246-4549CA1EFFFD} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
-		{39EE310B-4F1D-4716-A39F-4AB844DB3680} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
-		{93AD3B7E-71DE-4FA2-90E7-A79782ED4960} = {901F5C6A-BA06-4727-B9BC-762891749A46}
-		{56AD8F54-F89E-4B5A-93F8-8A617BFD1160} = {901F5C6A-BA06-4727-B9BC-762891749A46}
-		{C928FBB1-EDD8-4198-90DC-170A54C2AD72} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
-		{84D91673-C1A1-47FF-9A75-4E73F31F4C63} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
-		{492D3DFE-9068-4E7E-A008-7C2420A651C0} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
-		{B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
-		{CC52E0B3-CC35-4934-9302-035B748F3F2C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
-		{F6C4F74A-152C-4612-9E3B-D02346234855} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{EFB76D6F-0092-439C-A783-C0BE10BD17C9} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{EC924B9B-4991-4931-8623-E1DB9AE005CA} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
-		{E5F40F9E-C01B-4B97-9BD5-FC24308D8022} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
-		{FFDF27A8-C198-49ED-BA13-4DA9054266C6} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
-		{FA169092-EA3E-40C1-8E5A-A2B575700FE8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{032A10AB-E44C-4751-A290-001EF99E664A} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 		{1924EF23-A05E-40E5-93F2-6CCD64BE1F8B} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
+		{0899B131-F1D4-4876-9BA1-67AC821DB9E1} = {3FC858CB-4888-42FF-ABC5-82DAECB59C2C}
+		{1BF75FEB-87DD-486C-880B-227987D191C2} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{566551F4-4EF1-4CB4-A131-F982E7606907} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{CC52E0B3-CC35-4934-9302-035B748F3F2C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{F6C4F74A-152C-4612-9E3B-D02346234855} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{FA169092-EA3E-40C1-8E5A-A2B575700FE8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{880CD250-BA77-4DAF-A8D4-552F12DD3AE4} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{0EB257DC-5CFC-44B0-82C9-CE6B158BE473} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
+		{901F5C6A-BA06-4727-B9BC-762891749A46} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
+		{68CB7CEC-F907-47AD-B624-B8432F53AAE3} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
+		{AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
+		{F1066EAC-EE25-4C7A-9023-5957A6F7BA27} = {A074ECE0-24F4-497F-99BD-AD45D5C51382}
+		{93AD3B7E-71DE-4FA2-90E7-A79782ED4960} = {901F5C6A-BA06-4727-B9BC-762891749A46}
+		{56AD8F54-F89E-4B5A-93F8-8A617BFD1160} = {901F5C6A-BA06-4727-B9BC-762891749A46}
+		{C928FBB1-EDD8-4198-90DC-170A54C2AD72} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
+		{84D91673-C1A1-47FF-9A75-4E73F31F4C63} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
+		{E5F40F9E-C01B-4B97-9BD5-FC24308D8022} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
+		{FFDF27A8-C198-49ED-BA13-4DA9054266C6} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
+		{F573DE85-0866-4775-955F-6C3241D2AE80} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
+		{6BA3121A-ACBC-4685-9246-4549CA1EFFFD} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
+		{39EE310B-4F1D-4716-A39F-4AB844DB3680} = {AB0D87B3-0937-4B2D-AB01-7A613B3EEF0D}
+		{492D3DFE-9068-4E7E-A008-7C2420A651C0} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
+		{B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
 	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}

diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp
@@ -25,7 +25,7 @@
 #include "clsid_game.h"
 #include "game_cl_base_weapon_usage_statistic.h"
 #include "Grenade.h"
-#include "Torch.h"
+#include "item/ItemTorch.h"
 
 // breakpoints
 #include "../xrEngine/xr_input.h"

diff --git a/src/xrGame/ActorCondition.cpp b/src/xrGame/ActorCondition.cpp
@@ -16,7 +16,7 @@
 #include "object_broker.h"
 #include "weapon.h"
 
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "ai/monsters/basemonster/base_monster.h"
 #include "UIGameCustom.h"
 #include "ui/UIMainIngameWnd.h"

diff --git a/src/xrGame/ActorHelmet.cpp b/src/xrGame/ActorHelmet.cpp
@@ -2,7 +2,7 @@
 #include "ActorHelmet.h"
 #include "Actor.h"
 #include "Inventory.h"
-#include "Torch.h"
+#include "item/ItemTorch.h"
 #include "BoneProtections.h"
 #include "../Include/xrRender/Kinematics.h"
 //#include "CustomOutfit.h"

diff --git a/src/xrGame/ActorInput.cpp b/src/xrGame/ActorInput.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include <dinput.h>
 #include "Actor.h"
-#include "Torch.h"
+#include "item/ItemTorch.h"
 #include "trade.h"
 #include "../xrEngine/CameraBase.h"
 
@@ -28,8 +28,7 @@
 #include "InventoryBox.h"
 #include "player_hud.h"
 #include "../xrEngine/xr_input.h"
-#include "flare.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "clsid_game.h"
 #include "hudmanager.h"
 #include "Weapon.h"

diff --git a/src/xrGame/Actor_Events.cpp b/src/xrGame/Actor_Events.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "actor.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "weapon.h"
 #include "artefact.h"
 #include "scope.h"

diff --git a/src/xrGame/CustomOutfit.cpp b/src/xrGame/CustomOutfit.cpp
@@ -203,7 +203,7 @@ BOOL	CCustomOutfit::BonePassBullet					(int boneID)
 	return m_boneProtection->getBonePassBullet(s16(boneID));
 }
 
-#include "torch.h"
+#include "item/ItemTorch.h"
 void	CCustomOutfit::OnMoveToSlot		(const SInvItemPlace& prev)
 {
 	if ( m_pInventory )

diff --git a/src/xrGame/ExoOutfit.cpp b/src/xrGame/ExoOutfit.cpp
diff --git a/src/xrGame/ExoOutfit.h b/src/xrGame/ExoOutfit.h
diff --git a/src/xrGame/InfoDocument.cpp b/src/xrGame/InfoDocument.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "InfoDocument.h"
 #include "../xrphysics/PhysicsShell.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "inventoryowner.h"
 #include "xrserver_objects_alife_items.h"
 

diff --git a/src/xrGame/InventoryOwner.cpp b/src/xrGame/InventoryOwner.cpp
@@ -1,7 +1,7 @@
 #include "pch_script.h"
 #include "InventoryOwner.h"
 #include "entity_alive.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "actor.h"
 #include "trade.h"
 #include "inventory.h"

diff --git a/src/xrGame/Level.cpp b/src/xrGame/Level.cpp
@@ -46,7 +46,7 @@
 #include "message_filter.h"
 #include "demoplay_control.h"
 #include "demoinfo.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "xrPhysics/IPHWorld.h"
 #include "xrPhysics/console_vars.h"
 

diff --git a/src/xrGame/MilitaryOutfit.cpp b/src/xrGame/MilitaryOutfit.cpp
diff --git a/src/xrGame/MilitaryOutfit.h b/src/xrGame/MilitaryOutfit.h
diff --git a/src/xrGame/ScientificOutfit.cpp b/src/xrGame/ScientificOutfit.cpp
diff --git a/src/xrGame/ScientificOutfit.h b/src/xrGame/ScientificOutfit.h
diff --git a/src/xrGame/UIZoneMap.cpp b/src/xrGame/UIZoneMap.cpp
@@ -2,7 +2,7 @@
 #include "uizonemap.h"
 
 #include "InfoPortion.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 
 #include "Grenade.h"
 #include "level.h"

diff --git a/src/xrGame/Weapon.cpp b/src/xrGame/Weapon.cpp
@@ -23,7 +23,7 @@
 #include "weaponBinocularsVision.h"
 #include "ui/UIWindow.h"
 #include "ui/UIXmlInit.h"
-#include "Torch.h"
+#include "item/ItemTorch.h"
 
 #define WEAPON_REMOVE_TIME		60000
 #define ROTATION_TIME			0.25f

diff --git a/src/xrGame/actor_communication.cpp b/src/xrGame/actor_communication.cpp
@@ -1,7 +1,7 @@
 #include "pch_script.h"
 #include "actor.h"
 #include "UIGameSP.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "level.h"
 #include "string_table.h"
 #include "PhraseDialog.h"
@@ -26,7 +26,7 @@
 #include "GameTaskdefs.h"
 #include "infoportion.h"
 #include "inventory.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "ai/monsters/basemonster/base_monster.h"
 #include "ai/trader/ai_trader.h"
 

diff --git a/src/xrGame/ai/stalker/ai_stalker_events.cpp b/src/xrGame/ai/stalker/ai_stalker_events.cpp
@@ -8,7 +8,7 @@
 
 #include "stdafx.h"
 #include "ai_stalker.h"
-#include "../../ItemPDA.h"
+#include "../../item/ItemPDA.h"
 #include "../../inventory.h"
 #include "../../../xrServerEntities/xrmessages.h"
 #include "../../shootingobject.h"

diff --git a/src/xrGame/ai/stalker/ai_stalker_script_entity.cpp b/src/xrGame/ai/stalker/ai_stalker_script_entity.cpp
@@ -10,7 +10,7 @@
 #include "ai_stalker.h"
 #include "../../stalker_animation_manager.h"
 #include "../../script_entity_action.h"
-#include "../../torch.h"
+#include "../../item/ItemTorch.h"
 #include "../../inventory.h"
 #include "../../weapon.h"
 #include "../../weaponmagazined.h"

diff --git a/src/xrGame/ai_stalker_alife.cpp b/src/xrGame/ai_stalker_alife.cpp
@@ -12,12 +12,12 @@
 #include "alife_simulator.h"
 #include "alife_space.h"
 #include "inventory.h"
-#include "ItemPDA.h"
+#include "item/ItemPDA.h"
 #include "eatable_item.h"
 #include "medkit.h"
 #include "weapon.h"
 #include "Grenade.h"
-#include "ItemDetectorCustom.h"
+#include "item/ItemDetectorCustom.h"
 #include "ef_storage.h"
 #include "ef_primary.h"
 #include "ef_pattern.h"

diff --git a/src/xrGame/ItemDetectorAdvanced.cpp → src/xrGame/item/ItemDetectorAdvanced.cpp b/src/xrGame/ItemDetectorAdvanced.cpp → src/xrGame/item/ItemDetectorAdvanced.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "ItemDetectorAdvanced.h"
-#include "ui/ArtefactDetectorUI.h"
-#include "../Include/xrRender/Kinematics.h"
-#include "player_hud.h"
-#include "game_object_space.h"
+#include "../ui/ArtefactDetectorUI.h"
+#include "../../Include/xrRender/Kinematics.h"
+#include "../player_hud.h"
+#include "../game_object_space.h"
 
 
 CAdvancedDetector::CAdvancedDetector()

diff --git a/src/xrGame/ItemDetectorAdvanced.h → src/xrGame/item/ItemDetectorAdvanced.h b/src/xrGame/ItemDetectorAdvanced.h → src/xrGame/item/ItemDetectorAdvanced.h
diff --git a/src/xrGame/ItemDetectorCustom.cpp → src/xrGame/item/ItemDetectorCustom.cpp b/src/xrGame/ItemDetectorCustom.cpp → src/xrGame/item/ItemDetectorCustom.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
 #include "ItemDetectorCustom.h"
-#include "ui/ArtefactDetectorUI.h"
-#include "hudmanager.h"
-#include "inventory.h"
-#include "level.h"
-#include "map_manager.h"
-#include "ActorEffector.h"
-#include "actor.h"
-#include "ui/UIWindow.h"
-#include "player_hud.h"
-#include "weapon.h"
+#include "../ui/ArtefactDetectorUI.h"
+#include "../hudmanager.h"
+#include "../inventory.h"
+#include "../level.h"
+#include "../map_manager.h"
+#include "../ActorEffector.h"
+#include "../Actor.h"
+#include "../ui/UIWindow.h"
+#include "../player_hud.h"
+#include "../weapon.h"
 
 ITEM_INFO::ITEM_INFO()
 {

diff --git a/src/xrGame/ItemDetectorCustom.h → src/xrGame/item/ItemDetectorCustom.h b/src/xrGame/ItemDetectorCustom.h → src/xrGame/item/ItemDetectorCustom.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "inventory_item_object.h"
-#include "../xrEngine/feel_touch.h"
-#include "hudsound.h"
-#include "customzone.h"
-#include "artefact.h"
+#include "../inventory_item_object.h"
+#include "../../xrEngine/feel_touch.h"
+#include "../hudsound.h"
+#include "../customzone.h"
+#include "../artefact.h"
 #include "ai_sounds.h"
 //#include "ui/ArtefactDetectorUI.h"
 

diff --git a/src/xrGame/ItemDetectorElite.cpp → src/xrGame/item/ItemDetectorElite.cpp b/src/xrGame/ItemDetectorElite.cpp → src/xrGame/item/ItemDetectorElite.cpp