ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Second batch of bug fixes reported and patched by Zack "ZTurtleMan" Middleton: 

#4740
#4741
#4742
#4743
#4744
This commit is contained in:
Thilo Schulz 2010-08-29 18:08:29 +00:00
parent 83a3e2ae1b
commit 5fe2a61910
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/client/cl_cin.c
View File

@ -1663,6 +1663,9 @@ void CIN_UploadCinematic(int handle) {
if (cl_inGameVideo->integer == 0 && cinTable[handle].playonwalls == 1) { if (cl_inGameVideo->integer == 0 && cinTable[handle].playonwalls == 1) {
cinTable[handle].playonwalls--; cinTable[handle].playonwalls--;
} }
else if (cl_inGameVideo->integer != 0 && cinTable[handle].playonwalls != 1) {
cinTable[handle].playonwalls = 1;
}
} }
} }

4
code/game/ai_chat.c
View File

@ -743,7 +743,7 @@ int BotChat_EnemySuicide(bot_state_t *bs) {
if (bs->lastchat_time > FloatTime() - TIME_BETWEENCHATTING) return qfalse; if (bs->lastchat_time > FloatTime() - TIME_BETWEENCHATTING) return qfalse;
if (BotNumActivePlayers() <= 1) 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 //don't chat in teamplay
if (TeamPlayIsOn()) return qfalse; if (TeamPlayIsOn()) return qfalse;
// don't chat in tournament mode // don't chat in tournament mode
@ -795,7 +795,7 @@ int BotChat_HitTalking(bot_state_t *bs) {
if (!BotValidChatPosition(bs)) return qfalse; if (!BotValidChatPosition(bs)) return qfalse;
// //
ClientName(g_entities[bs->client].client->lasthurt_client, name, sizeof(name)); 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); BotAI_BotInitialChat(bs, "hit_talking", name, weap, NULL);
bs->lastchat_time = FloatTime(); bs->lastchat_time = FloatTime();

9
code/game/bg_misc.c
View File

@ -1366,6 +1366,7 @@ char *eventnames[] = {
"EV_PROXIMITY_MINE_TRIGGER", "EV_PROXIMITY_MINE_TRIGGER",
"EV_KAMIKAZE", // kamikaze explodes "EV_KAMIKAZE", // kamikaze explodes
"EV_OBELISKEXPLODE", // obelisk explodes "EV_OBELISKEXPLODE", // obelisk explodes
"EV_OBELISKPAIN", // obelisk pain
"EV_INVUL_IMPACT", // invulnerability sphere impact "EV_INVUL_IMPACT", // invulnerability sphere impact
"EV_JUICED", // invulnerability juiced effect "EV_JUICED", // invulnerability juiced effect
"EV_LIGHTNINGBOLT", // lightning bolt bounced of invulnerability sphere "EV_LIGHTNINGBOLT", // lightning bolt bounced of invulnerability sphere
@ -1373,7 +1374,13 @@ char *eventnames[] = {
"EV_DEBUG_LINE", "EV_DEBUG_LINE",
"EV_STOPLOOPINGSOUND", "EV_STOPLOOPINGSOUND",
"EV_TAUNT" "EV_TAUNT",
"EV_TAUNT_YES",
"EV_TAUNT_NO",
"EV_TAUNT_FOLLOWME",
"EV_TAUNT_GETFLAG",
"EV_TAUNT_GUARDBASE",
"EV_TAUNT_PATROL"
}; };

6
code/server/sv_ccmds.c
View File

@ -180,11 +180,15 @@ static void SV_Map_f( void ) {
// may not set sv_maxclients directly, always set latched // may not set sv_maxclients directly, always set latched
Cvar_SetLatched( "sv_maxclients", "8" ); Cvar_SetLatched( "sv_maxclients", "8" );
cmd += 2; cmd += 2;
if (!Q_stricmp( cmd, "devmap" ) ) {
cheat = qtrue;
} else {
cheat = qfalse; cheat = qfalse;
}
killBots = qtrue; killBots = qtrue;
} }
else { else {
if ( !Q_stricmp( cmd, "devmap" ) || !Q_stricmp( cmd, "spdevmap" ) ) { if ( !Q_stricmp( cmd, "devmap" ) ) {
cheat = qtrue; cheat = qtrue;
killBots = qtrue; killBots = qtrue;
} else { } else {