- moved 15 more files to g_shared.

CMakeSettings.json

@@ -0,0 +1,47 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "variables": [
+        {
+          "name": "ZDOOM_GENERATE_ASM",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "ZDOOM_GENERATE_MAPFILE",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "ZDOOM_OUTPUT_OLDSTYLE",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "JPEG_INCLUDE_DIR",
+          "value": "c:\\Programming\\vcpkg\\packages\\libjpeg-turbo_x64-windows-static\\include\\",
+          "type": "PATH"
+        },
+        {
+          "name": "JPEG_LIBRARY_DEBUG",
+          "value": "c:\\Programming\\vcpkg\\packages\\libjpeg-turbo_x64-windows-static\\lib\\jpeg.lib",
+          "type": "FILEPATH"
+        },
+        {
+          "name": "JPEG_LIBRARY_RELEASE",
+          "value": "c:\\Programming\\vcpkg\\packages\\libjpeg-turbo_x64-windows-static\\lib\\jpeg.lib",
+          "type": "FILEPATH"
+        }
+      ]
+    }
+  ]
+}

p_destructible.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include "tarray.h"
+#include "r_defs.h"
+#include "p_trace.h"
+
+// [ZZ] Destructible geometry related
+struct FHealthGroup
+{
+	TArray<sector_t*> sectors;
+	TArray<line_t*> lines;
+	int health;
+	int id;
+};
+
+// for P_DamageSector
+enum
+{
+	SECPART_Floor = 0,
+	SECPART_Ceiling = 1,
+	SECPART_3D = 2
+};
+
+
+void P_SetHealthGroupHealth(FHealthGroup* group, int health);
+void P_SetHealthGroupHealth(FLevelLocals *Level, int group, int health);
+
+void P_InitHealthGroups(FLevelLocals *Level);
+FHealthGroup* P_GetHealthGroup(FLevelLocals *Level, int id);
+FHealthGroup* P_GetHealthGroupOrNew(FLevelLocals *Level, int id, int startinghealth);
+
+void P_DamageSector(sector_t* sector, AActor* source, int damage, FName damagetype, int part, DVector3 position, bool isradius, bool dogroups);
+void P_DamageLinedef(line_t* line, AActor* source, int damage, FName damagetype, int side, DVector3 position, bool isradius, bool dogroups);
+
+void P_GeometryLineAttack(FTraceResults& trace, AActor* thing, int damage, FName damageType);
+void P_GeometryRadiusAttack(AActor* bombspot, AActor* bombsource, int bombdamage, int bombdistance, FName damagetype, int fulldamagedistance);
+bool P_ProjectileHitLinedef(AActor* projectile, line_t* line);
+bool P_ProjectileHitPlane(AActor* projectile, int part);
+
+bool P_CheckLinedefVulnerable(line_t* line, int side, int part = -1);
+bool P_CheckSectorVulnerable(sector_t* sector, int part);
+
+void P_SerializeHealthGroups(FSerializer& arc);

src/CMakeLists.txt

@@ -875,7 +875,6 @@ set( FASTMATH_SOURCES
 )
 
 set (PCH_SOURCES
-	actorptrselect.cpp
 	am_map.cpp
 	b_bot.cpp
 	b_func.cpp
@@ -908,7 +907,6 @@ set (PCH_SOURCES
 	dobjgc.cpp
 	dobjtype.cpp
 	doomstat.cpp
-	dthinker.cpp
 	f_wipe.cpp
 	g_cvars.cpp
 	g_doomedmap.cpp
@@ -934,8 +932,6 @@ set (PCH_SOURCES
 	m_joy.cpp
 	m_misc.cpp
 	name.cpp
-	p_3dfloors.cpp
-	p_3dmidtex.cpp
 	p_acs.cpp
 	p_actionfunctions.cpp
 	p_conversation.cpp
@@ -943,7 +939,6 @@ set (PCH_SOURCES
 	p_effect.cpp
 	p_enemy.cpp
 	p_interaction.cpp
-	p_linkedsectors.cpp
 	p_lnspec.cpp
 	p_map.cpp
 	p_maputl.cpp
@@ -957,13 +952,10 @@ set (PCH_SOURCES
 	p_terrain.cpp
 	p_things.cpp
 	p_tick.cpp
-	p_trace.cpp
 	p_usdf.cpp
 	p_user.cpp
 	p_xlat.cpp
 	parsecontext.cpp
-	po_man.cpp
-	portal.cpp
 	r_utility.cpp
 	r_sky.cpp
 	r_videoscale.cpp
@@ -1020,6 +1012,14 @@ set (PCH_SOURCES
 	g_shared/p_switch.cpp
 	g_shared/p_tags.cpp
 	g_shared/p_teleport.cpp
+	g_shared/actorptrselect.cpp
+	g_shared/dthinker.cpp
+	g_shared/p_3dfloors.cpp
+	g_shared/p_3dmidtex.cpp
+	g_shared/p_linkedsectors.cpp
+	g_shared/p_trace.cpp
+	g_shared/po_man.cpp
+	g_shared/portal.cpp
 	g_statusbar/hudmessages.cpp
 	g_statusbar/shared_hud.cpp
 	g_statusbar/sbarinfo.cpp