From 244b7fa9384e5e60fec9009edc98944d01664628 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 19 Oct 2008 00:02:52 +0000 Subject: [PATCH] fixed weapon coming up on spawn git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3152 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 4 ++-- source/src/clients2c.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 33b1c07d..363f8b4b 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -470,6 +470,8 @@ void respawnself() setscope(false); spawnplayer(player1); player1->lifesequence++; + player1->weaponswitch(player1->primweap); + player1->weaponchanging -= weapon::weaponchangetime/2; } } @@ -495,8 +497,6 @@ bool tryrespawn() return false; } respawnself(); - player1->weaponswitch(player1->primweap); - player1->lastaction -= weapon::weaponchangetime/2; return true; } else lastspawnattempt = lastmillis; diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index 634e8aa1..a9f5cb52 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -357,6 +357,8 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) if(m_botmode) BotManager.RespawnBots(); } addmsg(SV_SPAWN, "rii", player1->lifesequence, player1->weaponsel->type); + player1->weaponswitch(player1->primweap); + player1->weaponchanging -= weapon::weaponchangetime/2; break; }