r1875 - branches/nexuiz-2.0 branches/nexuiz-2.0/attic/maps branches/nexuiz-2.0/data/gfx branches/nexuiz-2.0/data/maps branches/nexuiz-2.0/data/menu/creategame/gamemodes branches/nexuiz-2.0/data/menu/data/gamemodes branches/nexuiz-2.0/data/qcsrc/server branches/smenu branches/smenu/data/gfx branches/smenu/data/maps branches/smenu/data/oldmenu/creategame/gamemodes branches/smenu/data/oldmenu/data/gamemodes trunk/attic/maps trunk/data/gfx trunk/data/maps trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Aug 30 11:17:46 EDT 2006
Author: kadaverjack
Date: 2006-08-30 11:17:46 -0400 (Wed, 30 Aug 2006)
New Revision: 1875
Modified:
branches/nexuiz-2.0/attic/maps/dsi.instantaction
branches/nexuiz-2.0/data/gfx/b_instantaction.tga
branches/nexuiz-2.0/data/gfx/b_instantaction_u.tga
branches/nexuiz-2.0/data/maps/aggressor.instantaction
branches/nexuiz-2.0/data/maps/aneurysm.instantaction
branches/nexuiz-2.0/data/maps/basement.instantaction
branches/nexuiz-2.0/data/maps/bloodprison.instantaction
branches/nexuiz-2.0/data/maps/darkzone.instantaction
branches/nexuiz-2.0/data/maps/downer.instantaction
branches/nexuiz-2.0/data/maps/exit_instantaction
branches/nexuiz-2.0/data/maps/farewell.instantaction
branches/nexuiz-2.0/data/maps/slimepit.instantaction
branches/nexuiz-2.0/data/maps/warfare.instantaction
branches/nexuiz-2.0/data/menu/creategame/gamemodes/lms.menu
branches/nexuiz-2.0/data/menu/data/gamemodes/lms.menu
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/defs.qh
branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
branches/nexuiz-2.0/gpl.txt
branches/smenu/data/gfx/b_instantaction.tga
branches/smenu/data/gfx/b_instantaction_u.tga
branches/smenu/data/maps/exit_instantaction
branches/smenu/data/maps/nexdm01.instantaction
branches/smenu/data/maps/nexdm03.instantaction
branches/smenu/data/maps/nexdm05.instantaction
branches/smenu/data/maps/nexdm07.instantaction
branches/smenu/data/maps/nexdm09.instantaction
branches/smenu/data/maps/nexdmextra1.instantaction
branches/smenu/data/maps/nexdmextra2.instantaction
branches/smenu/data/oldmenu/creategame/gamemodes/lms.menu
branches/smenu/data/oldmenu/data/gamemodes/lms.menu
branches/smenu/gpl.txt
trunk/attic/maps/dsi.instantaction
trunk/data/gfx/b_instantaction.tga
trunk/data/gfx/b_instantaction_u.tga
trunk/data/maps/aggressor.instantaction
trunk/data/maps/aneurysm.instantaction
trunk/data/maps/basement.instantaction
trunk/data/maps/bloodprison.instantaction
trunk/data/maps/darkzone.instantaction
trunk/data/maps/downer.instantaction
trunk/data/maps/farewell.instantaction
trunk/data/maps/slimepit.instantaction
trunk/data/maps/warfare.instantaction
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/g_damage.qc
trunk/data/qcsrc/server/t_items.qc
Log:
removed .extralives
Property changes on: branches/nexuiz-2.0/attic/maps/dsi.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/gfx/b_instantaction.tga
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/gfx/b_instantaction_u.tga
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/maps/aggressor.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/maps/aneurysm.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/maps/basement.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/maps/bloodprison.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/maps/darkzone.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/maps/downer.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/maps/exit_instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/maps/farewell.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/maps/slimepit.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/maps/warfare.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/menu/creategame/gamemodes/lms.menu
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/nexuiz-2.0/data/menu/data/gamemodes/lms.menu
___________________________________________________________________
Name: svn:executable
- *
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2006-08-30 13:20:32 UTC (rev 1874)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2006-08-30 15:17:46 UTC (rev 1875)
@@ -571,7 +571,6 @@
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 @@
//void dom_player_join_team(entity pl);
void ClientConnect (void)
{
- local float fh;
local string s;
self.classname = "player_joining";
Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2006-08-30 13:20:32 UTC (rev 1874)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2006-08-30 15:17:46 UTC (rev 1875)
@@ -215,7 +215,6 @@
.float laser_on;
// minstagib vars
-.float extralives;
.float jump_interval; // laser refire
//swamp
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc 2006-08-30 13:20:32 UTC (rev 1874)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc 2006-08-30 15:17:46 UTC (rev 1875)
@@ -361,12 +361,11 @@
(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");
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_items.qc 2006-08-30 13:20:32 UTC (rev 1874)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_items.qc 2006-08-30 15:17:46 UTC (rev 1875)
@@ -74,8 +74,7 @@
{
// 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");
}
Property changes on: branches/nexuiz-2.0/gpl.txt
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/gfx/b_instantaction.tga
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/gfx/b_instantaction_u.tga
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/maps/exit_instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/maps/nexdm01.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/maps/nexdm03.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/maps/nexdm05.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/maps/nexdm07.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/maps/nexdm09.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/maps/nexdmextra1.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/maps/nexdmextra2.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/oldmenu/creategame/gamemodes/lms.menu
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/data/oldmenu/data/gamemodes/lms.menu
___________________________________________________________________
Name: svn:executable
- *
Property changes on: branches/smenu/gpl.txt
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/attic/maps/dsi.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/gfx/b_instantaction.tga
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/gfx/b_instantaction_u.tga
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/maps/aggressor.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/maps/aneurysm.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/maps/basement.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/maps/bloodprison.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/maps/darkzone.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/maps/downer.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/maps/farewell.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/maps/slimepit.instantaction
___________________________________________________________________
Name: svn:executable
- *
Property changes on: trunk/data/maps/warfare.instantaction
___________________________________________________________________
Name: svn:executable
- *
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2006-08-30 13:20:32 UTC (rev 1874)
+++ trunk/data/qcsrc/server/cl_client.qc 2006-08-30 15:17:46 UTC (rev 1875)
@@ -571,7 +571,6 @@
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,7 @@
//void dom_player_join_team(entity pl);
void ClientConnect (void)
{
- local float fh;
+ //local float fh;
local string s;
self.classname = "player_joining";
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2006-08-30 13:20:32 UTC (rev 1874)
+++ trunk/data/qcsrc/server/defs.qh 2006-08-30 15:17:46 UTC (rev 1875)
@@ -215,7 +215,6 @@
.float laser_on;
// minstagib vars
-.float extralives;
.float jump_interval; // laser refire
//swamp
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2006-08-30 13:20:32 UTC (rev 1874)
+++ trunk/data/qcsrc/server/g_damage.qc 2006-08-30 15:17:46 UTC (rev 1875)
@@ -395,12 +395,11 @@
(deathtype == DEATH_SLIME) ||
(deathtype == DEATH_LAVA))
return;
- if (targ.extralives && (deathtype == IT_NEX) && damage)
+ if (targ.armorvalue && (deathtype == IT_NEX) && damage)
{
- targ.extralives -= 1;
- centermsg_setfor(targ, CENTERMSG_MINSTAGIB, strcat("^3Remaining extra lives: ",ftos(targ.extralives)));
+ targ.armorvalue -= 1;
+ centermsg_setfor(targ, CENTERMSG_MINSTAGIB, strcat("^3Remaining extra lives: ",ftos(targ.armorvalue)));
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");
}
@@ -534,11 +533,10 @@
if(mirrordamage > 0)
{
// just lose extra LIVES, don't kill the player for mirror damage
- if(attacker.extralives > 0)
+ if(attacker.armorvalue > 0)
{
- attacker.extralives = attacker.extralives - 1;
- centermsg_setfor(attacker, CENTERMSG_MINSTAGIB, strcat("^3Remaining extra lives: ",ftos(attacker.extralives)));
- attacker.armorvalue = attacker.extralives;
+ attacker.armorvalue = attacker.armorvalue - 1;
+ centermsg_setfor(attacker, CENTERMSG_MINSTAGIB, strcat("^3Remaining extra lives: ",ftos(attacker.armorvalue)));
if(clienttype(attacker) == CLIENTTYPE_REAL) stuffcmd(attacker, "play2 misc/hit.wav\n");
}
mirrordamage = 0;
Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc 2006-08-30 13:20:32 UTC (rev 1874)
+++ trunk/data/qcsrc/server/t_items.qc 2006-08-30 15:17:46 UTC (rev 1875)
@@ -75,8 +75,7 @@
{
// 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");
}
More information about the nexuiz-commits
mailing list