Merge pull request #4 from dreamstalker/master

Optimized compilation time on linux

regamedll/common/entity_state.h

@@ -110,7 +110,7 @@ struct entity_state_s
 
 };/* size: 340, cachelines: 6, members: 62 */
 
-struct clientdata_s
+typedef struct clientdata_s
 {
 	Vector origin;
 	Vector velocity;

regamedll/dlls/bmodels.h

@@ -43,6 +43,10 @@
 #define SF_CONVEYOR_VISUAL	0x0001
 #define SF_CONVEYOR_NOTSOLID	0x0002
 
+#define SF_WORLD_DARK		0x0001		// Fade from black at startup
+#define SF_WORLD_TITLE		0x0002		// Display game title at startup
+#define SF_WORLD_FORCETEAM	0x0004		// Force teams
+
 #define FANPITCHMIN		30
 #define FANPITCHMAX		100
 

regamedll/dlls/cbase.cpp

@@ -1,5 +1,4 @@
 #include "precompiled.h"
-#include "game_shared/perf_counter.h"
 
 /*
 * Globals initialization

regamedll/dlls/cbase.h

@@ -35,6 +35,7 @@
 #include "monsterevent.h"
 
 #include <utlvector.h>
+#include "game_shared/perf_counter.h"
 
 #undef CREATE_NAMED_ENTITY
 #undef REMOVE_ENTITY

regamedll/dlls/client.cpp

@@ -1,5 +1,4 @@
 #include "precompiled.h"
-#include "entity_state.h"
 
 /*
 * Globals initialization

regamedll/dlls/client.h

@@ -213,7 +213,7 @@ void Custom_Entity_FieldInit(delta_s *pFields);
 void Custom_Encode(struct delta_s *pFields, const unsigned char *from, const unsigned char *to);
 void RegisterEncoders(void);
 int GetWeaponData(edict_s *player, struct weapon_data_s *info);
-void UpdateClientData(const edict_s *ent, int sendweapons, clientdata_s *cd);
+void UpdateClientData(const edict_s *ent, int sendweapons, struct clientdata_s *cd);
 void CmdStart(const edict_t *player, const struct usercmd_s *cmd, unsigned int random_seed);
 void CmdEnd(const edict_t *player);
 int ConnectionlessPacket(const struct netadr_s *net_from, const char *args, char *response_buffer, int *response_buffer_size);

regamedll/dlls/combat.cpp

@@ -1,9 +1,5 @@
 #include "precompiled.h"
 
-#define GERMAN_GIB_COUNT	4
-#define HUMAN_GIB_COUNT		6
-#define ALIEN_GIB_COUNT		4
-
 /* <5f4cb> ../cstrike/dlls/combat.cpp:52 */
 void CGib::LimitVelocity(void)
 {

regamedll/dlls/h_ai.cpp

@@ -1,8 +1,5 @@
 #include "precompiled.h"
 
-#define NUM_LATERAL_CHECKS		13	// how many checks are made on each side of a monster looking for lateral cover
-#define NUM_LATERAL_LOS_CHECKS		6	// how many checks are made on each side of a monster looking for lateral cover
-
 /*
 * Globals initialization
 */

regamedll/dlls/h_ai.h

@@ -32,6 +32,9 @@
 #pragma once
 #endif
 
+#define NUM_LATERAL_CHECKS		13	// how many checks are made on each side of a monster looking for lateral cover
+#define NUM_LATERAL_LOS_CHECKS		6	// how many checks are made on each side of a monster looking for lateral cover
+
 NOXREF BOOL FBoxVisible(entvars_t *pevLooker, entvars_t *pevTarget, Vector &vecTargetOrigin, float flSize);
 NOXREF Vector VecCheckToss(entvars_t *pev, const Vector &vecSpot1, Vector vecSpot2, float flGravityAdj);
 NOXREF Vector VecCheckThrow(entvars_t *pev, const Vector &vecSpot1, Vector vecSpot2, float flSpeed, float flGravityAdj);

regamedll/dlls/player.cpp

@@ -1,8 +1,5 @@
 #include "precompiled.h"
 
-#define DEFINE_WEAPON(m_wpnid, m_cost, m_slotnum, m_acost)\
-	{ m_wpnid, m_cost, 3, m_slotnum, m_acost }
-
 /*
 * Globals initialization
 */

regamedll/dlls/player.h

@@ -270,6 +270,9 @@ struct WeaponStruct
 
 };/* size: 20, cachelines: 1, members: 5 */
 
+#define DEFINE_WEAPON(m_wpnid, m_cost, m_slotnum, m_acost)\
+	{ m_wpnid, m_cost, 3, m_slotnum, m_acost }
+
 #ifdef HOOK_GAMEDLL
 
 #define m_szPoses (*pm_szPoses)

regamedll/dlls/sound.cpp

@@ -1,5 +1,4 @@
 #include "precompiled.h"
-#include "talkmonster.h"
 
 #ifndef HOOK_GAMEDLL
 

regamedll/dlls/tutor_cs_tutor.cpp

@@ -1,5 +1,4 @@
 #include "precompiled.h"
-#include <string>
 
 /*
 * Globals initialization

regamedll/dlls/util.h

@@ -89,6 +89,10 @@ extern globalvars_t *gpGlobals;
 #define BLOOD_COLOR_YELLOW	(byte)195
 #define BLOOD_COLOR_GREEN	BLOOD_COLOR_YELLOW
 
+#define GERMAN_GIB_COUNT	4
+#define HUMAN_GIB_COUNT		6
+#define ALIEN_GIB_COUNT		4
+
 #define LANGUAGE_ENGLISH	0
 #define LANGUAGE_GERMAN		1
 #define LANGUAGE_FRENCH		2

regamedll/dlls/world.cpp

@@ -1,9 +1,5 @@
 #include "precompiled.h"
 
-#define SF_WORLD_DARK		0x0001		// Fade from black at startup
-#define SF_WORLD_TITLE		0x0002		// Display game title at startup
-#define SF_WORLD_FORCETEAM	0x0004		// Force teams
-
 edict_t *g_pBodyQueueHead;
 CGlobalState gGlobalState;
 float g_flWeaponCheat;

regamedll/dlls/wpn_shared.h

@@ -0,0 +1,598 @@
+#pragma once
+
+//AK47
+#define AK47_MAX_SPEED			221
+#define AK47_DAMAGE			36
+#define AK47_RANGE_MODIFER		0.98
+#define AK47_RELOAD_TIME		2.45
+
+enum ak47_e
+{
+	AK47_IDLE1,
+	AK47_RELOAD,
+	AK47_DRAW,
+	AK47_SHOOT1,
+	AK47_SHOOT2,
+	AK47_SHOOT3
+};
+
+
+
+//AUG
+#define AUG_MAX_SPEED			240
+#define AUG_DAMAGE			32
+#define AUG_RANGE_MODIFER		0.96
+#define AUG_RELOAD_TIME			3.3
+
+enum aug_e
+{
+	AUG_IDLE1,
+	AUG_RELOAD,
+	AUG_DRAW,
+	AUG_SHOOT1,
+	AUG_SHOOT2,
+	AUG_SHOOT3
+};
+
+
+
+//AWP
+#define AWP_MAX_SPEED		210
+#define AWP_MAX_SPEED_ZOOM	150
+#define AWP_DAMAGE		115
+#define AWP_RANGE_MODIFER	0.99
+#define AWP_RELOAD_TIME		2.5
+
+enum awp_e
+{
+	AWP_IDLE,
+	AWP_SHOOT,
+	AWP_SHOOT2,
+	AWP_SHOOT3,
+	AWP_RELOAD,
+	AWP_DRAW,
+};
+
+
+
+//C4
+#define C4_MAX_AMMO		1
+#define C4_MAX_SPEED		250.0
+#define C4_ARMING_ON_TIME	3.0
+
+enum c4_e
+{
+	C4_IDLE1,
+	C4_DRAW,
+	C4_DROP,
+	C4_ARM
+};
+
+
+
+//Deagle
+#define DEAGLE_MAX_SPEED	250
+#define DEAGLE_DAMAGE		54
+#define DEAGLE_RANGE_MODIFER	0.81
+#define DEAGLE_RELOAD_TIME	2.2
+
+enum deagle_e
+{
+	DEAGLE_IDLE1,
+	DEAGLE_SHOOT1,
+	DEAGLE_SHOOT2,
+	DEAGLE_SHOOT_EMPTY,
+	DEAGLE_RELOAD,
+	DEAGLE_DRAW
+};
+
+
+
+//Elites
+#define ELITE_MAX_SPEED		250
+#define ELITE_RELOAD_TIME	4.5
+#define ELITE_DAMAGE		36
+#define ELITE_RANGE_MODIFER	0.75
+
+enum elite_e
+{
+	ELITE_IDLE,
+	ELITE_IDLE_LEFTEMPTY,
+	ELITE_SHOOTLEFT1,
+	ELITE_SHOOTLEFT2,
+	ELITE_SHOOTLEFT3,
+	ELITE_SHOOTLEFT4,
+	ELITE_SHOOTLEFT5,
+	ELITE_SHOOTLEFTLAST,
+	ELITE_SHOOTRIGHT1,
+	ELITE_SHOOTRIGHT2,
+	ELITE_SHOOTRIGHT3,
+	ELITE_SHOOTRIGHT4,
+	ELITE_SHOOTRIGHT5,
+	ELITE_SHOOTRIGHTLAST,
+	ELITE_RELOAD,
+	ELITE_DRAW
+};
+
+
+
+//Famas
+#define FAMAS_MAX_SPEED		240
+#define FAMAS_RELOAD_TIME	3.3
+#define FAMAS_DAMAGE		30
+#define FAMAS_DAMAGE_BURST	34
+#define FAMAS_RANGE_MODIFER	0.96
+
+enum famas_e
+{
+	FAMAS_IDLE1,
+	FAMAS_RELOAD,
+	FAMAS_DRAW,
+	FAMAS_SHOOT1,
+	FAMAS_SHOOT2,
+	FAMAS_SHOOT3
+};
+
+
+
+//Fiveseven
+#define FIVESEVEN_MAX_SPEED		250
+#define FIVESEVEN_DAMAGE		20
+#define FIVESEVEN_RANGE_MODIFER		0.885
+#define FIVESEVEN_RELOAD_TIME		2.7
+
+enum fiveseven_e
+{
+	FIVESEVEN_IDLE,
+	FIVESEVEN_SHOOT1,
+	FIVESEVEN_SHOOT2,
+	FIVESEVEN_SHOOT_EMPTY,
+	FIVESEVEN_RELOAD,
+	FIVESEVEN_DRAW
+};
+
+
+
+//Flashbang
+#define FLASHBANG_MAX_SPEED		250
+#define FLASHBANG_MAX_SPEED_SHIELD	180
+
+enum flashbang_e
+{
+	FLASHBANG_IDLE,
+	FLASHBANG_PULLPIN,
+	FLASHBANG_THROW,
+	FLASHBANG_DRAW
+};
+
+
+
+//g3sg1
+#define G3SG1_MAX_SPEED		210
+#define G3SG1_MAX_SPEED_ZOOM	150
+#define G3SG1_DAMAGE		80
+#define G3SG1_RANGE_MODIFER	0.98
+#define G3SG1_RELOAD_TIME	3.5
+
+enum g3sg1_e
+{
+	G3SG1_IDLE,
+	G3SG1_SHOOT,
+	G3SG1_SHOOT2,
+	G3SG1_RELOAD,
+	G3SG1_DRAW
+};
+
+
+
+//galil
+#define GALIL_MAX_SPEED			240
+#define GALIL_DAMAGE			30
+#define GALIL_RANGE_MODIFER		0.98
+#define GALIL_RELOAD_TIME		2.45
+
+enum galil_e
+{
+	GALIL_IDLE1,
+	GALIL_RELOAD,
+	GALIL_DRAW,
+	GALIL_SHOOT1,
+	GALIL_SHOOT2,
+	GALIL_SHOOT3
+};
+
+
+
+//glock18
+#define GLOCK18_MAX_SPEED		250
+#define GLOCK18_DAMAGE			25
+#define GLOCK18_RANGE_MODIFER		0.75
+#define GLOCK18_RELOAD_TIME		2.2
+
+enum glock18_e
+{
+	GLOCK18_IDLE1,
+	GLOCK18_IDLE2,
+	GLOCK18_IDLE3,
+	GLOCK18_SHOOT,
+	GLOCK18_SHOOT2,
+	GLOCK18_SHOOT3,
+	GLOCK18_SHOOT_EMPTY,
+	GLOCK18_RELOAD,
+	GLOCK18_DRAW,
+	GLOCK18_HOLSTER,
+	GLOCK18_ADD_SILENCER,
+	GLOCK18_DRAW2,
+	GLOCK18_RELOAD2
+};
+
+enum glock18_shield_e
+{
+	GLOCK18_SHIELD_IDLE1,
+	GLOCK18_SHIELD_SHOOT,
+	GLOCK18_SHIELD_SHOOT2,
+	GLOCK18_SHIELD_SHOOT_EMPTY,
+	GLOCK18_SHIELD_RELOAD,
+	GLOCK18_SHIELD_DRAW,
+	GLOCK18_SHIELD_IDLE,
+	GLOCK18_SHIELD_UP,
+	GLOCK18_SHIELD_DOWN
+};
+
+
+
+//hegrenade
+#define HEGRENADE_MAX_SPEED		250
+#define HEGRENADE_MAX_SPEED_SHIELD	180
+
+enum hegrenade_e
+{
+	HEGRENADE_IDLE,
+	HEGRENADE_PULLPIN,
+	HEGRENADE_THROW,
+	HEGRENADE_DRAW
+};
+
+
+
+//knife
+#define KNIFE_BODYHIT_VOLUME		128
+#define KNIFE_WALLHIT_VOLUME		512
+#define KNIFE_MAX_SPEED			250
+#define KNIFE_MAX_SPEED_SHIELD		180
+
+enum knife_e
+{
+	KNIFE_IDLE,
+	KNIFE_ATTACK1HIT,
+	KNIFE_ATTACK2HIT,
+	KNIFE_DRAW,
+	KNIFE_STABHIT,
+	KNIFE_STABMISS,
+	KNIFE_MIDATTACK1HIT,
+	KNIFE_MIDATTACK2HIT
+};
+
+enum knife_shield_e
+{
+	KNIFE_SHIELD_IDLE,
+	KNIFE_SHIELD_SLASH,
+	KNIFE_SHIELD_ATTACKHIT,
+	KNIFE_SHIELD_DRAW,
+	KNIFE_SHIELD_UPIDLE,
+	KNIFE_SHIELD_UP,
+	KNIFE_SHIELD_DOWN
+};
+
+
+
+//m3
+#define M3_MAX_SPEED		230
+#define M3_CONE_VECTOR		Vector(0.0675, 0.0675, 0.0)	// special shotgun spreads
+
+enum m3_e
+{
+	M3_IDLE,
+	M3_FIRE1,
+	M3_FIRE2,
+	M3_RELOAD,
+	M3_PUMP,
+	M3_START_RELOAD,
+	M3_DRAW,
+	M3_HOLSTER
+};
+
+
+
+//m4a1
+#define M4A1_MAX_SPEED		230
+#define M4A1_DAMAGE		32
+#define M4A1_DAMAGE_SIL		33
+#define M4A1_RANGE_MODIFER      0.97
+#define M4A1_RANGE_MODIFER_SIL  0.95
+#define M4A1_RELOAD_TIME	3.05
+
+enum m4a1_e
+{
+	M4A1_IDLE,
+	M4A1_SHOOT1,
+	M4A1_SHOOT2,
+	M4A1_SHOOT3,
+	M4A1_RELOAD,
+	M4A1_DRAW,
+	M4A1_ATTACH_SILENCER,
+	M4A1_UNSIL_IDLE,
+	M4A1_UNSIL_SHOOT1,
+	M4A1_UNSIL_SHOOT2,
+	M4A1_UNSIL_SHOOT3,
+	M4A1_UNSIL_RELOAD,
+	M4A1_UNSIL_DRAW,
+	M4A1_DETACH_SILENCER
+};
+
+
+
+//m249
+#define M249_MAX_SPEED			220
+#define M249_DAMAGE			32
+#define M249_RANGE_MODIFER		0.97
+#define M249_RELOAD_TIME		4.7
+
+enum m249_e
+{
+	M249_IDLE1,
+	M249_SHOOT1,
+	M249_SHOOT2,
+	M249_RELOAD,
+	M249_DRAW
+};
+
+
+
+//mac10
+#define MAC10_MAX_SPEED			250
+#define MAC10_DAMAGE			29
+#define MAC10_RANGE_MODIFER		0.82
+#define MAC10_RELOAD_TIME		3.15
+
+enum mac10_e
+{
+	MAC10_IDLE1,
+	MAC10_RELOAD,
+	MAC10_DRAW,
+	MAC10_SHOOT1,
+	MAC10_SHOOT2,
+	MAC10_SHOOT3
+};
+
+
+
+//mp5navy
+#define MP5N_MAX_SPEED			250
+#define MP5N_DAMAGE			26
+#define MP5N_RANGE_MODIFER		0.84
+#define MP5N_RELOAD_TIME		2.63
+
+enum mp5n_e
+{
+	MP5N_IDLE1,
+	MP5N_RELOAD,
+	MP5N_DRAW,
+	MP5N_SHOOT1,
+	MP5N_SHOOT2,
+	MP5N_SHOOT3
+};
+
+
+
+//p90
+#define P90_MAX_SPEED		245
+#define P90_DAMAGE		21
+#define P90_RANGE_MODIFER	0.885
+#define P90_RELOAD_TIME		3.4
+
+enum p90_e
+{
+	P90_IDLE1,
+	P90_RELOAD,
+	P90_DRAW,
+	P90_SHOOT1,
+	P90_SHOOT2,
+	P90_SHOOT3
+};
+
+
+
+//p228
+#define P228_MAX_SPEED		250
+#define P228_DAMAGE		32
+#define P228_RANGE_MODIFER	0.8
+#define P228_RELOAD_TIME	2.7
+
+enum p228_e
+{
+	P228_IDLE,
+	P228_SHOOT1,
+	P228_SHOOT2,
+	P228_SHOOT3,
+	P228_SHOOT_EMPTY,
+	P228_RELOAD,
+	P228_DRAW
+};
+
+enum p228_shield_e
+{
+	P228_SHIELD_IDLE,
+	P228_SHIELD_SHOOT1,
+	P228_SHIELD_SHOOT2,
+	P228_SHIELD_SHOOT_EMPTY,
+	P228_SHIELD_RELOAD,
+	P228_SHIELD_DRAW,
+	P228_SHIELD_IDLE_UP,
+	P228_SHIELD_UP,
+	P228_SHIELD_DOWN
+};
+
+
+
+//scout
+#define SCOUT_MAX_SPEED			260
+#define SCOUT_MAX_SPEED_ZOOM		220
+#define SCOUT_DAMAGE			75
+#define SCOUT_RANGE_MODIFER		0.98
+#define SCOUT_RELOAD_TIME		2
+
+enum scout_e
+{
+	SCOUT_IDLE,
+	SCOUT_SHOOT,
+	SCOUT_SHOOT2,
+	SCOUT_RELOAD,
+	SCOUT_DRAW
+};
+
+
+
+//sg550
+#define SG550_MAX_SPEED			210
+#define SG550_MAX_SPEED_ZOOM		150
+#define SG550_DAMAGE			70
+#define SG550_RANGE_MODIFER		0.98
+#define SG550_RELOAD_TIME		3.35
+
+enum sg550_e
+{
+	SG550_IDLE,
+	SG550_SHOOT,
+	SG550_SHOOT2,
+	SG550_RELOAD,
+	SG550_DRAW
+};
+
+
+
+//sg552
+#define SG552_MAX_SPEED			235
+#define SG552_MAX_SPEED_ZOOM		200
+#define SG552_DAMAGE			33
+#define SG552_RANGE_MODIFER		0.955
+#define SG552_RELOAD_TIME		3
+
+enum sg552_e
+{
+	SG552_IDLE1,
+	SG552_RELOAD,
+	SG552_DRAW,
+	SG552_SHOOT1,
+	SG552_SHOOT2,
+	SG552_SHOOT3
+};
+
+
+
+//smokegrenade
+#define SMOKEGRENADE_MAX_SPEED		250
+#define SMOKEGRENADE_MAX_SPEED_SHIELD	180
+
+enum smokegrenade_e
+{
+	SMOKEGRENADE_IDLE,
+	SMOKEGRENADE_PINPULL,
+	SMOKEGRENADE_THROW,
+	SMOKEGRENADE_DRAW
+};
+
+
+
+//tmp
+#define TMP_MAX_SPEED			250
+#define TMP_DAMAGE			20
+#define TMP_RANGE_MODIFER		0.85
+#define TMP_RELOAD_TIME			2.12
+
+enum tmp_e
+{
+	TMP_IDLE1,
+	TMP_RELOAD,
+	TMP_DRAW,
+	TMP_SHOOT1,
+	TMP_SHOOT2,
+	TMP_SHOOT3
+};
+
+
+
+//ump45
+#define UMP45_MAX_SPEED			250
+#define UMP45_DAMAGE			30
+#define UMP45_RANGE_MODIFER		0.82
+#define UMP45_RELOAD_TIME		3.5
+
+enum ump45_e
+{
+	UMP45_IDLE1,
+	UMP45_RELOAD,
+	UMP45_DRAW,
+	UMP45_SHOOT1,
+	UMP45_SHOOT2,
+	UMP45_SHOOT3
+};
+
+
+
+//tmp
+#define USP_MAX_SPEED		250
+#define USP_DAMAGE		34
+#define USP_DAMAGE_SIL		30
+#define USP_RANGE_MODIFER	0.79
+#define USP_RELOAD_TIME		2.7
+
+enum usp_e
+{
+	USP_IDLE,
+	USP_SHOOT1,
+	USP_SHOOT2,
+	USP_SHOOT3,
+	USP_SHOOT_EMPTY,
+	USP_RELOAD,
+	USP_DRAW,
+	USP_ATTACH_SILENCER,
+	USP_UNSIL_IDLE,
+	USP_UNSIL_SHOOT1,
+	USP_UNSIL_SHOOT2,
+	USP_UNSIL_SHOOT3,
+	USP_UNSIL_SHOOT_EMPTY,
+	USP_UNSIL_RELOAD,
+	USP_UNSIL_DRAW,
+	USP_DETACH_SILENCER
+};
+
+enum usp_shield_e
+{
+	USP_SHIELD_IDLE,
+	USP_SHIELD_SHOOT1,
+	USP_SHIELD_SHOOT2,
+	USP_SHIELD_SHOOT_EMPTY,
+	USP_SHIELD_RELOAD,
+	USP_SHIELD_DRAW,
+	USP_SHIELD_UP_IDLE,
+	USP_SHIELD_UP,
+	USP_SHIELD_DOWN
+};
+
+
+
+//xm1014
+#define XM1014_MAX_SPEED	240
+#define XM1014_CONE_VECTOR	Vector(0.0725, 0.0725, 0.0)	// special shotgun spreads
+
+enum xm1014_e
+{
+	XM1014_IDLE,
+	XM1014_FIRE1,
+	XM1014_FIRE2,
+	XM1014_RELOAD,
+	XM1014_PUMP,
+	XM1014_START_RELOAD,
+	XM1014_DRAW
+};

regamedll/dlls/wpn_shared/wpn_ak47.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define AK47_MAX_SPEED			221
-
-#define AK47_DAMAGE			36
-#define AK47_RANGE_MODIFER		0.98
-
-#define AK47_RELOAD_TIME		2.45
-
-enum ak47_e
-{
-	AK47_IDLE1,
-	AK47_RELOAD,
-	AK47_DRAW,
-	AK47_SHOOT1,
-	AK47_SHOOT2,
-	AK47_SHOOT3
-};
-
 /* <23556d> ../cstrike/dlls/wpn_shared/wpn_ak47.cpp:50 */
 LINK_ENTITY_TO_CLASS(weapon_ak47, CAK47);
 

regamedll/dlls/wpn_shared/wpn_aug.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define AUG_MAX_SPEED			240
-
-#define AUG_DAMAGE			32
-#define AUG_RANGE_MODIFER		0.96
-
-#define AUG_RELOAD_TIME			3.3
-
-enum aug_e
-{
-	AUG_IDLE1,
-	AUG_RELOAD,
-	AUG_DRAW,
-	AUG_SHOOT1,
-	AUG_SHOOT2,
-	AUG_SHOOT3
-};
-
 /* <23a81f> ../cstrike/dlls/wpn_shared/wpn_aug.cpp:50 */
 LINK_ENTITY_TO_CLASS(weapon_aug, CAUG);
 

regamedll/dlls/wpn_shared/wpn_awp.cpp

@@ -1,23 +1,5 @@
 #include "precompiled.h"
 
-#define AWP_MAX_SPEED		210
-#define AWP_MAX_SPEED_ZOOM	150
-
-#define AWP_DAMAGE		115
-#define AWP_RANGE_MODIFER	0.99
-
-#define AWP_RELOAD_TIME		2.5
-
-enum awp_e
-{
-	AWP_IDLE,
-	AWP_SHOOT,
-	AWP_SHOOT2,
-	AWP_SHOOT3,
-	AWP_RELOAD,
-	AWP_DRAW,
-};
-
 /* <23fdac> ../cstrike/dlls/wpn_shared/wpn_awp.cpp:50 */
 LINK_ENTITY_TO_CLASS(weapon_awp, CAWP);
 

regamedll/dlls/wpn_shared/wpn_c4.cpp

@@ -1,17 +1,5 @@
 #include "precompiled.h"
 
-#define C4_MAX_AMMO		1
-#define C4_MAX_SPEED		250.0
-#define C4_ARMING_ON_TIME	3.0
-
-enum c4_e
-{
-	C4_IDLE1,
-	C4_DRAW,
-	C4_DROP,
-	C4_ARM
-};
-
 /* <246a03> ../cstrike/dlls/wpn_shared/wpn_c4.cpp:48 */
 LINK_ENTITY_TO_CLASS(weapon_c4, CC4);
 

regamedll/dlls/wpn_shared/wpn_deagle.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define DEAGLE_MAX_SPEED	250
-
-#define DEAGLE_DAMAGE		54
-#define DEAGLE_RANGE_MODIFER	0.81
-
-#define DEAGLE_RELOAD_TIME	2.2
-
-enum deagle_e
-{
-	DEAGLE_IDLE1,
-	DEAGLE_SHOOT1,
-	DEAGLE_SHOOT2,
-	DEAGLE_SHOOT_EMPTY,
-	DEAGLE_RELOAD,
-	DEAGLE_DRAW
-};
-
 /* <24be52> ../cstrike/dlls/wpn_shared/wpn_deagle.cpp:49 */
 LINK_ENTITY_TO_CLASS(weapon_deagle, CDEAGLE);
 

regamedll/dlls/wpn_shared/wpn_elite.cpp

@@ -1,31 +1,5 @@
 #include "precompiled.h"
 
-#define ELITE_MAX_SPEED		250
-#define ELITE_RELOAD_TIME	4.5
-
-#define ELITE_DAMAGE		36
-#define ELITE_RANGE_MODIFER	0.75
-
-enum elite_e
-{
-	ELITE_IDLE,
-	ELITE_IDLE_LEFTEMPTY,
-	ELITE_SHOOTLEFT1,
-	ELITE_SHOOTLEFT2,
-	ELITE_SHOOTLEFT3,
-	ELITE_SHOOTLEFT4,
-	ELITE_SHOOTLEFT5,
-	ELITE_SHOOTLEFTLAST,
-	ELITE_SHOOTRIGHT1,
-	ELITE_SHOOTRIGHT2,
-	ELITE_SHOOTRIGHT3,
-	ELITE_SHOOTRIGHT4,
-	ELITE_SHOOTRIGHT5,
-	ELITE_SHOOTRIGHTLAST,
-	ELITE_RELOAD,
-	ELITE_DRAW
-};
-
 /* <25137f> ../cstrike/dlls/wpn_shared/wpn_elite.cpp:52 */
 LINK_ENTITY_TO_CLASS(weapon_elite, CELITE);
 

regamedll/dlls/wpn_shared/wpn_famas.cpp

@@ -1,23 +1,5 @@
 #include "precompiled.h"
 
-enum famas_e
-{
-	FAMAS_IDLE1,
-	FAMAS_RELOAD,
-	FAMAS_DRAW,
-	FAMAS_SHOOT1,
-	FAMAS_SHOOT2,
-	FAMAS_SHOOT3
-};
-
-#define FAMAS_MAX_SPEED		240
-#define FAMAS_RELOAD_TIME	3.3
-
-#define FAMAS_DAMAGE		30
-#define FAMAS_DAMAGE_BURST	34
-
-#define FAMAS_RANGE_MODIFER	0.96
-
 /* <2c0549> ../cstrike/dlls/wpn_shared/wpn_famas.cpp:50 */
 LINK_ENTITY_TO_CLASS(weapon_famas, CFamas);
 

regamedll/dlls/wpn_shared/wpn_fiveseven.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define FIVESEVEN_MAX_SPEED		250
-
-#define FIVESEVEN_DAMAGE		20
-#define FIVESEVEN_RANGE_MODIFER		0.885
-
-#define FIVESEVEN_RELOAD_TIME		2.7
-
-enum fiveseven_e
-{
-	FIVESEVEN_IDLE,
-	FIVESEVEN_SHOOT1,
-	FIVESEVEN_SHOOT2,
-	FIVESEVEN_SHOOT_EMPTY,
-	FIVESEVEN_RELOAD,
-	FIVESEVEN_DRAW
-};
-
 /* <25698d> ../cstrike/dlls/wpn_shared/wpn_fiveseven.cpp:49 */
 LINK_ENTITY_TO_CLASS(weapon_fiveseven, CFiveSeven);
 

regamedll/dlls/wpn_shared/wpn_flashbang.cpp

@@ -1,16 +1,5 @@
 #include "precompiled.h"
 
-#define FLASHBANG_MAX_SPEED		250
-#define FLASHBANG_MAX_SPEED_SHIELD	180
-
-enum flashbang_e
-{
-	FLASHBANG_IDLE,
-	FLASHBANG_PULLPIN,
-	FLASHBANG_THROW,
-	FLASHBANG_DRAW
-};
-
 /* <25ba9b> ../cstrike/dlls/wpn_shared/wpn_flashbang.cpp:37 */
 LINK_ENTITY_TO_CLASS(weapon_flashbang, CFlashbang);
 

regamedll/dlls/wpn_shared/wpn_g3sg1.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define G3SG1_MAX_SPEED		210
-#define G3SG1_MAX_SPEED_ZOOM	150
-
-#define G3SG1_DAMAGE		80
-#define G3SG1_RANGE_MODIFER	0.98
-
-#define G3SG1_RELOAD_TIME	3.5
-
-enum g3sg1_e
-{
-	G3SG1_IDLE,
-	G3SG1_SHOOT,
-	G3SG1_SHOOT2,
-	G3SG1_RELOAD,
-	G3SG1_DRAW
-};
-
 /* <260ef4> ../cstrike/dlls/wpn_shared/wpn_g3sg1.cpp:48 */
 LINK_ENTITY_TO_CLASS(weapon_g3sg1, CG3SG1);
 

regamedll/dlls/wpn_shared/wpn_galil.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define GALIL_MAX_SPEED			240
-
-#define GALIL_DAMAGE			30
-#define GALIL_RANGE_MODIFER		0.98
-
-#define GALIL_RELOAD_TIME		2.45
-
-enum galil_e
-{
-	GALIL_IDLE1,
-	GALIL_RELOAD,
-	GALIL_DRAW,
-	GALIL_SHOOT1,
-	GALIL_SHOOT2,
-	GALIL_SHOOT3
-};
-
 /* <2c5a1c> ../cstrike/dlls/wpn_shared/wpn_galil.cpp:50 */
 LINK_ENTITY_TO_CLASS(weapon_galil, CGalil);
 

regamedll/dlls/wpn_shared/wpn_glock18.cpp

@@ -1,42 +1,5 @@
 #include "precompiled.h"
 
-#define GLOCK18_MAX_SPEED		250
-
-#define GLOCK18_DAMAGE			25
-#define GLOCK18_RANGE_MODIFER		0.75
-
-#define GLOCK18_RELOAD_TIME		2.2
-
-enum glock18_e
-{
-	GLOCK18_IDLE1,
-	GLOCK18_IDLE2,
-	GLOCK18_IDLE3,
-	GLOCK18_SHOOT,
-	GLOCK18_SHOOT2,
-	GLOCK18_SHOOT3,
-	GLOCK18_SHOOT_EMPTY,
-	GLOCK18_RELOAD,
-	GLOCK18_DRAW,
-	GLOCK18_HOLSTER,
-	GLOCK18_ADD_SILENCER,
-	GLOCK18_DRAW2,
-	GLOCK18_RELOAD2
-};
-
-enum glock18_shield_e
-{
-	GLOCK18_SHIELD_IDLE1,
-	GLOCK18_SHIELD_SHOOT,
-	GLOCK18_SHIELD_SHOOT2,
-	GLOCK18_SHIELD_SHOOT_EMPTY,
-	GLOCK18_SHIELD_RELOAD,
-	GLOCK18_SHIELD_DRAW,
-	GLOCK18_SHIELD_IDLE,
-	GLOCK18_SHIELD_UP,
-	GLOCK18_SHIELD_DOWN
-};
-
 /* <2662bb> ../cstrike/dlls/wpn_shared/wpn_glock18.cpp:68 */
 LINK_ENTITY_TO_CLASS(weapon_glock18, CGLOCK18);
 

regamedll/dlls/wpn_shared/wpn_hegrenade.cpp

@@ -1,16 +1,5 @@
 #include "precompiled.h"
 
-#define HEGRENADE_MAX_SPEED		250
-#define HEGRENADE_MAX_SPEED_SHIELD	180
-
-enum hegrenade_e
-{
-	HEGRENADE_IDLE,
-	HEGRENADE_PULLPIN,
-	HEGRENADE_THROW,
-	HEGRENADE_DRAW
-};
-
 /* <26b3cd> ../cstrike/dlls/wpn_shared/wpn_hegrenade.cpp:38 */
 LINK_ENTITY_TO_CLASS(weapon_hegrenade, CHEGrenade);
 

regamedll/dlls/wpn_shared/wpn_knife.cpp

@@ -1,34 +1,5 @@
 #include "precompiled.h"
 
-#define KNIFE_BODYHIT_VOLUME		128
-#define KNIFE_WALLHIT_VOLUME		512
-
-#define KNIFE_MAX_SPEED			250
-#define KNIFE_MAX_SPEED_SHIELD		180
-
-enum knife_e
-{
-	KNIFE_IDLE,
-	KNIFE_ATTACK1HIT,
-	KNIFE_ATTACK2HIT,
-	KNIFE_DRAW,
-	KNIFE_STABHIT,
-	KNIFE_STABMISS,
-	KNIFE_MIDATTACK1HIT,
-	KNIFE_MIDATTACK2HIT
-};
-
-enum knife_shield_e
-{
-	KNIFE_SHIELD_IDLE,
-	KNIFE_SHIELD_SLASH,
-	KNIFE_SHIELD_ATTACKHIT,
-	KNIFE_SHIELD_DRAW,
-	KNIFE_SHIELD_UPIDLE,
-	KNIFE_SHIELD_UP,
-	KNIFE_SHIELD_DOWN
-};
-
 /* <270ca6> ../cstrike/dlls/wpn_shared/wpn_knife.cpp:28 */
 LINK_ENTITY_TO_CLASS(weapon_knife, CKnife);
 

regamedll/dlls/wpn_shared/wpn_m249.cpp

@@ -1,21 +1,5 @@
 #include "precompiled.h"
 
-#define M249_MAX_SPEED			220
-
-#define M249_DAMAGE			32
-#define M249_RANGE_MODIFER		0.97
-
-#define M249_RELOAD_TIME		4.7
-
-enum m249_e
-{
-	M249_IDLE1,
-	M249_SHOOT1,
-	M249_SHOOT2,
-	M249_RELOAD,
-	M249_DRAW
-};
-
 /* <276bbd> ../cstrike/dlls/wpn_shared/wpn_m249.cpp:49 */
 LINK_ENTITY_TO_CLASS(weapon_m249, CM249);
 

regamedll/dlls/wpn_shared/wpn_m3.cpp

@@ -1,20 +1,5 @@
 #include "precompiled.h"
 
-#define M3_MAX_SPEED		230
-#define M3_CONE_VECTOR		Vector(0.0675, 0.0675, 0.0)	// special shotgun spreads
-
-enum m3_e
-{
-	M3_IDLE,
-	M3_FIRE1,
-	M3_FIRE2,
-	M3_RELOAD,
-	M3_PUMP,
-	M3_START_RELOAD,
-	M3_DRAW,
-	M3_HOLSTER
-};
-
 /* <27bf59> ../cstrike/dlls/wpn_shared/wpn_m3.cpp:52 */
 LINK_ENTITY_TO_CLASS(weapon_m3, CM3);
 

regamedll/dlls/wpn_shared/wpn_m4a1.cpp

@@ -1,33 +1,5 @@
 #include "precompiled.h"
 
-#define M4A1_MAX_SPEED		230
-
-#define M4A1_DAMAGE		32
-#define M4A1_DAMAGE_SIL		33
-
-#define M4A1_RANGE_MODIFER      0.97
-#define M4A1_RANGE_MODIFER_SIL  0.95
-
-#define M4A1_RELOAD_TIME	3.05
-
-enum m4a1_e
-{
-	M4A1_IDLE,
-	M4A1_SHOOT1,
-	M4A1_SHOOT2,
-	M4A1_SHOOT3,
-	M4A1_RELOAD,
-	M4A1_DRAW,
-	M4A1_ATTACH_SILENCER,
-	M4A1_UNSIL_IDLE,
-	M4A1_UNSIL_SHOOT1,
-	M4A1_UNSIL_SHOOT2,
-	M4A1_UNSIL_SHOOT3,
-	M4A1_UNSIL_RELOAD,
-	M4A1_UNSIL_DRAW,
-	M4A1_DETACH_SILENCER
-};
-
 /* <281342> ../cstrike/dlls/wpn_shared/wpn_m4a1.cpp:60 */
 LINK_ENTITY_TO_CLASS(weapon_m4a1, CM4A1);
 

regamedll/dlls/wpn_shared/wpn_mac10.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define MAC10_MAX_SPEED			250
-
-#define MAC10_DAMAGE			29
-#define MAC10_RANGE_MODIFER		0.82
-
-#define MAC10_RELOAD_TIME		3.15
-
-enum mac10_e
-{
-	MAC10_IDLE1,
-	MAC10_RELOAD,
-	MAC10_DRAW,
-	MAC10_SHOOT1,
-	MAC10_SHOOT2,
-	MAC10_SHOOT3
-};
-
 /* <2867c0> ../cstrike/dlls/wpn_shared/wpn_mac10.cpp:50 */
 LINK_ENTITY_TO_CLASS(weapon_mac10, CMAC10);
 

regamedll/dlls/wpn_shared/wpn_mp5navy.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define MP5N_MAX_SPEED			250
-
-#define MP5N_DAMAGE			26
-#define MP5N_RANGE_MODIFER		0.84
-
-#define MP5N_RELOAD_TIME		2.63
-
-enum mp5n_e
-{
-	MP5N_IDLE1,
-	MP5N_RELOAD,
-	MP5N_DRAW,
-	MP5N_SHOOT1,
-	MP5N_SHOOT2,
-	MP5N_SHOOT3
-};
-
 /* <28bbf6> ../cstrike/dlls/wpn_shared/wpn_mp5navy.cpp:50 */
 LINK_ENTITY_TO_CLASS(weapon_mp5navy, CMP5N);
 

regamedll/dlls/wpn_shared/wpn_p228.cpp

@@ -1,36 +1,5 @@
 #include "precompiled.h"
 
-#define P228_MAX_SPEED		250
-
-#define P228_DAMAGE		32
-#define P228_RANGE_MODIFER	0.8
-
-#define P228_RELOAD_TIME	2.7
-
-enum p228_e
-{
-	P228_IDLE,
-	P228_SHOOT1,
-	P228_SHOOT2,
-	P228_SHOOT3,
-	P228_SHOOT_EMPTY,
-	P228_RELOAD,
-	P228_DRAW
-};
-
-enum p228_shield_e
-{
-	P228_SHIELD_IDLE,
-	P228_SHIELD_SHOOT1,
-	P228_SHIELD_SHOOT2,
-	P228_SHIELD_SHOOT_EMPTY,
-	P228_SHIELD_RELOAD,
-	P228_SHIELD_DRAW,
-	P228_SHIELD_IDLE_UP,
-	P228_SHIELD_UP,
-	P228_SHIELD_DOWN
-};
-
 /* <291149> ../cstrike/dlls/wpn_shared/wpn_p228.cpp:63 */
 LINK_ENTITY_TO_CLASS(weapon_p228, CP228);
 

regamedll/dlls/wpn_shared/wpn_p90.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define P90_MAX_SPEED		245
-
-#define P90_DAMAGE		21
-#define P90_RANGE_MODIFER	0.885
-
-#define P90_RELOAD_TIME		3.4
-
-enum p90_e
-{
-	P90_IDLE1,
-	P90_RELOAD,
-	P90_DRAW,
-	P90_SHOOT1,
-	P90_SHOOT2,
-	P90_SHOOT3
-};
-
 /* <29657d> ../cstrike/dlls/wpn_shared/wpn_p90.cpp:49 */
 LINK_ENTITY_TO_CLASS(weapon_p90, CP90);
 

regamedll/dlls/wpn_shared/wpn_scout.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define SCOUT_MAX_SPEED			260
-#define SCOUT_MAX_SPEED_ZOOM		220
-
-#define SCOUT_DAMAGE			75
-#define SCOUT_RANGE_MODIFER		0.98
-
-#define SCOUT_RELOAD_TIME		2
-
-enum scout_e
-{
-	SCOUT_IDLE,
-	SCOUT_SHOOT,
-	SCOUT_SHOOT2,
-	SCOUT_RELOAD,
-	SCOUT_DRAW
-};
-
 /* <29ba7b> ../cstrike/dlls/wpn_shared/wpn_scout.cpp:48 */
 LINK_ENTITY_TO_CLASS(weapon_scout, CSCOUT);
 

regamedll/dlls/wpn_shared/wpn_sg550.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define SG550_MAX_SPEED			210
-#define SG550_MAX_SPEED_ZOOM		150
-
-#define SG550_DAMAGE			70
-#define SG550_RANGE_MODIFER		0.98
-
-#define SG550_RELOAD_TIME		3.35
-
-enum sg550_e
-{
-	SG550_IDLE,
-	SG550_SHOOT,
-	SG550_SHOOT2,
-	SG550_RELOAD,
-	SG550_DRAW
-};
-
 /* <2a0f39> ../cstrike/dlls/wpn_shared/wpn_sg550.cpp:48 */
 LINK_ENTITY_TO_CLASS(weapon_sg550, CSG550);
 

regamedll/dlls/wpn_shared/wpn_sg552.cpp

@@ -1,23 +1,5 @@
 #include "precompiled.h"
 
-#define SG552_MAX_SPEED			235
-#define SG552_MAX_SPEED_ZOOM		200
-
-#define SG552_DAMAGE			33
-#define SG552_RANGE_MODIFER		0.955
-
-#define SG552_RELOAD_TIME		3
-
-enum sg552_e
-{
-	SG552_IDLE1,
-	SG552_RELOAD,
-	SG552_DRAW,
-	SG552_SHOOT1,
-	SG552_SHOOT2,
-	SG552_SHOOT3
-};
-
 /* <2a61d9> ../cstrike/dlls/wpn_shared/wpn_sg552.cpp:50 */
 LINK_ENTITY_TO_CLASS(weapon_sg552, CSG552);
 

regamedll/dlls/wpn_shared/wpn_smokegrenade.cpp

@@ -1,16 +1,5 @@
 #include "precompiled.h"
 
-#define SMOKEGRENADE_MAX_SPEED		250
-#define SMOKEGRENADE_MAX_SPEED_SHIELD	180
-
-enum smokegrenade_e
-{
-	SMOKEGRENADE_IDLE,
-	SMOKEGRENADE_PINPULL,
-	SMOKEGRENADE_THROW,
-	SMOKEGRENADE_DRAW
-};
-
 /* <2ab333> ../cstrike/dlls/wpn_shared/wpn_smokegrenade.cpp:38 */
 LINK_ENTITY_TO_CLASS(weapon_smokegrenade, CSmokeGrenade);
 

regamedll/dlls/wpn_shared/wpn_tmp.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define TMP_MAX_SPEED			250
-
-#define TMP_DAMAGE			20
-#define TMP_RANGE_MODIFER		0.85
-
-#define TMP_RELOAD_TIME			2.12
-
-enum tmp_e
-{
-	TMP_IDLE1,
-	TMP_RELOAD,
-	TMP_DRAW,
-	TMP_SHOOT1,
-	TMP_SHOOT2,
-	TMP_SHOOT3
-};
-
 /* <2b06f0> ../cstrike/dlls/wpn_shared/wpn_tmp.cpp:50 */
 LINK_ENTITY_TO_CLASS(weapon_tmp, CTMP);
 

regamedll/dlls/wpn_shared/wpn_ump45.cpp

@@ -1,22 +1,5 @@
 #include "precompiled.h"
 
-#define UMP45_MAX_SPEED			250
-
-#define UMP45_DAMAGE			30
-#define UMP45_RANGE_MODIFER		0.82
-
-#define UMP45_RELOAD_TIME		3.5
-
-enum ump45_e
-{
-	UMP45_IDLE1,
-	UMP45_RELOAD,
-	UMP45_DRAW,
-	UMP45_SHOOT1,
-	UMP45_SHOOT2,
-	UMP45_SHOOT3
-};
-
 /* <2b5b26> ../cstrike/dlls/wpn_shared/wpn_ump45.cpp:50 */
 LINK_ENTITY_TO_CLASS(weapon_ump45, CUMP45);
 

regamedll/dlls/wpn_shared/wpn_usp.cpp

@@ -1,47 +1,5 @@
 #include "precompiled.h"
 
-#define USP_MAX_SPEED		250
-
-#define USP_DAMAGE		34
-#define USP_DAMAGE_SIL		30
-
-#define USP_RANGE_MODIFER	0.79
-
-#define USP_RELOAD_TIME		2.7
-
-enum usp_e
-{
-	USP_IDLE,
-	USP_SHOOT1,
-	USP_SHOOT2,
-	USP_SHOOT3,
-	USP_SHOOT_EMPTY,
-	USP_RELOAD,
-	USP_DRAW,
-	USP_ATTACH_SILENCER,
-	USP_UNSIL_IDLE,
-	USP_UNSIL_SHOOT1,
-	USP_UNSIL_SHOOT2,
-	USP_UNSIL_SHOOT3,
-	USP_UNSIL_SHOOT_EMPTY,
-	USP_UNSIL_RELOAD,
-	USP_UNSIL_DRAW,
-	USP_DETACH_SILENCER
-};
-
-enum usp_shield_e
-{
-	USP_SHIELD_IDLE,
-	USP_SHIELD_SHOOT1,
-	USP_SHIELD_SHOOT2,
-	USP_SHIELD_SHOOT_EMPTY,
-	USP_SHIELD_RELOAD,
-	USP_SHIELD_DRAW,
-	USP_SHIELD_UP_IDLE,
-	USP_SHIELD_UP,
-	USP_SHIELD_DOWN
-};
-
 /* <2bb045> ../cstrike/dlls/wpn_shared/wpn_usp.cpp:68 */
 LINK_ENTITY_TO_CLASS(weapon_usp, CUSP);
 

regamedll/dlls/wpn_shared/wpn_xm1014.cpp

@@ -1,19 +1,5 @@
 #include "precompiled.h"
 
-#define XM1014_MAX_SPEED	240
-#define XM1014_CONE_VECTOR	Vector(0.0725, 0.0725, 0.0)	// special shotgun spreads
-
-enum xm1014_e
-{
-	XM1014_IDLE,
-	XM1014_FIRE1,
-	XM1014_FIRE2,
-	XM1014_RELOAD,
-	XM1014_PUMP,
-	XM1014_START_RELOAD,
-	XM1014_DRAW
-};
-
 /* <2cadb2> ../cstrike/dlls/wpn_shared/wpn_xm1014.cpp:51 */
 LINK_ENTITY_TO_CLASS(weapon_xm1014, CXM1014);
 

regamedll/msvc/ReGameDLL.vcxproj

@@ -830,6 +830,7 @@
     <ClInclude Include="..\dlls\weapons.h" />
     <ClInclude Include="..\dlls\weapontype.h" />
     <ClInclude Include="..\dlls\world.h" />
+    <ClInclude Include="..\dlls\wpn_shared.h" />
     <ClInclude Include="..\engine\cdll_int.h" />
     <ClInclude Include="..\engine\cmd.h" />
     <ClInclude Include="..\engine\common.h" />

regamedll/msvc/ReGameDLL.vcxproj.filters

@@ -1118,6 +1118,9 @@
     <ClInclude Include="..\dlls\scriptevent.h">
       <Filter>dlls</Filter>
     </ClInclude>
+    <ClInclude Include="..\dlls\wpn_shared.h">
+      <Filter>dlls</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\linux\appversion.sh">

regamedll/pm_shared/pm_shared.cpp

@@ -1,27 +1,5 @@
 #include "precompiled.h"
 
-#define WJ_HEIGHT				8
-#define	STOP_EPSILON				0.1
-#define MAX_CLIMB_SPEED				200
-#define PLAYER_DUCKING_MULTIPLIER		0.333
-#define PM_CHECKSTUCK_MINTIME			0.05	// Don't check again too quickly.
-
-// Ducking time
-#define TIME_TO_DUCK				0.4
-#define STUCK_MOVEUP				1
-
-#define PM_VEC_DUCK_HULL_MIN			-18
-#define PM_VEC_HULL_MIN				-36
-#define PM_VEC_DUCK_VIEW			12
-#define PM_VEC_VIEW				17
-
-#define PM_PLAYER_MAX_SAFE_FALL_SPEED		580	// approx 20 feet
-#define PM_PLAYER_MIN_BOUNCE_SPEED		350
-#define PM_PLAYER_FALL_PUNCH_THRESHHOLD		250	// won't punch player's screen/make scrape noise unless player falling at least this fast.
-
-// Only allow bunny jumping up to 1.2x server / player maxspeed setting
-#define BUNNYJUMP_MAX_SPEED_FACTOR		1.2f
-
 /*
 * Globals initialization
 */

regamedll/pm_shared/pm_shared.h

@@ -55,6 +55,28 @@
 #define STEP_LADDER			8
 #define STEP_SNOW			9
 
+#define WJ_HEIGHT				8
+#define	STOP_EPSILON				0.1
+#define MAX_CLIMB_SPEED				200
+#define PLAYER_DUCKING_MULTIPLIER		0.333
+#define PM_CHECKSTUCK_MINTIME			0.05	// Don't check again too quickly.
+
+// Ducking time
+#define TIME_TO_DUCK				0.4
+#define STUCK_MOVEUP				1
+
+#define PM_VEC_DUCK_HULL_MIN			-18
+#define PM_VEC_HULL_MIN				-36
+#define PM_VEC_DUCK_VIEW			12
+#define PM_VEC_VIEW				17
+
+#define PM_PLAYER_MAX_SAFE_FALL_SPEED		580	// approx 20 feet
+#define PM_PLAYER_MIN_BOUNCE_SPEED		350
+#define PM_PLAYER_FALL_PUNCH_THRESHHOLD		250	// won't punch player's screen/make scrape noise unless player falling at least this fast.
+
+// Only allow bunny jumping up to 1.2x server / player maxspeed setting
+#define BUNNYJUMP_MAX_SPEED_FACTOR		1.2f
+
 #ifdef HOOK_GAMEDLL
 
 #define pmove (*pg_ppmove)

regamedll/regamedll/dlls.h

@@ -34,7 +34,7 @@
 #include "archtypes.h"
 #include "scriptevent.h"
 #include "enginecallback.h"
-//#include "entity_state.h"
+#include "entity_state.h"
 #include "nodes.h"
 #include "screenfade.h"
 #include "utlvector.h"
@@ -95,6 +95,9 @@
 #include "plats.h"
 #include "buttons.h"
 
+// weapon shared
+#include "wpn_shared.h"
+
 // CSBOT and Nav
 #include "game_shared/bot/bot_util.h"
 #include "game_shared/bot/simple_state_machine.h"