From e0586ca2e959b5bd82ffe95c4bf48b639cba74ea Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Thu, 27 Jul 2023 23:26:21 -0700 Subject: [PATCH] Rebuild against FreeHL Develop --- src/client/init.qc | 5 ---- src/client/progs.src | 1 + src/server/gamerules_singleplayer.qc | 20 +++++++++------- src/server/progs.src | 36 ---------------------------- src/shared/include.src | 5 ---- src/shared/player.qc | 2 ++ src/shared/w_shovel.qc | 2 +- src/shared/w_spanner.qc | 2 +- src/shared/w_tnt.qc | 2 +- zpak001.pk3dir/scripts/constants.txt | 23 ++++++++++++++++++ 10 files changed, 40 insertions(+), 58 deletions(-) create mode 100644 zpak001.pk3dir/scripts/constants.txt diff --git a/src/client/init.qc b/src/client/init.qc index e1c7ec4..a79d914 100644 --- a/src/client/init.qc +++ b/src/client/init.qc @@ -42,11 +42,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(); precache_model("sprites/640hud1.spr"); precache_model("sprites/640hud2.spr"); diff --git a/src/client/progs.src b/src/client/progs.src index 17a894c..24e75dd 100644 --- a/src/client/progs.src +++ b/src/client/progs.src @@ -34,6 +34,7 @@ init.qc hud_ammonotify.qc ../../../valve/src/client/hud_dmgnotify.qc hud_itemnotify.qc +../../../valve/src/client/hud_sprite.qc ../../../valve/src/client/hud.qc ../../../valve/src/client/hud_weaponselect.qc ../../../valve/src/client/scoreboard.qc diff --git a/src/server/gamerules_singleplayer.qc b/src/server/gamerules_singleplayer.qc index e987927..e4c250a 100644 --- a/src/server/gamerules_singleplayer.qc +++ b/src/server/gamerules_singleplayer.qc @@ -37,7 +37,9 @@ HLSingleplayerRules::PlayerDeath(NSClientPlayer pl) } if (pl.health < -50) { - FX_GibHuman(pl.origin, vectoangles(pl.origin - g_dmg_eAttacker.origin), g_dmg_iDamage * 2.0f); + vector gibDir = vectoangles(pl.origin - g_dmg_eAttacker.origin); + float gibStrength = g_dmg_iDamage * 2.0f; + BreakModel_Entity(pl, gibDir, gibStrength); } /* Let's handle corpses on the clientside */ @@ -78,16 +80,16 @@ HLSingleplayerRules::PlayerSpawn(NSClientPlayer pl) setmodel(pl, pl.model); - setsize(pl, VEC_HULL_MIN, VEC_HULL_MAX); - pl.velocity = [0,0,0]; + pl.SetSize(VEC_HULL_MIN, VEC_HULL_MAX); + pl.ClearVelocity(); pl.gravity = __NULL__; - pl.frame = 1; - //pl.SendEntity = Player_SendEntity; + pl.SetFrame(1); pl.SendFlags = UPDATE_ALL; - pl.customphysics = Empty; - pl.iBleeds = TRUE; - forceinfokey(pl, "*spec", "0"); - forceinfokey(pl, "*deaths", ftos(pl.deaths)); + pl.SetInfoKey("*spec", "0"); + pl.SetInfoKey("*dead", "0"); + pl.SetInfoKey("*deaths", ftos(pl.deaths)); + pl.SetPropData("actor_human"); + pl.SetCanBleed(true); /* this is where the mods want to deviate */ entity spot; diff --git a/src/server/progs.src b/src/server/progs.src index f45edb5..219b861 100644 --- a/src/server/progs.src +++ b/src/server/progs.src @@ -19,42 +19,6 @@ ../shared/include.src - -../../../valve/src/server/monster_apache.qc -../../../valve/src/server/monster_alien_controller.qc -../../../valve/src/server/monster_alien_grunt.qc -../../../valve/src/server/monster_alien_slave.qc -../../../valve/src/server/monster_barnacle.qc -../../../valve/src/server/monster_barney.qc -../../../valve/src/server/monster_barney_dead.qc -../../../valve/src/server/monster_bigmomma.qc -../../../valve/src/server/monster_bloater.qc -../../../valve/src/server/monster_bullchicken.qc -../../../valve/src/server/monster_cockroach.qc -../../../valve/src/server/monster_flyer_flock.qc -../../../valve/src/server/monster_gargantua.qc -../../../valve/src/server/monster_gman.qc -../../../valve/src/server/monster_headcrab.qc -../../../valve/src/server/monster_babycrab.qc -../../../valve/src/server/monster_hevsuit_dead.qc -../../../valve/src/server/monster_houndeye.qc -../../../valve/src/server/monster_human_grunt.qc -../../../valve/src/server/monster_hgrunt_dead.qc -../../../valve/src/server/monster_human_assassin.qc -../../../valve/src/server/monster_ichthyosaur.qc -../../../valve/src/server/monster_leech.qc -../../../valve/src/server/monster_miniturret.qc -../../../valve/src/server/monster_nihilanth.qc -../../../valve/src/server/monster_osprey.qc -../../../valve/src/server/monster_rat.qc -../../../valve/src/server/monster_scientist_dead.qc -../../../valve/src/server/monster_sitting_scientist.qc -../../../valve/src/server/monster_scientist.qc -../../../valve/src/server/monster_sentry.qc -../../../valve/src/server/monster_tentacle.qc -../../../valve/src/server/monster_turret.qc -../../../valve/src/server/monster_zombie.qc - ../../../valve/src/server/player.qc ../../../valve/src/server/items.qc ../../../valve/src/server/item_longjump.qc diff --git a/src/shared/include.src b/src/shared/include.src index 0b6229e..31514aa 100644 --- a/src/shared/include.src +++ b/src/shared/include.src @@ -10,11 +10,6 @@ player.qc ../../../valve/src/shared/fx_blood.qc ../../../valve/src/shared/fx_gaussbeam.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_impact.qc ../../../valve/src/shared/fx_corpse.qc items.h diff --git a/src/shared/player.qc b/src/shared/player.qc index 474b558..8684ced 100644 --- a/src/shared/player.qc +++ b/src/shared/player.qc @@ -14,6 +14,8 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "../../../valve/src/shared/skeleton.h" + /* all potential SendFlags bits we can possibly send */ enumflags { diff --git a/src/shared/w_shovel.qc b/src/shared/w_shovel.qc index 2a9ed3f..bdc924f 100644 --- a/src/shared/w_shovel.qc +++ b/src/shared/w_shovel.qc @@ -143,7 +143,7 @@ w_shovel_primary(player pl) if (trace_ent.iBleeds) { FX_Blood(trace_endpos, [1,0,0]); } else { - FX_Impact(IMPACT_MELEE, trace_endpos, trace_plane_normal); + SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal); } if (trace_ent.takedamage) { diff --git a/src/shared/w_spanner.qc b/src/shared/w_spanner.qc index 44f2210..c45a55e 100644 --- a/src/shared/w_spanner.qc +++ b/src/shared/w_spanner.qc @@ -116,7 +116,7 @@ w_spanner_primary(player pl) if (trace_ent.iBleeds) { FX_Blood(trace_endpos, [1,0,0]); } else { - FX_Impact(IMPACT_MELEE, trace_endpos, trace_plane_normal); + SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal); } if (trace_ent.takedamage) { diff --git a/src/shared/w_tnt.qc b/src/shared/w_tnt.qc index 0105351..90eab8d 100644 --- a/src/shared/w_tnt.qc +++ b/src/shared/w_tnt.qc @@ -74,7 +74,7 @@ w_tnt_throw(player pl) { static void WeaponFrag_Throw_Explode(void) { float dmg = Skill_GetValue("plr_hand_grenade", 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_HANDGRENADE); sound(self, CHAN_WEAPON, sprintf("weapons/explode%d.wav", floor(random() * 2) + 3), 1, ATTN_NORM); remove(self); diff --git a/zpak001.pk3dir/scripts/constants.txt b/zpak001.pk3dir/scripts/constants.txt new file mode 100644 index 0000000..2cc61a1 --- /dev/null +++ b/zpak001.pk3dir/scripts/constants.txt @@ -0,0 +1,23 @@ +// weapon constants +WEAPON_NONE 0 +WEAPON_CROWBAR 1 +WEAPON_SHOVEL 2 +WEAPON_SPANNER 3 +WEAPON_GLOCK 4 +WEAPON_PYTHON 5 +WEAPON_AP9 6 +WEAPON_TAURUS 7 +WEAPON_MP5 8 +WEAPON_SHOTGUN 9 +WEAPON_CROSSBOW 10 +WEAPON_SNIPER 11 +WEAPON_SNIPER2 12 +WEAPON_RPG 13 +WEAPON_GAUSS 14 +WEAPON_EGON 15 +WEAPON_CHAINGUN 16 +WEAPON_HANDGRENADE 17 +WEAPON_SATCHEL 18 +WEAPON_TRIPMINE 19 +WEAPON_SNARK 20 +WEAPON_MEDKIT 21 \ No newline at end of file