organize + cleanup

move files to subfolders and merge nearly empty files
wootguy · Nov 19, 2024 · c547e43 · c547e43
1 parent e1374aa
commit c547e43
Show file tree

Hide file tree

Showing 46 changed files with 42 additions and 602 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,6 +33,7 @@ include_directories(${CMAKE_SOURCE_DIR}/dlls/net)
 include_directories(${CMAKE_SOURCE_DIR}/dlls/hooks)
 include_directories(${CMAKE_SOURCE_DIR}/dlls/util)
 include_directories(${CMAKE_SOURCE_DIR}/dlls/game)
+include_directories(${CMAKE_SOURCE_DIR}/dlls/player)
 include_directories(${CMAKE_SOURCE_DIR}/dlls/)
 
 include_directories(${CMAKE_SOURCE_DIR}/rehlds)

diff --git a/dlls/CGlobalState.cpp b/dlls/CGlobalState.cpp
@@ -3,7 +3,6 @@
 #include "cbase.h"
 #include "decals.h"
 #include "CBasePlayer.h"
-#include "ent_globals.h"
 
 CGlobalState					gGlobalState;
 

diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt
@@ -19,6 +19,7 @@ set(MONSTER_HDR
 	monster/CBaseGruntOp4.h
 	monster/CBaseMonster.h
 	monster/CBaseTurret.h
+	monster/CCineMonster.h
 	monster/CFlyingMonster.h
 	monster/CGargantua.h
 	monster/CHornet.h
@@ -28,6 +29,7 @@ set(MONSTER_HDR
 	monster/monsterevent.h
 	monster/monsters.h
 	monster/schedule.h
+	monster/nodes.h
 )
 set(MONSTER_SRC
 	monster/CBaseMonster.cpp
@@ -38,7 +40,7 @@ set(MONSTER_SRC
 	monster/CCineAI.cpp
 	monster/CCineMonster.cpp
 	monster/CScriptedSentence.cpp
-	nodes.cpp
+	monster/nodes.cpp
 )
 set(MONSTER_MISC_SRC
 	monster/CActAnimating.cpp
@@ -81,6 +83,7 @@ set(MONSTER_HUMAN_SRC
 	monster/CHWGrunt.cpp
 	monster/CMassn.cpp
 	monster/COtis.cpp
+	monster/CPlayerMonster.cpp
 	monster/CScientist.cpp
 )
 set(MONSTER_ALIEN_SRC
@@ -299,11 +302,7 @@ set(FUNC_SRC
 
 set(ENTITY_HDR
 	cbase.h
-	ent_globals.h
-	nodes.h
-	CKeyValue.h
-	scripted.h
-	scriptevent.h
+	monster/scriptevent.h
 	path/CPathCorner.h
 	path/CPathTrack.h
 	../engine/progs.h
@@ -410,6 +409,7 @@ set(UTIL_HDR
 	util/Bsp.h
 	util/bsptypes.h
 	util/bsplimits.h
+	util/CKeyValue.h
 	util/CommandArgs.h
 	util/debug.h
 	util/eng_wrappers.h
@@ -454,16 +454,16 @@ set(PLAYER_HDR
 	../pm_shared/pm_materials.h
 	../pm_shared/pm_movevars.h
 	../pm_shared/pm_shared.h
-	CBasePlayer.h
-	CBaseSpectator.h
+	player/CBasePlayer.h
+	player/CBaseSpectator.h
 )
 set(PLAYER_SRC
 	../pm_shared/pm_shared.cpp
 	../pm_shared/pm_debug.cpp
 	../pm_shared/pm_math.cpp
-	CBaseDMStart.cpp
-	CBasePlayer.cpp
-	CBaseSpectator.cpp
+	player/CBaseDMStart.cpp
+	player/CBasePlayer.cpp
+	player/CBaseSpectator.cpp
 )
 set(HOOKS_HDR
 	../engine/custom.h

diff --git a/dlls/cbase.h b/dlls/cbase.h
@@ -583,6 +583,17 @@ class EXPORT CBaseAnimating : public CBaseDelay
 //
 #define	SF_ITEM_USE_ONLY	256 //  ITEM_USE_ONLY = BUTTON_USE_ONLY = DOOR_USE_ONLY!!! 
 
+#define MAX_SENTENCE_PARTS	32
+
+struct SentencePart {
+	string_t file; // name of the sound file
+	uint8_t volume; // 0-100
+	uint8_t pitch; // 0-255
+	uint8_t start; // 0-100 (can't implement for vanilla hl clients)
+	uint8_t end; // 0-100
+	uint8_t tempo; // 0-100 (can't implement for vanilla hl clients)
+};
+
 class EXPORT CBaseToggle : public CBaseAnimating
 {
 public:
@@ -610,6 +621,13 @@ class EXPORT CBaseToggle : public CBaseAnimating
 
 	int					m_bitsDamageInflict;	// DMG_ damage type that the door or tigger does
 
+	SentencePart		m_customSentence[MAX_SENTENCE_PARTS];
+	string_t			m_customSentenceFolder; // folder where sentence sounds are found
+	int					m_customSentenceLastIdx; // last sentence part that was played
+	int					m_customSentenceCount; // number of words in the custom sentence
+	float				m_customSentenceTime; // time the custom sentence was started
+	float				m_customSentenceAttn; // attenuation for the current custom sentence
+
 	virtual int		Save( CSave &save );
 	virtual int		Restore( CRestore &restore );
 
@@ -628,6 +646,7 @@ class EXPORT CBaseToggle : public CBaseAnimating
 	virtual CBaseToggle* MyTogglePointer(void) { return this; }
 
 	// monsters use this, but so could buttons for instance
+	void ParseSentence(const char* pszSentence, float volume, float attenuation);
 	virtual void PlaySentence(const char* pszSentence, float duration, float volume, float attenuation);
 	virtual void PlayScriptedSentence(const char* pszSentence, float duration, float volume, float attenuation, BOOL bConcurrent, CBaseEntity* pListener);
 	virtual void SentenceStop(void);
@@ -859,6 +878,7 @@ typedef struct _SelAmmo
 	BYTE	Ammo2;
 } SelAmmo;
 
+extern edict_t* g_pBodyQueueHead;
 
 // this moved here from world.cpp, to allow classes to be derived from it
 //=======================

diff --git a/dlls/doors.h b/dlls/doors.h
diff --git a/dlls/ent_globals.h b/dlls/ent_globals.h
diff --git a/dlls/env/CCorpse.cpp b/dlls/env/CCorpse.cpp
@@ -1,7 +1,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "ent_globals.h"
 #include "bodyque.h"
 #include "CBaseMonster.h"
 

diff --git a/dlls/func/CBaseButton.cpp b/dlls/func/CBaseButton.cpp
@@ -2,7 +2,6 @@
 #include "util.h"
 #include "cbase.h"
 #include "saverestore.h"
-#include "doors.h"
 #include "CBaseButton.h"
 
 // CBaseButton

diff --git a/dlls/func/CBaseDoor.cpp b/dlls/func/CBaseDoor.cpp
@@ -1,7 +1,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "doors.h"
 #include "CBaseButton.h"
 #include "CBaseDoor.h"
 

diff --git a/dlls/func/CButtonTarget.cpp b/dlls/func/CButtonTarget.cpp
@@ -2,7 +2,6 @@
 #include "util.h"
 #include "cbase.h"
 #include "saverestore.h"
-#include "doors.h"
 
 #define SF_BTARGET_USE		0x0001
 #define SF_BTARGET_ON		0x0002

diff --git a/dlls/func/CFuncConveyor.cpp b/dlls/func/CFuncConveyor.cpp
@@ -1,7 +1,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "doors.h"
 #include "CFuncWall.h"
 
 #define SF_CONVEYOR_VISUAL		0x0001

diff --git a/dlls/func/CFuncIllusionary.cpp b/dlls/func/CFuncIllusionary.cpp
@@ -1,7 +1,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "doors.h"
 
 /*QUAKED func_illusionary (0 .5 .8) ?
 A simple entity that looks solid but lets you walk through it.

diff --git a/dlls/func/CFuncMonsterClip.cpp b/dlls/func/CFuncMonsterClip.cpp
@@ -1,7 +1,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "doors.h"
 #include "CFuncWall.h"
 
 // -------------------------------------------------------------------------------

diff --git a/dlls/func/CFuncRotating.cpp b/dlls/func/CFuncRotating.cpp
@@ -1,7 +1,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "doors.h"
 
 #define		SF_BRUSH_ACCDCC	16// brush should accelerate and decelerate when toggled
 #define		SF_BRUSH_HURT		32// rotating brush that inflicts pain based on rotation speed

diff --git a/dlls/func/CFuncWallToggle.cpp b/dlls/func/CFuncWallToggle.cpp
@@ -1,7 +1,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "doors.h"
 #include "CFuncWall.h"
 
 #define SF_WALL_START_OFF		0x0001

diff --git a/dlls/func/CMomentaryDoor.cpp b/dlls/func/CMomentaryDoor.cpp
@@ -1,7 +1,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "doors.h"
 #include "CBaseButton.h"
 #include "CBaseDoor.h"
 

diff --git a/dlls/func/CMomentaryRotButton.cpp b/dlls/func/CMomentaryRotButton.cpp
@@ -2,7 +2,6 @@
 #include "util.h"
 #include "cbase.h"
 #include "saverestore.h"
-#include "doors.h"
 #include "CBaseButton.h"
 
 // Make this button behave like a door (HACKHACK)

diff --git a/dlls/func/CRotDoor.cpp b/dlls/func/CRotDoor.cpp
@@ -1,7 +1,6 @@
 #include "extdll.h"
 #include "util.h"
 #include "cbase.h"
-#include "doors.h"
 #include "CBaseButton.h"
 #include "CBaseDoor.h"
 

diff --git a/dlls/monster/CBarney.cpp b/dlls/monster/CBarney.cpp
@@ -24,7 +24,7 @@
 #include	"CTalkSquadMonster.h"
 #include	"schedule.h"
 #include	"defaultai.h"
-#include	"scripted.h"
+#include	"CCineMonster.h"
 #include	"weapons.h"
 #include	"env/CSoundEnt.h"
 

diff --git a/dlls/monster/CBaseMonster.cpp b/dlls/monster/CBaseMonster.cpp
@@ -9,7 +9,7 @@
 #include "CBreakable.h"
 #include "nodes.h"
 #include "saverestore.h"
-#include "scripted.h"
+#include "CCineMonster.h"
 #include "CTalkSquadMonster.h"
 #include "gamerules.h"
 #include "defaultai.h"

diff --git a/dlls/monster/CCineAI.cpp b/dlls/monster/CCineAI.cpp
@@ -3,7 +3,7 @@
 #include "cbase.h"
 #include "monsters.h"
 #include "schedule.h"
-#include "scripted.h"
+#include "CCineMonster.h"
 #include "defaultai.h"
 
 

diff --git a/dlls/monster/CCineMonster.cpp b/dlls/monster/CCineMonster.cpp
@@ -8,7 +8,7 @@
 #endif
 
 #include "schedule.h"
-#include "scripted.h"
+#include "CCineMonster.h"
 #include "defaultai.h"
 
 #define CLASSNAME "scripted_sequence"

diff --git a/dlls/scripted.h → dlls/monster/CCineMonster.h b/dlls/scripted.h → dlls/monster/CCineMonster.h
diff --git a/dlls/monster/CFurniture.cpp b/dlls/monster/CFurniture.cpp
@@ -3,7 +3,7 @@
 #include "cbase.h"
 #include "monsters.h"
 #include "schedule.h"
-#include "scripted.h"
+#include "CCineMonster.h"
 #include "defaultai.h"
 
 //=========================================================

diff --git a/dlls/monster/COtis.cpp b/dlls/monster/COtis.cpp
@@ -24,7 +24,7 @@
 #include	"CTalkSquadMonster.h"
 #include	"schedule.h"
 #include	"defaultai.h"
-#include	"scripted.h"
+#include	"CCineMonster.h"
 #include	"weapons.h"
 #include	"CSoundEnt.h"
 

diff --git a/dlls/playermonster.cpp → dlls/monster/CPlayerMonster.cpp b/dlls/playermonster.cpp → dlls/monster/CPlayerMonster.cpp
diff --git a/dlls/monster/CScientist.cpp b/dlls/monster/CScientist.cpp
@@ -23,7 +23,7 @@
 #include	"CTalkSquadMonster.h"
 #include	"schedule.h"
 #include	"defaultai.h"
-#include	"scripted.h"
+#include	"CCineMonster.h"
 #include	"animation.h"
 #include	"env/CSoundEnt.h"
 

diff --git a/dlls/monster/CScriptedSentence.cpp b/dlls/monster/CScriptedSentence.cpp
@@ -3,7 +3,7 @@
 #include "cbase.h"
 #include "monsters.h"
 #include "schedule.h"
-#include "scripted.h"
+#include "CCineMonster.h"
 #include "defaultai.h"
 
 class CScriptedSentence : public CBaseToggle

diff --git a/dlls/monster/CTalkSquadMonster.cpp b/dlls/monster/CTalkSquadMonster.cpp
@@ -19,7 +19,7 @@
 #include "schedule.h"
 #include "CTalkSquadMonster.h"
 #include "defaultai.h"
-#include "scripted.h"
+#include "CCineMonster.h"
 #include "env/CSoundEnt.h"
 #include "animation.h"
 #include "plane.h"

diff --git a/dlls/monster/defaultai.cpp b/dlls/monster/defaultai.cpp
@@ -23,7 +23,7 @@
 #include	"defaultai.h"
 #include	"env/CSoundEnt.h"
 #include	"nodes.h"
-#include	"scripted.h"
+#include	"CCineMonster.h"
 
 //=========================================================
 // Fail

diff --git a/dlls/nodes.cpp → dlls/monster/nodes.cpp b/dlls/nodes.cpp → dlls/monster/nodes.cpp
diff --git a/dlls/nodes.h → dlls/monster/nodes.h b/dlls/nodes.h → dlls/monster/nodes.h
diff --git a/dlls/scriptevent.h → dlls/monster/scriptevent.h b/dlls/scriptevent.h → dlls/monster/scriptevent.h