From f6fe5784c37e35975efef15d198d0b4d38547a18 Mon Sep 17 00:00:00 2001 From: driAn Date: Sun, 24 Aug 2008 14:51:56 +0000 Subject: [PATCH] mode typo, fixed wrong area respawn delay git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2375 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 4 ++-- source/src/main.cpp | 2 +- source/src/protocol.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index e0e3a5fc..c8751e1a 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -396,13 +396,13 @@ bool tryrespawn() if(player1->state==CS_DEAD) { // set min wait time when in spectate mode (avoid unfair specting) - if(player1->isspectating() && player1->spectatemode!=SM_DEATHCAM) + if(player1->isspectating() && player1->spectatemode!=SM_DEATHCAM && !m_arena) { spectate(SM_DEATHCAM); player1->respawnoffset = lastmillis; // count again } - int respawnmillis = player1->respawnoffset+(m_ctf ? 5000 : 2000); + int respawnmillis = player1->respawnoffset+(m_arena ? 0 : (m_ctf ? 5000 : 2000)); if(lastmillis>respawnmillis) { diff --git a/source/src/main.cpp b/source/src/main.cpp index e9b5805a..e85b7780 100644 --- a/source/src/main.cpp +++ b/source/src/main.cpp @@ -504,7 +504,7 @@ int main(int argc, char **argv) initing = NOT_INITING; #ifdef WIN32 - SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS); + SetPriorityClass(GetCurrentProcess(), ABOVE_NORMAL_PRIORITY_CLASS); #endif initlog("sdl"); diff --git a/source/src/protocol.cpp b/source/src/protocol.cpp index a881b041..96c0e9ed 100644 --- a/source/src/protocol.cpp +++ b/source/src/protocol.cpp @@ -97,7 +97,7 @@ const char *modefullnames[] = { "team deathmatch", "coopedit", "deathmatch", "survivor", "team survivor", "ctf", "pistol frenzy", "bot team deathmatch", "bot deathmatch", "last swiss standing", - "one shot, one kill", "team one shot, one kill", "bot one shot, one skill" + "one shot, one kill", "team one shot, one kill", "bot one shot, one kill" }; const char *modeacronymnames[] =