Rebuild against FreeHL Develop
This commit is contained in:
parent
bdee8d2053
commit
1441f62ed6
|
@ -42,11 +42,6 @@ ClientGame_RendererRestart(string rstr)
|
||||||
Damage_Precache();
|
Damage_Precache();
|
||||||
|
|
||||||
FX_Blood_Init();
|
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/640hud1.spr");
|
||||||
precache_model("sprites/640hud2.spr");
|
precache_model("sprites/640hud2.spr");
|
||||||
|
|
|
@ -33,6 +33,7 @@ entities.qc
|
||||||
../../../valve/src/client/hud_dmgnotify.qc
|
../../../valve/src/client/hud_dmgnotify.qc
|
||||||
../../../valve/src/client/hud_itemnotify.qc
|
../../../valve/src/client/hud_itemnotify.qc
|
||||||
hud_ammonotify.qc
|
hud_ammonotify.qc
|
||||||
|
../../../valve/src/client/hud_sprite.qc
|
||||||
../../../valve/src/client/hud.qc
|
../../../valve/src/client/hud.qc
|
||||||
../../../valve/src/client/hud_weaponselect.qc
|
../../../valve/src/client/hud_weaponselect.qc
|
||||||
../../../valve/src/client/scoreboard.qc
|
../../../valve/src/client/scoreboard.qc
|
||||||
|
|
|
@ -37,7 +37,9 @@ HLSingleplayerRules::PlayerDeath(NSClientPlayer pl)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pl.health < -50) {
|
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 */
|
/* Let's handle corpses on the clientside */
|
||||||
|
@ -78,16 +80,18 @@ HLSingleplayerRules::PlayerSpawn(NSClientPlayer pl)
|
||||||
|
|
||||||
setmodel(pl, pl.model);
|
setmodel(pl, pl.model);
|
||||||
|
|
||||||
setsize(pl, VEC_HULL_MIN, VEC_HULL_MAX);
|
pl.SetSize(VEC_HULL_MIN, VEC_HULL_MAX);
|
||||||
pl.velocity = [0,0,0];
|
pl.ClearVelocity();
|
||||||
pl.gravity = __NULL__;
|
pl.gravity = __NULL__;
|
||||||
pl.frame = 1;
|
pl.SetFrame(1);
|
||||||
//pl.SendEntity = Player_SendEntity;
|
//pl.SendEntity = Player_SendEntity;
|
||||||
pl.SendFlags = UPDATE_ALL;
|
pl.SendFlags = UPDATE_ALL;
|
||||||
pl.customphysics = Empty;
|
pl.customphysics = Empty;
|
||||||
pl.iBleeds = TRUE;
|
pl.SetInfoKey("*spec", "0");
|
||||||
forceinfokey(pl, "*spec", "0");
|
pl.SetInfoKey("*dead", "0");
|
||||||
forceinfokey(pl, "*deaths", ftos(pl.deaths));
|
pl.SetInfoKey("*deaths", ftos(pl.deaths));
|
||||||
|
pl.SetPropData("actor_human");
|
||||||
|
pl.SetCanBleed(true);
|
||||||
|
|
||||||
/* this is where the mods want to deviate */
|
/* this is where the mods want to deviate */
|
||||||
entity spot;
|
entity spot;
|
||||||
|
|
|
@ -19,41 +19,6 @@
|
||||||
|
|
||||||
../shared/include.src
|
../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/player.qc
|
||||||
../../../valve/src/server/items.qc
|
../../../valve/src/server/items.qc
|
||||||
../../../valve/src/server/item_longjump.qc
|
../../../valve/src/server/item_longjump.qc
|
||||||
|
|
|
@ -9,11 +9,6 @@ player.qc
|
||||||
|
|
||||||
../../../valve/src/shared/fx_blood.qc
|
../../../valve/src/shared/fx_blood.qc
|
||||||
../../../valve/src/shared/fx_gaussbeam.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
|
../../../valve/src/shared/fx_corpse.qc
|
||||||
|
|
||||||
items.h
|
items.h
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* 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 */
|
/* all potential SendFlags bits we can possibly send */
|
||||||
enumflags
|
enumflags
|
||||||
{
|
{
|
||||||
|
|
|
@ -90,7 +90,7 @@ void
|
||||||
w_bradnailer_shootnail(player pl)
|
w_bradnailer_shootnail(player pl)
|
||||||
{
|
{
|
||||||
static void Nail_Touch(void) {
|
static void Nail_Touch(void) {
|
||||||
FX_Spark(self.origin, trace_plane_normal);
|
SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal);
|
||||||
if (other.takedamage == DAMAGE_YES) {
|
if (other.takedamage == DAMAGE_YES) {
|
||||||
Damage_Apply(other, self.owner, 15, WEAPON_BRADNAILER, DMG_GENERIC);
|
Damage_Apply(other, self.owner, 15, WEAPON_BRADNAILER, DMG_GENERIC);
|
||||||
Sound_Play(self, CHAN_WEAPON, "weapon_bradnailer.hitbody");
|
Sound_Play(self, CHAN_WEAPON, "weapon_bradnailer.hitbody");
|
||||||
|
|
|
@ -67,7 +67,7 @@ w_nailgun_primary(player pl)
|
||||||
|
|
||||||
#ifdef SERVER
|
#ifdef SERVER
|
||||||
static void Nail_Touch(void) {
|
static void Nail_Touch(void) {
|
||||||
FX_Spark(self.origin, trace_plane_normal);
|
SurfData_Impact(trace_ent, trace_endpos, trace_plane_normal);
|
||||||
if (other.takedamage == DAMAGE_YES) {
|
if (other.takedamage == DAMAGE_YES) {
|
||||||
Damage_Apply(other, self.owner, 15, WEAPON_NAILGUN, DMG_GENERIC);
|
Damage_Apply(other, self.owner, 15, WEAPON_NAILGUN, DMG_GENERIC);
|
||||||
if (random() < 0.5) {
|
if (random() < 0.5) {
|
||||||
|
|
|
@ -70,6 +70,7 @@ w_pipebomb_precache(void)
|
||||||
{
|
{
|
||||||
#ifdef SERVER
|
#ifdef SERVER
|
||||||
Sound_Precache("weapon_satchel.bounce");
|
Sound_Precache("weapon_satchel.bounce");
|
||||||
|
Sound_Precache("fx.explosion");
|
||||||
#endif
|
#endif
|
||||||
precache_model("models/w_pipebomb.mdl");
|
precache_model("models/w_pipebomb.mdl");
|
||||||
precache_model("models/v_pipebomb.mdl");
|
precache_model("models/v_pipebomb.mdl");
|
||||||
|
@ -131,9 +132,9 @@ s_pipebomb_detonate(entity master)
|
||||||
for (entity b = world; (b = find(b, ::classname, "satchel"));) {
|
for (entity b = world; (b = find(b, ::classname, "satchel"));) {
|
||||||
if (b.owner == master) {
|
if (b.owner == master) {
|
||||||
float dmg = Skill_GetValue("plr_satchel", 150);
|
float dmg = Skill_GetValue("plr_satchel", 150);
|
||||||
FX_Explosion(b.origin);
|
pointparticles(particleeffectnum("fx_explosion.main"), self.origin, [0,0,0], 1);
|
||||||
Damage_Radius(b.origin, master, dmg, dmg * 2.5f, TRUE, WEAPON_SATCHEL);
|
Damage_Radius(b.origin, master, dmg, dmg * 2.5f, TRUE, WEAPON_SATCHEL);
|
||||||
sound(b, CHAN_WEAPON, sprintf("weapons/explode%d.wav", floor(random() * 2) + 3), 1, ATTN_NORM);
|
Sound_Play(self, CHAN_VOICE, "fx.explosion");
|
||||||
remove(b);
|
remove(b);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
// weapon constants
|
||||||
|
WEAPON_NONE 0
|
||||||
|
WEAPON_HEATERPIPE 1
|
||||||
|
WEAPON_BRADNAILER 2
|
||||||
|
WEAPON_NAILGUN 3
|
||||||
|
WEAPON_SHOTGUN 4
|
||||||
|
WEAPON_CMLWBR 5
|
||||||
|
WEAPON_XS 6
|
||||||
|
WEAPON_SATCHEL 7
|
Loading…
Reference in New Issue