From e0ed0d4298425cfe70029655ba14fa4ac3603488 Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Thu, 16 Mar 2006 11:46:26 +0000 Subject: [PATCH] - fixed typo in video modes - moved muzzle positions for mortar/electro a bit (i could see the projectiles through my viewmodel before. it's better now, but the grenades are just too big compared to the mortar viewmodel) - fixed bug that allowed players to prevent forced respawn - lms campcheck no longer gibs players (the player model was bouncing around and i wasn't able to track that bug down :() git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1163 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/maps/nexdm12.ent | 14 +++++++------- data/menu/data/video.menu | 2 +- data/qcsrc/server/gamec/cl_client.c | 7 ++++++- data/qcsrc/server/gamec/w_electro.c | 10 +++------- data/qcsrc/server/gamec/w_grenadelauncher.c | 4 ++-- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/data/maps/nexdm12.ent b/data/maps/nexdm12.ent index 061240fbf..fb4eff519 100644 --- a/data/maps/nexdm12.ent +++ b/data/maps/nexdm12.ent @@ -19,7 +19,7 @@ } { "classname" "item_armor_shard" -"origin" "-96 -184 -72" +"origin" "-96 -184 -68" } { "classname" "weapon_rocketlauncher" @@ -56,12 +56,12 @@ "classname" "item_health" } { -"origin" "-16 -184 -72" +"origin" "-16 -184 -68" "classname" "item_armor_shard" } { "classname" "item_armor_shard" -"origin" "64 -184 -72" +"origin" "64 -184 -68" } { "angle" "90" @@ -118,12 +118,12 @@ "model" "*1" } { -"origin" "904 480 -414" +"origin" "904 480 -410" "classname" "item_armor_shard" } { "classname" "item_armor_shard" -"origin" "904 542 -414" +"origin" "904 542 -410" } { "classname" "target_speaker" @@ -142,7 +142,7 @@ "classname" "info_player_deathmatch" } { -"origin" "-926 464 -414" +"origin" "-926 464 -410" "classname" "item_armor_shard" } { @@ -240,7 +240,7 @@ } { "classname" "item_armor_shard" -"origin" "-926 526 -414" +"origin" "-926 526 -410" } { "angle" "180" diff --git a/data/menu/data/video.menu b/data/menu/data/video.menu index 623014cc1..63b15b514 100644 --- a/data/menu/data/video.menu +++ b/data/menu/data/video.menu @@ -9,7 +9,7 @@ Item DataContainer Video Item DataLink_TextSwitch Switch { - valueList "'640 480' '800 600' '960x600' '1024 768' '1152 864' '1280 800' '1280 960' '1280 1024' '1440 900' '1600 900' '1600 1200' '1680 1050' '1920 1200' '2048 1536'" + valueList "'640 480' '800 600' '960 600' '1024 768' '1152 864' '1280 800' '1280 960' '1280 1024' '1440 900' '1600 900' '1600 1200' '1680 1050' '1920 1200' '2048 1536'" descList "'640x480' '800x600' '960x600' '1024x768' '1152x864' '1280x800' '1280x960' '1280x1024' '1440x900' '1600x900' '1600x1200' '1680x1050' '1920x1200' '2048x1536'" link "##up" } diff --git a/data/qcsrc/server/gamec/cl_client.c b/data/qcsrc/server/gamec/cl_client.c index 250da080a..3168904d9 100644 --- a/data/qcsrc/server/gamec/cl_client.c +++ b/data/qcsrc/server/gamec/cl_client.c @@ -1071,6 +1071,9 @@ void PlayerPreThink (void) } else if (self.deadflag == DEAD_DEAD) { + if (cvar("g_lms") || cvar("g_forced_respawn")) + self.button0 = self.button2 = self.button3 = 0; + if (!self.button0 && !self.button2 && !self.button3) self.deadflag = DEAD_RESPAWNABLE; } @@ -1102,7 +1105,9 @@ void PlayerPreThink (void) if(self.lms_traveled_distance < cvar("g_lms_campcheck_distance")) { centerprint(self, cvar_string("g_lms_campcheck_message")); - Damage(self, self, self, cvar("g_lms_campcheck_damage"), DEATH_CAMP, self.origin, '0 0 0'); + // FIXME KadaverJack: gibbing player here causes playermodel to bounce around, instead of eye.md3 + // I wasn't able to find out WHY that happens, so I put a workaround in place that shall prevent players from being gibbed :( + Damage(self, self, self, bound(0, cvar("g_lms_campcheck_damage"), self.health + self.armorvalue * cvar("g_balance_armor_blockpercent") + 5), DEATH_CAMP, self.origin, '0 0 0'); } self.lms_nextcheck = time + cvar("g_lms_campcheck_interval"); self.lms_traveled_distance = 0; diff --git a/data/qcsrc/server/gamec/w_electro.c b/data/qcsrc/server/gamec/w_electro.c index 970ce9ced..d1df44f3d 100644 --- a/data/qcsrc/server/gamec/w_electro.c +++ b/data/qcsrc/server/gamec/w_electro.c @@ -102,12 +102,10 @@ void() W_Electro_Attack { local entity proj; local vector org; - local float postion; local vector trueaim; trueaim = W_TrueAim(); - postion = self.electrocount; sound (self, CHAN_WEAPON, "weapons/electro_fire.ogg", 1, ATTN_NORM); if (self.items & IT_STRENGTH) sound (self, CHAN_AUTO, "weapons/strength_fire.ogg", 1, ATTN_NORM); @@ -117,17 +115,17 @@ void() W_Electro_Attack if (self.electrocount == 0) { self.electrocount = 1; - org = W_MuzzleOrigin (self, '24 6 -9'); + org = W_MuzzleOrigin (self, '24 5.5 -11'); } else if (self.electrocount == 1) { self.electrocount = 2; - org = W_MuzzleOrigin (self, '24 8 -7'); + org = W_MuzzleOrigin (self, '24 8 -8.1'); } else { self.electrocount = 0; - org = W_MuzzleOrigin (self, '24 10 -9'); + org = W_MuzzleOrigin (self, '24 10.5 -11'); } proj = spawn (); @@ -155,9 +153,7 @@ void() W_Electro_Attack2 { local entity proj; local vector org; - local float postion; - postion = self.electrocount; sound (self, CHAN_WEAPON, "weapons/electro_fire2.ogg", 1, ATTN_NORM); if (self.items & IT_STRENGTH) sound (self, CHAN_AUTO, "weapons/strength_fire.ogg", 1, ATTN_NORM); diff --git a/data/qcsrc/server/gamec/w_grenadelauncher.c b/data/qcsrc/server/gamec/w_grenadelauncher.c index fe4ff22dd..720ef9e5b 100644 --- a/data/qcsrc/server/gamec/w_grenadelauncher.c +++ b/data/qcsrc/server/gamec/w_grenadelauncher.c @@ -96,7 +96,7 @@ void W_Grenade_Attack (void) self.punchangle_x = -4; if (cvar("g_use_ammunition")) self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_primary_ammo"); - org = W_MuzzleOrigin (self, '24 8 -8'); + org = W_MuzzleOrigin (self, '24 8 -10'); gren = spawn (); gren.owner = self; @@ -129,7 +129,7 @@ void W_Grenade_Attack2 (void) self.punchangle_x = -4; if (cvar("g_use_ammunition")) self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_secondary_ammo"); - org = W_MuzzleOrigin (self, '24 8 -8'); + org = W_MuzzleOrigin (self, '24 8 -10'); gren = spawn (); gren.owner = self; -- 2.39.2