no pickup for spectators

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1487 e016b1c5-ed68-44aa-a2f7-31cac88cffde

source/src/bot/ac_bot.cpp

@@ -11,7 +11,6 @@
 //
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 #ifdef AC_CUBE

source/src/bot/ac_bot_ai.cpp

@@ -9,7 +9,6 @@
 
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 #ifdef AC_CUBE

source/src/bot/bot.cpp

@@ -11,7 +11,6 @@
 //
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 vector<botent *> bots;

source/src/bot/bot_ai.cpp

@@ -11,7 +11,6 @@
 // Code of CBot - Start
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 extern weaponinfo_s WeaponInfoTable[MAX_WEAPONS];

source/src/bot/bot_util.cpp

@@ -11,7 +11,6 @@
 //
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 // Function code by PMB - Begin

source/src/bot/bot_waypoint.cpp

@@ -8,7 +8,6 @@
 //
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 vec v_debuggoal = g_vecZero;

source/src/bot/botmanager.cpp

@@ -11,7 +11,6 @@
 //
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 

source/src/clientgame.cpp

@@ -809,8 +809,7 @@ void followplayer(int i)
 
 void toggledeathcam()
 {
-    if(player1->spectating == SM_NONE) showscores(false); // disable once
-
+    showscores(false);
     if(player1->spectating == SM_FOLLOWPLAYER) followplayer();
     else 
     {

source/src/entities.cpp

@@ -138,7 +138,7 @@ void trypickup(int n, playerent *d)
 
 void checkitems(playerent *d)
 {
-    if(editmode) return;
+    if(editmode || d->state!=CS_ALIVE) return;
     d->onladder = false;
     float eyeheight = d->dyneyeheight();
     loopv(ents)

source/src/physics.cpp

@@ -496,7 +496,11 @@ void jumpn(bool on)
     if(intermission) return;
     if(player1->state==CS_DEAD || player1->state==CS_SPECTATE)
     {
-        if(on) player1->spectating = SM_FLY;
+        if(on)
+        {
+            showscores(false);
+            player1->spectating = SM_FLY;
+        }
     }
     else if(player1->crouching) return;
     else player1->jumpnext = on;