From 244f98cc8337b894bed69ec16bfe4538fa7d7def Mon Sep 17 00:00:00 2001
From: kadaverjack <kadaverjack@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 4 Jan 2008 21:45:44 +0000
Subject: [PATCH] changed g_minstagib_invis_alpha <= 0 to use EF_NODRAW & added
 restart event to eventlog.txt

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3101 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 Docs/eventlog.txt                  |  1 +
 data/default.cfg                   |  2 +-
 data/qcsrc/server/cl_client.qc     | 32 ++++++++++++++++++++++++------
 data/qcsrc/server/defs.qh          |  2 +-
 data/qcsrc/server/miscfunctions.qc |  1 +
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/Docs/eventlog.txt b/Docs/eventlog.txt
index 89c40cf05..2d5e30f64 100644
--- a/Docs/eventlog.txt
+++ b/Docs/eventlog.txt
@@ -39,6 +39,7 @@ ______________
    :dom:taken:<previouscolor>:<ID of player>
    :scores:<gametype>_<mapname>:<map runtime>
    :player:<frags>:<deaths>:<playtime>:<team>:<ID>:<nickname>
+   :restart
    :end
    :gameover
 
diff --git a/data/default.cfg b/data/default.cfg
index 74c47655d..bdce3f09e 100644
--- a/data/default.cfg
+++ b/data/default.cfg
@@ -207,7 +207,7 @@ set g_minstagib 0		// enable minstagib
 set g_minstagib_extralives 2	// how many extra lives you will get per powerup
 set g_minstagib_ammo_start 10	// starting ammo
 set g_minstagib_ammo_drop 5	// how much ammo you'll get for weapons or cells
-set g_minstagib_invis_alpha 0.1 // set -1 for complete invisibility
+set g_minstagib_invis_alpha 0.05
 set g_minstagib_speed_jumpheight 1.8
 set g_minstagib_speed_moverate 1.25
 set g_rocketarena 0
diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 302341580..71d17e871 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -443,7 +443,10 @@ void PutClientInServer (void)
 		self.solid = SOLID_SLIDEBOX;
 		self.flags = FL_CLIENT;
 		self.takedamage = DAMAGE_AIM;
-		self.effects = 0;
+		if(g_minstagib)
+			self.effects = EF_FULLBRIGHT;
+		else
+			self.effects = 0;
 		self.air_finished = time + 12;
 		self.dmg = 2;
 
@@ -939,13 +942,20 @@ void player_powerups (void)
 {
 	if (g_minstagib)
 	{
-		self.effects = EF_FULLBRIGHT;
 		if (self.items & IT_STRENGTH)
 		{
 			if (time > self.strength_finished)
 			{
-				self.alpha = default_player_alpha;
-				self.exteriorweaponentity.alpha = default_weapon_alpha;
+				if (g_minstagib_invis_alpha > 0)
+				{
+					self.alpha = default_player_alpha;
+					self.exteriorweaponentity.alpha = default_weapon_alpha;
+					self.effects = self.effects | EF_FULLBRIGHT;
+				}
+				else
+				{
+					self.effects -= self.effects & EF_NODRAW;
+				}
 				self.items = self.items - (self.items & IT_STRENGTH);
 				sprint(self, "^3Invisibility has worn off\n");
 			}
@@ -954,8 +964,16 @@ void player_powerups (void)
 		{
 			if (time < self.strength_finished)
 			{
-				self.alpha = cvar("g_minstagib_invis_alpha");
-				self.exteriorweaponentity.alpha = cvar("g_minstagib_invis_alpha");
+				if (g_minstagib_invis_alpha > 0)
+				{
+					self.alpha = g_minstagib_invis_alpha;
+					self.exteriorweaponentity.alpha = g_minstagib_invis_alpha;
+					self.effects -= self.effects & EF_FULLBRIGHT;
+				}
+				else
+				{
+					self.effects = self.effects | EF_NODRAW;
+				}
 				self.items = self.items | IT_STRENGTH;
 				sprint(self, "^3You are invisible\n");
 			}
@@ -1300,8 +1318,10 @@ void PlayerPreThink (void)
 			return;					// the think tics
 		}
 
+		if(self.teleport_time)
 		if(time > self.teleport_time)
 		{
+			self.teleport_time = 0;
 			self.effects = self.effects - (self.effects & EF_NODRAW);
 			if(self.weaponentity)
 				self.weaponentity.flags = self.weaponentity.flags - (self.weaponentity.flags & EF_NODRAW);
diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index d86f4e54b..2106398dc 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -1,7 +1,7 @@
 // Globals
 
 float g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_lms, g_runematch;
-float g_cloaked, g_footsteps, g_grappling_hook, g_instagib, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_rocketarena, g_vampire;
+float g_cloaked, g_footsteps, g_grappling_hook, g_instagib, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_rocketarena, g_vampire, g_minstagib_invis_alpha;
 
 float sv_cheats;
 
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 440a0ef96..9aa73f4cc 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -757,6 +757,7 @@ void readlevelcvars(void)
 		start_switchweapon = WEP_NEX;
 		weapon_action(start_switchweapon, WR_PRECACHE);
 		start_ammo_cells = cvar("g_minstagib_ammo_start");
+		g_minstagib_invis_alpha = cvar("g_minstagib_invis_alpha");
 	}
 	else
 	{
-- 
2.39.2