make playerincrosshair() use camera1 object

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2925 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2008-10-11 09:19:54 +00:00
parent 9cce4a6aae
commit 13e2c95322
1 changed files with 5 additions and 1 deletions
@@ -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)