From 13e2c953221b4fd4a88fa381f02c48e62596a5d4 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Sat, 11 Oct 2008 09:19:54 +0000
Subject: [PATCH] make playerincrosshair() use camera1 object

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2925 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/weapon.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 13528819..f84336f7 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -210,7 +210,11 @@ playerent *intersectclosest(vec &from, vec &to, playerent *at)
 
 playerent *playerincrosshair()
 {
-    return intersectclosest(player1->o, worldpos, player1);
+    if(camera1->type==ENT_PLAYER)
+    {
+        return intersectclosest(camera1->o, worldpos, (playerent *)camera1);
+    }
+    else return NULL;
 }
 
 void damageeffect(int damage, playerent *d)