From 0feaa049cff49c055488429679cf4fe6d4845f83 Mon Sep 17 00:00:00 2001 From: driAn Date: Wed, 6 Dec 2006 20:46:06 +0000 Subject: [PATCH] no message git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@767 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- bot/waypoints/ac_desert2.wpt | Bin 0 -> 76112 bytes source/src/bot/bot_ai.cpp | 11 +++++------ source/src/bot/botmanager.cpp | 4 +--- source/src/clientgame.cpp | 2 +- source/src/entities.cpp | 23 +++-------------------- source/src/rendertext.cpp | 1 - source/src/sound.cpp | 2 ++ 7 files changed, 12 insertions(+), 31 deletions(-) create mode 100644 bot/waypoints/ac_desert2.wpt diff --git a/bot/waypoints/ac_desert2.wpt b/bot/waypoints/ac_desert2.wpt new file mode 100644 index 0000000000000000000000000000000000000000..b39a320bc18e8c8be523b5b97b11ad42cba02ae9 GIT binary patch literal 76112 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 literal 0 HcmV?d00001 diff --git a/source/src/bot/bot_ai.cpp b/source/src/bot/bot_ai.cpp index ebb073bc..a83a6144 100644 --- a/source/src/bot/bot_ai.cpp +++ b/source/src/bot/bot_ai.cpp @@ -1953,12 +1953,11 @@ void CBot::HearSound(int n, vec *o) // Has the bot already an enemy? if (m_pMyEnt->enemy) return; - // Is the sound not interesting? -//fixmebot -/* if ((n==S_DIE1) || (n==S_DIE2) || (n==S_DEATHR) || (n==S_DEATHE) || (n==S_DEATHS) || - (n==S_DEATHB) || (n==S_DEATHH) || (n==S_DEATHD) || (n==S_PIGGR2)) - return;*/ - + + //fixmebot + // Is the sound not interesting? + if(n == S_DIE1 || n == S_DIE2) return; + int soundvol = m_pBotSkill->iMaxHearVolume - (int)(GetDistance(*o)*3*m_pBotSkill->iMaxHearVolume/255); diff --git a/source/src/bot/botmanager.cpp b/source/src/bot/botmanager.cpp index 9ec7b54e..89d50f0a 100644 --- a/source/src/bot/botmanager.cpp +++ b/source/src/bot/botmanager.cpp @@ -382,9 +382,7 @@ void CBotManager::LetBotsUpdateStats() void CBotManager::LetBotsHear(int n, vec *loc) { - if (bots.length() == 0) return; - - if (!loc) return; + if (bots.length() == 0 || !loc) return; loopv(bots) { diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index fe4ef762..6d6dcc75 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -325,7 +325,7 @@ int findplayerstart(playerent *d) int r = fixspawn-->0 ? 4 : rnd(10)+1; if(m_teammode) loopi(r) spawncycle = findentity(PLAYERSTART, spawncycle+1, rb_team_int(d->team)); - else if(m_arena) loopi(r) spawncycle = findentity(PLAYERSTART, spawncycle+1); + else if(m_arena) loopi(r) spawncycle = findentity(PLAYERSTART, spawncycle+1, 100); else { int bestent = -1; diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 0ce3edc5..31a17c72 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -278,30 +278,13 @@ void equip(playerent *d) { d->ammo[GUN_PISTOL] = itemstats[GUN_PISTOL].max-magsize(GUN_PISTOL); d->mag[GUN_PISTOL] = magsize(GUN_PISTOL); - } + }; + if(!m_noprimary) { d->ammo[d->primary] = itemstats[d->primary].start-magsize(d->primary); d->mag[d->primary] = magsize(d->primary); - } - - /* - if(m_pistol) // pistol only mode - { - d->ammo[GUN_PISTOL] = itemstats[GUN_PISTOL].max-magsize(GUN_PISTOL); - d->mag[GUN_PISTOL] = magsize(GUN_PISTOL); - } - else if(m_lss) - { - d->mag[d->primary] = d->mag[GUN_PISTOL] = 0; - } - else if(!m_noguns) - { - d->ammo[GUN_PISTOL] = itemstats[GUN_PISTOL].start-magsize(GUN_PISTOL); - d->mag[GUN_PISTOL] = magsize(GUN_PISTOL); - d->ammo[d->primary] = itemstats[d->primary].start-magsize(d->primary); - d->mag[d->primary] = magsize(d->primary); - };*/ + }; if (d->hasarmour) { diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp index 307b5f91..5639fbf8 100644 --- a/source/src/rendertext.cpp +++ b/source/src/rendertext.cpp @@ -206,7 +206,6 @@ void draw_text(const char *str, int left, int top) switch(str[i+1]) { case '0': glColor3ub(64,255,128); i++; continue; // green: player talk - case '1': glColor3ub(96,160,255); i++; continue; // blue: "echo" command case '2': glColor3ub(255,192,64); i++; continue; // yellow: gameplay action messages, only actions done by players case '3': glColor3ub(255,64,64); i++; continue; // red: important errors default: continue; // white: everything else diff --git a/source/src/sound.cpp b/source/src/sound.cpp index 041a56b0..cb78703b 100644 --- a/source/src/sound.cpp +++ b/source/src/sound.cpp @@ -1,6 +1,7 @@ // sound.cpp: uses fmod on windows and sdl_mixer on unix (both had problems on the other platform) #include "cube.h" +#include "bot/bot.h" //#ifndef WIN32 // NOTE: fmod not being supported for the moment as it does not allow stereo pan/vol updating during playback #define USE_MIXER @@ -211,6 +212,7 @@ void playsound(int n, vec *loc) if(nosound) return; if(!soundvol) return; if(n==S_NULL) return; + if(m_botmode) BotManager.LetBotsHear(n, loc); if(lastmillis==lastsoundmillis) soundsatonce++; else soundsatonce = 1; lastsoundmillis = lastmillis; if(soundsatonce>5) return; // avoid bursts of sounds with heavy packetloss and in sp