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

View file

@ -743,7 +743,7 @@ int BotChat_EnemySuicide(bot_state_t *bs) {
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 @@ int BotChat_HitTalking(bot_state_t *bs) {
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();