From 0d88b36666a7d194918b818a69c07f46ff12777d Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Wed, 30 Aug 2006 15:17:46 +0000 Subject: [PATCH] removed .extralives git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@1875 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- attic/maps/dsi.instantaction | 0 data/gfx/b_instantaction.tga | Bin data/gfx/b_instantaction_u.tga | Bin data/maps/aggressor.instantaction | 0 data/maps/aneurysm.instantaction | 0 data/maps/basement.instantaction | 0 data/maps/bloodprison.instantaction | 0 data/maps/darkzone.instantaction | 0 data/maps/downer.instantaction | 0 data/maps/exit_instantaction | 0 data/maps/farewell.instantaction | 0 data/maps/slimepit.instantaction | 0 data/maps/warfare.instantaction | 0 data/menu/creategame/gamemodes/lms.menu | 0 data/menu/data/gamemodes/lms.menu | 0 data/qcsrc/server/cl_client.qc | 2 -- data/qcsrc/server/defs.qh | 1 - data/qcsrc/server/g_damage.qc | 7 +++---- data/qcsrc/server/t_items.qc | 3 +-- gpl.txt | 0 20 files changed, 4 insertions(+), 9 deletions(-) mode change 100755 => 100644 attic/maps/dsi.instantaction mode change 100755 => 100644 data/gfx/b_instantaction.tga mode change 100755 => 100644 data/gfx/b_instantaction_u.tga mode change 100755 => 100644 data/maps/aggressor.instantaction mode change 100755 => 100644 data/maps/aneurysm.instantaction mode change 100755 => 100644 data/maps/basement.instantaction mode change 100755 => 100644 data/maps/bloodprison.instantaction mode change 100755 => 100644 data/maps/darkzone.instantaction mode change 100755 => 100644 data/maps/downer.instantaction mode change 100755 => 100644 data/maps/exit_instantaction mode change 100755 => 100644 data/maps/farewell.instantaction mode change 100755 => 100644 data/maps/slimepit.instantaction mode change 100755 => 100644 data/maps/warfare.instantaction mode change 100755 => 100644 data/menu/creategame/gamemodes/lms.menu mode change 100755 => 100644 data/menu/data/gamemodes/lms.menu mode change 100755 => 100644 gpl.txt diff --git a/attic/maps/dsi.instantaction b/attic/maps/dsi.instantaction old mode 100755 new mode 100644 diff --git a/data/gfx/b_instantaction.tga b/data/gfx/b_instantaction.tga old mode 100755 new mode 100644 diff --git a/data/gfx/b_instantaction_u.tga b/data/gfx/b_instantaction_u.tga old mode 100755 new mode 100644 diff --git a/data/maps/aggressor.instantaction b/data/maps/aggressor.instantaction old mode 100755 new mode 100644 diff --git a/data/maps/aneurysm.instantaction b/data/maps/aneurysm.instantaction old mode 100755 new mode 100644 diff --git a/data/maps/basement.instantaction b/data/maps/basement.instantaction old mode 100755 new mode 100644 diff --git a/data/maps/bloodprison.instantaction b/data/maps/bloodprison.instantaction old mode 100755 new mode 100644 diff --git a/data/maps/darkzone.instantaction b/data/maps/darkzone.instantaction old mode 100755 new mode 100644 diff --git a/data/maps/downer.instantaction b/data/maps/downer.instantaction old mode 100755 new mode 100644 diff --git a/data/maps/exit_instantaction b/data/maps/exit_instantaction old mode 100755 new mode 100644 diff --git a/data/maps/farewell.instantaction b/data/maps/farewell.instantaction old mode 100755 new mode 100644 diff --git a/data/maps/slimepit.instantaction b/data/maps/slimepit.instantaction old mode 100755 new mode 100644 diff --git a/data/maps/warfare.instantaction b/data/maps/warfare.instantaction old mode 100755 new mode 100644 diff --git a/data/menu/creategame/gamemodes/lms.menu b/data/menu/creategame/gamemodes/lms.menu old mode 100755 new mode 100644 diff --git a/data/menu/data/gamemodes/lms.menu b/data/menu/data/gamemodes/lms.menu old mode 100755 new mode 100644 diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 723fa1823..bc0f20dfa 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -571,7 +571,6 @@ void PutClientInServer (void) self.items = IT_NEX; self.switchweapon = WEP_NEX; self.ammo_cells = cvar("g_minstagib_ammo_start"); - self.extralives = 0; self.jump_interval = time; } @@ -661,7 +660,6 @@ string ColoredTeamName(float t); //void dom_player_join_team(entity pl); void ClientConnect (void) { - local float fh; local string s; self.classname = "player_joining"; diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh index 05b0b2c6e..0b65ee0ae 100644 --- a/data/qcsrc/server/defs.qh +++ b/data/qcsrc/server/defs.qh @@ -215,7 +215,6 @@ float GRAPHOOK_RELEASE = 21; .float laser_on; // minstagib vars -.float extralives; .float jump_interval; // laser refire //swamp diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc index 3b9b7d954..9797f6d8b 100644 --- a/data/qcsrc/server/g_damage.qc +++ b/data/qcsrc/server/g_damage.qc @@ -361,12 +361,11 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float (deathtype == DEATH_SLIME) || (deathtype == DEATH_LAVA)) return; - if (targ.extralives && (deathtype == IT_NEX) && damage) + if (targ.armorvalue && (deathtype == IT_NEX) && damage) { - targ.extralives -= 1; - centerprint(targ, strcat("^3Remaining extra lives: ",ftos(targ.extralives),"\n")); + targ.armorvalue -= 1; + centerprint(targ, strcat("^3Remaining extra lives: ",ftos(targ.armorvalue),"\n")); damage = 0; - targ.armorvalue = targ.extralives; if(clienttype(targ) == CLIENTTYPE_REAL) stuffcmd(targ, "play2 misc/hit.wav\n"); //stuffcmd(attacker, "play2 misc/hit.wav\n"); } diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index 1b0e7428b..2940f2ef1 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -74,8 +74,7 @@ void Item_Touch (void) { // sound not available // stuffcmd(other, "play2 announce/robotic/extra.ogg\nplay2 announce/robotic/_lives.ogg\n"); - other.extralives = other.extralives + cvar("g_minstagib_extralives"); - other.armorvalue = other.extralives; + other.armorvalue = other.armorvalue + cvar("g_minstagib_extralives"); sprint(other, "^3You picked up some extra lives\n"); } diff --git a/gpl.txt b/gpl.txt old mode 100755 new mode 100644 -- 2.39.2