From a1543ca637184964da007d7804ff44a98a5cc1a6 Mon Sep 17 00:00:00 2001
From: vermeulenl <vermeulenl@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 22 Apr 2005 01:03:13 +0000
Subject: [PATCH] Got rid of sparks changed intermission time to 10 seconds

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@373 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 qcsrc/gamec/bot_misc.c   | 130 ++++++++++++++++++++++++++++++++++++---
 qcsrc/gamec/cl_player.c  |   2 +-
 qcsrc/gamec/g_triggers.c |   4 +-
 qcsrc/gamec/g_world.c    |   2 +-
 4 files changed, 127 insertions(+), 11 deletions(-)

diff --git a/qcsrc/gamec/bot_misc.c b/qcsrc/gamec/bot_misc.c
index f7fbb5bd4..1f30c1b7f 100644
--- a/qcsrc/gamec/bot_misc.c
+++ b/qcsrc/gamec/bot_misc.c
@@ -56,42 +56,158 @@ string(float r) BotName =
 	if (r == 1)
 	{
 		self.playermodel = "models/player/visitant.zym";
+		self.playerskin = "0";
 		return "Visitant";
 	}
 	else if (r == 2)
 	{
 		self.playermodel = "models/player/marine.zym";
+		self.playerskin = "0";
 		return "Marine";
 	}
 	else if (r == 3)
 	{
 		self.playermodel = "models/player/specop.zym";
+		self.playerskin = "0";
 		return "Specop";
 	}
 	else if (r == 4)
 	{
-		self.playermodel = "models/player/mulder.zym";
-		return "Mulder";
+		self.playermodel = "models/player/nexus.zym";
+		self.playerskin = "0";
+		return "Nexus";
 	}
 	else if (r == 5)
 	{
-		self.playermodel = "models/player/fshock.zym";
-		return "fShock";
+		self.playermodel = "models/player/skadi.zym";
+		self.playerskin = "0";
+		return "Skadi";
 	}
 	else if (r == 6)
 	{
 		self.playermodel = "models/player/lurk.zym";
+		self.playerskin = "0";
 		return "Lurk";
 	}
 	else if (r == 7)
 	{
 		self.playermodel = "models/player/headhunter.zym";
+		self.playerskin = "0";
 		return "HeadHunter";
 	}
+	else if (r == 8)
+	{
+		self.playermodel = "models/player/carni.zym";
+		self.playerskin = "0";
+		return "Carni";
+	}
+	else if (r == 9)
+	{
+		self.playermodel = "models/player/grunt.zym";
+		self.playerskin = "0";
+		return "Grunt";
+	}
+	else if (r == 10)
+	{
+		self.playermodel = "models/player/insurrectionist.zym";
+		self.playerskin = "0";
+		return "Insurrectionist";
+	}
+	else if (r == 11)
+	{
+		self.playermodel = "models/player/jeandarc.zym";
+		self.playerskin = "0";
+		return "Jeandarc";
+	}
+	else if (r == 12)
+	{
+		self.playermodel = "models/player/lycanthrope.zym";
+		self.playerskin = "0";
+		return "Lycanthrope";
+	}
+	else if (r == 13)
+	{
+		self.playermodel = "models/player/pyria.zym";
+		self.playerskin = "0";
+		return "Pyria";
+	}
+	else if (r == 14)
+	{
+		self.playermodel = "models/player/shock.zym";
+		self.playerskin = "0";
+		return "Shock";
+	}
+	else if (r == 15)
+	{
+		self.playermodel = "models/player/marine.zym";
+		self.playerskin = "1";
+		return "Private";
+	}
+	else if (r == 16)
+	{
+		self.playermodel = "models/player/nexus.zym";
+		self.playerskin = "1";
+		return "Mulder";
+	}
+	else if (r == 17)
+	{
+		self.playermodel = "models/player/skadi.zym";
+		self.playerskin = "1";
+		return "Elite";
+	}
+	else if (r == 18)
+	{
+		self.playermodel = "models/player/lurk.zym";
+		self.playerskin = "1";
+		return "Reptile";
+	}
+	else if (r == 19)
+	{
+		self.playermodel = "models/player/crash.zym";
+		self.playerskin = "2";
+		return "mechanical";
+	}
+	else if (r == 20)
+	{
+		self.playermodel = "models/player/crash.zym";
+		self.playerskin = "1";
+		return "Quark";
+	}
+	else if (r == 21)
+	{
+		self.playermodel = "models/player/insurrectionist.zym";
+		self.playerskin = "1";
+		return "Anarchist";
+	}
+	else if (r == 22)
+	{
+		self.playermodel = "models/player/jeandarc.zym";
+		self.playerskin = "1";
+		return "Heroine";
+	}
+	else if (r == 23)
+	{
+		self.playermodel = "models/player/lycanthrope.zym";
+		self.playerskin = "1";
+		return "Wolf";
+	}
+	else if (r == 24)
+	{
+		self.playermodel = "models/player/pyria.zym";
+		self.playerskin = "1";
+		return "Soldier";
+	}
+	else if (r == 25)
+	{
+		self.playermodel = "models/player/rebel.zym";
+		self.playerskin = "0";
+		return "Rebel";
+	}
 	else
 	{
-		self.playermodel = "models/player/robot.zym";
-		return "Robot";
+		self.playermodel = "models/player/crash.zym";
+		self.playerskin = "0";
+		return "Crash";
 	}
 
 };
@@ -155,7 +271,7 @@ void(float tpic) bot_start_topic =
 void() bot_chat =
 {
 	local float r;
-	if (b_options & OPT_NOCHAT)
+//	if (b_options & OPT_NOCHAT)
 		return;
 	r = ceil (random() * 6);
 
diff --git a/qcsrc/gamec/cl_player.c b/qcsrc/gamec/cl_player.c
index ffa24f2a0..98c3efb5c 100644
--- a/qcsrc/gamec/cl_player.c
+++ b/qcsrc/gamec/cl_player.c
@@ -94,7 +94,7 @@ void player_anim (void)
 		self.frame = $idle;
 
 	if (!(self.flags & FL_ONGROUND))
-		self.frame = $idle;
+		self.frame = $jump;
 }
 //End change by Supajoe on 11:44 PM EST 11/16/03 (Subject: Player animations)
 
diff --git a/qcsrc/gamec/g_triggers.c b/qcsrc/gamec/g_triggers.c
index f32c5504e..276a20ce8 100644
--- a/qcsrc/gamec/g_triggers.c
+++ b/qcsrc/gamec/g_triggers.c
@@ -385,7 +385,7 @@ if(self.noise) {
 };
 
 
-
+/*
 void() sparksthink =
 {
   self.nextthink = time + 0.1;
@@ -418,7 +418,7 @@ void() func_sparks =
     ambientsound (self.origin, self.noise, 1, ATTN_STATIC);
   }
 }
-
+*/
 
 
 /*
diff --git a/qcsrc/gamec/g_world.c b/qcsrc/gamec/g_world.c
index 764270d0e..880e36321 100644
--- a/qcsrc/gamec/g_world.c
+++ b/qcsrc/gamec/g_world.c
@@ -360,7 +360,7 @@ void() IntermissionThink =
 	if (time < intermission_exittime)
 		return;
 
-	if (time < intermission_exittime + 60 && !self.button0 && !self.button1 && !self.button2 && !self.button3)
+	if (time < intermission_exittime + 10 && !self.button0 && !self.button1 && !self.button2 && !self.button3)
 		return;
 
 	GotoNextMap ();
-- 
2.39.2