[quake3-commits] r1791 - in trunk/code: client game server

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2010-08-29 14:08:29 -0400 (Sun, 29 Aug 2010)
New Revision: 1791

Modified:
   trunk/code/client/cl_cin.c
   trunk/code/game/ai_chat.c
   trunk/code/game/bg_misc.c
   trunk/code/server/sv_ccmds.c
Log:
Second batch of bug fixes reported and patched by Zack "ZTurtleMan" Middleton:
#4740
#4741
#4742
#4743
#4744


Modified: trunk/code/client/cl_cin.c
===================================================================
--- trunk/code/client/cl_cin.c	2010-08-29 17:32:54 UTC (rev 1790)
+++ trunk/code/client/cl_cin.c	2010-08-29 18:08:29 UTC (rev 1791)
@@ -1663,6 +1663,9 @@
 		if (cl_inGameVideo->integer == 0 && cinTable[handle].playonwalls == 1) {
 			cinTable[handle].playonwalls--;
 		}
+		else if (cl_inGameVideo->integer != 0 && cinTable[handle].playonwalls != 1) {
+			cinTable[handle].playonwalls = 1;
+		}
 	}
 }
 

Modified: trunk/code/game/ai_chat.c
===================================================================
--- trunk/code/game/ai_chat.c	2010-08-29 17:32:54 UTC (rev 1790)
+++ trunk/code/game/ai_chat.c	2010-08-29 18:08:29 UTC (rev 1791)
@@ -743,7 +743,7 @@
 	if (bs->lastchat_time > FloatTime() - TIME_BETWEENCHATTING) return qfalse;
 	if (BotNumActivePlayers() <= 1) return qfalse;
 	//
-	rnd = trap_Characteristic_BFloat(bs->character, CHARACTERISTIC_CHAT_KILL, 0, 1);
+	rnd = trap_Characteristic_BFloat(bs->character, CHARACTERISTIC_CHAT_ENEMYSUICIDE, 0, 1);
 	//don't chat in teamplay
 	if (TeamPlayIsOn()) return qfalse;
 	// don't chat in tournament mode
@@ -795,7 +795,7 @@
 	if (!BotValidChatPosition(bs)) return qfalse;
 	//
 	ClientName(g_entities[bs->client].client->lasthurt_client, name, sizeof(name));
-	weap = BotWeaponNameForMeansOfDeath(g_entities[bs->client].client->lasthurt_client);
+	weap = BotWeaponNameForMeansOfDeath(g_entities[bs->client].client->lasthurt_mod);
 	//
 	BotAI_BotInitialChat(bs, "hit_talking", name, weap, NULL);
 	bs->lastchat_time = FloatTime();

Modified: trunk/code/game/bg_misc.c
===================================================================
--- trunk/code/game/bg_misc.c	2010-08-29 17:32:54 UTC (rev 1790)
+++ trunk/code/game/bg_misc.c	2010-08-29 18:08:29 UTC (rev 1791)
@@ -1366,6 +1366,7 @@
 	"EV_PROXIMITY_MINE_TRIGGER",
 	"EV_KAMIKAZE",			// kamikaze explodes
 	"EV_OBELISKEXPLODE",		// obelisk explodes
+	"EV_OBELISKPAIN",		// obelisk pain
 	"EV_INVUL_IMPACT",		// invulnerability sphere impact
 	"EV_JUICED",				// invulnerability juiced effect
 	"EV_LIGHTNINGBOLT",		// lightning bolt bounced of invulnerability sphere
@@ -1373,7 +1374,13 @@
 
 	"EV_DEBUG_LINE",
 	"EV_STOPLOOPINGSOUND",
-	"EV_TAUNT"
+	"EV_TAUNT",
+	"EV_TAUNT_YES",
+	"EV_TAUNT_NO",
+	"EV_TAUNT_FOLLOWME",
+	"EV_TAUNT_GETFLAG",
+	"EV_TAUNT_GUARDBASE",
+	"EV_TAUNT_PATROL"
 
 };
 

Modified: trunk/code/server/sv_ccmds.c
===================================================================
--- trunk/code/server/sv_ccmds.c	2010-08-29 17:32:54 UTC (rev 1790)
+++ trunk/code/server/sv_ccmds.c	2010-08-29 18:08:29 UTC (rev 1791)
@@ -180,11 +180,15 @@
 		// may not set sv_maxclients directly, always set latched
 		Cvar_SetLatched( "sv_maxclients", "8" );
 		cmd += 2;
-		cheat = qfalse;
+		if (!Q_stricmp( cmd, "devmap" ) ) {
+			cheat = qtrue;
+		} else {
+			cheat = qfalse;
+		}
 		killBots = qtrue;
 	}
 	else {
-		if ( !Q_stricmp( cmd, "devmap" ) || !Q_stricmp( cmd, "spdevmap" ) ) {
+		if ( !Q_stricmp( cmd, "devmap" ) ) {
 			cheat = qtrue;
 			killBots = qtrue;
 		} else {