Rebuild against FreeHL Develop

src/client/game_event.qc

@@ -21,28 +21,6 @@ switch (fHeader) {
 	case EV_OBITUARY:
 		Obituary_Parse();
 		break;
-	case EV_SPARK:
-		vector vSparkPos, vSparkAngle;
-		vSparkPos[0] = readcoord();
-		vSparkPos[1] = readcoord();
-		vSparkPos[2] = readcoord();
-		vSparkAngle[0] = readcoord();
-		vSparkAngle[1] = readcoord();
-		vSparkAngle[2] = readcoord();
-		FX_Spark(vSparkPos, vSparkAngle);
-		break;
-	case EV_GIBHUMAN:
-		vector vGibPos;
-		vGibPos[0] = readcoord();
-		vGibPos[1] = readcoord();
-		vGibPos[2] = readcoord();
-		vector vDir;
-		vDir[0] = readcoord();
-		vDir[1] = readcoord();
-		vDir[2] = readcoord();
-		float flForce = readfloat();
-		FX_GibHuman(vGibPos, vDir, flForce);
-		break;
 	case EV_BLOOD:
 		vector vBloodPos;
 		vector vBloodColor;
@@ -57,45 +35,6 @@ switch (fHeader) {
 
 		FX_Blood(vBloodPos, vBloodColor);
 		break;
-	case EV_EXPLOSION:
-		vector vExploPos;
-
-		vExploPos[0] = readcoord();
-		vExploPos[1] = readcoord();
-		vExploPos[2] = readcoord();
-
-		FX_Explosion(vExploPos);
-		break;
-	case EV_MODELGIB:
-		vector vecPos;
-		vecPos[0] = readcoord();
-		vecPos[1] = readcoord();
-		vecPos[2] = readcoord();
-
-		vector vSize;
-		vSize[0] = readcoord();
-		vSize[1] = readcoord();
-		vSize[2] = readcoord();
-
-		float fStyle = readbyte();
-		int count = readbyte();
-		FX_BreakModel(count, vecPos, vSize, [0,0,0], fStyle);
-		break;
-	case EV_IMPACT:
-		impactType_t iType;
-		vector vOrigin, vNormal;
-
-		iType = (impactType_t)readbyte();
-		vOrigin[0] = readcoord();
-		vOrigin[1] = readcoord();
-		vOrigin[2] = readcoord();
-
-		vNormal[0] = readcoord();
-		vNormal[1] = readcoord();
-		vNormal[2] = readcoord();
-
-		FX_Impact(iType, vOrigin, vNormal);
-		break;
 	case EV_SMOKE:
 		vector vSmokePos;
 		vSmokePos[0] = readcoord();

src/client/init.qc

@@ -162,11 +162,6 @@ ClientGame_RendererRestart(string rstr)
 	Damage_Precache();
 
 	FX_Blood_Init();
-	FX_BreakModel_Init();
-	FX_Explosion_Init();
-	FX_GibHuman_Init();
-	FX_Spark_Init();
-	FX_Impact_Init();
 	FX_Smokenade_Init();
 
 	Radar_Init();

src/client/progs.src

@@ -37,6 +37,7 @@ crosshair.qc
 hud_ammonotify.qc
 hud.qc
 hud_weaponselect.qc
+../../../valve/src/client/hud_sprite.qc
 ../../../valve/src/client/scoreboard.qc
 radio.qc
 ../../../valve/src/client/modelevent.qc

src/server/gamerules_singleplayer.qc

@@ -25,7 +25,7 @@ CSSingleplayerRules::PlayerDeath(NSClientPlayer pl)
 
 	if (pl.health < -50) {
 		pl.health = 0;
-		FX_GibHuman(pl.origin, vectoangles(pl.origin - g_dmg_eAttacker.origin), g_dmg_iDamage * 2.0f);
+		//FX_GibHuman(pl.origin, vectoangles(pl.origin - g_dmg_eAttacker.origin), g_dmg_iDamage * 2.0f);
 		return;
 	}
 

src/shared/include.src

@@ -8,12 +8,7 @@ animations.qc
 item_c4bomb.h
 
 ../../../valve/src/shared/fx_blood.qc
-../../../valve/src/shared/fx_breakmodel.qc
-../../../valve/src/shared/fx_explosion.qc
-../../../valve/src/shared/fx_gibhuman.qc
-../../../valve/src/shared/fx_spark.qc
 ../../../valve/src/shared/fx_corpse.qc
-fx_impact.qc
 fx_flashbang.qc
 fx_smokenade.qc
 

src/shared/w_hegrenade.qc

@@ -103,7 +103,7 @@ w_hegrenade_throw(player pl)
 	static void hegrenade_explode(void)
 	{
 		float dmg = 100;
-		FX_Explosion(self.origin);
+		pointparticles(particleeffectnum("fx_explosion.main"), self.origin, [0,0,0], 1);
 		Damage_Radius(self.origin, self.owner, dmg, dmg * 2.5f, TRUE, WEAPON_HEGRENADE);
 		Sound_Play(self, CHAN_BODY, "weapon_hegrenade.explode");
 		remove(self);

zpak001.pk3dir/scripts/constants.txt

@@ -0,0 +1,29 @@
+// weapon constants
+WEAPON_NONE		0
+WEAPON_M3		1
+WEAPON_XM1014		2
+WEAPON_MP5		3
+WEAPON_P90		4
+WEAPON_UMP45		5
+WEAPON_MAC10		6
+WEAPON_TMP		7
+WEAPON_AK47		8
+WEAPON_SG552		9
+WEAPON_M4A1		10
+WEAPON_AUG		11
+WEAPON_SCOUT		12
+WEAPON_AWP		13
+WEAPON_G3SG1		14
+WEAPON_SG550		15
+WEAPON_PARA		16
+WEAPON_USP45		17
+WEAPON_GLOCK18		18
+WEAPON_DEAGLE		19
+WEAPON_P228		20
+WEAPON_ELITES		21
+WEAPON_FIVESEVEN		22
+WEAPON_KNIFE		23
+WEAPON_HEGRENADE		24
+WEAPON_FLASHBANG		25
+WEAPON_SMOKEGRENADE	26
+WEAPON_C4BOMB		27