From bedf989f4937613f2b67ba0d620ceedacc6c3c66 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Tue, 25 Dec 2007 15:54:59 +0000
Subject: [PATCH] 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       | 1 -
 source/src/bot/ac_bot_ai.cpp    | 1 -
 source/src/bot/bot.cpp          | 1 -
 source/src/bot/bot_ai.cpp       | 1 -
 source/src/bot/bot_util.cpp     | 1 -
 source/src/bot/bot_waypoint.cpp | 1 -
 source/src/bot/botmanager.cpp   | 1 -
 source/src/clientgame.cpp       | 3 +--
 source/src/entities.cpp         | 2 +-
 source/src/physics.cpp          | 6 +++++-
 10 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/source/src/bot/ac_bot.cpp b/source/src/bot/ac_bot.cpp
index a763a120..91fe3bbb 100644
--- a/source/src/bot/ac_bot.cpp
+++ b/source/src/bot/ac_bot.cpp
@@ -11,7 +11,6 @@
 //
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 #ifdef AC_CUBE
diff --git a/source/src/bot/ac_bot_ai.cpp b/source/src/bot/ac_bot_ai.cpp
index 8ca5f5d3..4a10f176 100644
--- a/source/src/bot/ac_bot_ai.cpp
+++ b/source/src/bot/ac_bot_ai.cpp
@@ -9,7 +9,6 @@
 
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 #ifdef AC_CUBE
diff --git a/source/src/bot/bot.cpp b/source/src/bot/bot.cpp
index d6289296..dcdb1ab6 100644
--- a/source/src/bot/bot.cpp
+++ b/source/src/bot/bot.cpp
@@ -11,7 +11,6 @@
 //
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 vector<botent *> bots;
diff --git a/source/src/bot/bot_ai.cpp b/source/src/bot/bot_ai.cpp
index 4c299a87..0a81584e 100644
--- a/source/src/bot/bot_ai.cpp
+++ b/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];
diff --git a/source/src/bot/bot_util.cpp b/source/src/bot/bot_util.cpp
index 224843fa..5f86759e 100644
--- a/source/src/bot/bot_util.cpp
+++ b/source/src/bot/bot_util.cpp
@@ -11,7 +11,6 @@
 //
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 // Function code by PMB - Begin
diff --git a/source/src/bot/bot_waypoint.cpp b/source/src/bot/bot_waypoint.cpp
index 110389e8..1d1670b8 100644
--- a/source/src/bot/bot_waypoint.cpp
+++ b/source/src/bot/bot_waypoint.cpp
@@ -8,7 +8,6 @@
 //
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 vec v_debuggoal = g_vecZero;
diff --git a/source/src/bot/botmanager.cpp b/source/src/bot/botmanager.cpp
index 72e373a3..c0fabb06 100644
--- a/source/src/bot/botmanager.cpp
+++ b/source/src/bot/botmanager.cpp
@@ -11,7 +11,6 @@
 //
 
 #include "pch.h"
-#include "cube.h"
 #include "bot.h"
 
 
diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 05b8cc5b..4b3bae49 100644
--- a/source/src/clientgame.cpp
+++ b/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 
     {
diff --git a/source/src/entities.cpp b/source/src/entities.cpp
index a6d5fdc6..4b332cd2 100644
--- a/source/src/entities.cpp
+++ b/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)
diff --git a/source/src/physics.cpp b/source/src/physics.cpp
index 3b8c04ef..dba925b2 100644
--- a/source/src/physics.cpp
+++ b/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;