From c46ad44ff79b78d0177e9bbe7345a2ea9f0964b2 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Sun, 20 Apr 2008 20:10:37 +0000
Subject: [PATCH] spectfov

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1815 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/rendergl.cpp | 4 ++--
 source/src/weapon.cpp   | 1 +
 source/src/weapon.h     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp
index 8e24fb32..46a9f3ac 100644
--- a/source/src/rendergl.cpp
+++ b/source/src/rendergl.cpp
@@ -289,12 +289,12 @@ void rendercursor(int x, int y, int w)
 
 VARP(fov, 90, 100, 120);
 VARP(scopefov, 5, 50, 50);
-VARP(spectfov, 5, 50, 120);
+VARP(spectfov, 5, 120, 120);
 
 float dynfov()
 {
     if(player1->weaponsel->type == GUN_SNIPER && ((sniperrifle *)player1->weaponsel)->scoped) return (float)scopefov;
-    else if(player1->state == CS_SPECTATE) return (float)spectfov;
+    else if(player1->isspectating()) return (float)spectfov;
     else return (float)fov;
 }
 
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index b68b3f94..ac8fe9c8 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -850,6 +850,7 @@ float sniperrifle::dynrecoil() { return scoped ? info.recoil / 3 : info.recoil;
 bool sniperrifle::selectable() { return weapon::selectable() && !m_noprimary && this == owner->primweap; }
 void sniperrifle::onselecting() { weapon::onselecting(); scoped = false; }
 void sniperrifle::ondeselecting() { scoped = false; }
+void sniperrifle::onownerdies() { scoped = false; }
 void sniperrifle::renderhudmodel() { if(!scoped) weapon::renderhudmodel(); }
 void sniperrifle::renderaimhelp(bool teamwarning) { if(scoped) drawscope(); if(teamwarning) drawcrosshair(teamwarning); }
 
diff --git a/source/src/weapon.h b/source/src/weapon.h
index 1c96ec80..a7fce2a2 100644
--- a/source/src/weapon.h
+++ b/source/src/weapon.h
@@ -101,9 +101,9 @@ struct sniperrifle : gun
     bool selectable();
     void onselecting();
     void ondeselecting();
+    void onownerdies();
     void renderhudmodel();
     void renderaimhelp(bool teamwarning);
-
     void setscope(bool enable);
 };