From befd22d2e8d4c32361671b0939a097c5b8928216 Mon Sep 17 00:00:00 2001
From: aurhat <szyk@vivaldi.net>
Date: Sun, 8 Feb 2015 23:05:37 +0100
Subject: [PATCH] Don't hide the sniper rifle scope if scoreboard is enabled

The fix also allows to turn on/off the scope during intermission (since
a few years the scope was blocked in intermission, because it was
immediately turned off by scoreboard).
---
 source/src/menus.cpp  | 5 +++--
 source/src/weapon.cpp | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/src/menus.cpp b/source/src/menus.cpp
index 1dd46a5d..494a5931 100644
--- a/source/src/menus.cpp
+++ b/source/src/menus.cpp
@@ -170,9 +170,11 @@ bool menuvisible()
     return true;
 }
 
+extern void *scoremenu;
+
 void rendermenu()
 {
-    setscope(false);
+    if(curmenu != scoremenu) setscope(false);
     gmenu &m = *curmenu;
     m.refresh();
     m.render();
@@ -1460,7 +1462,6 @@ void setscorefont();
 VARFP(scorefont, 0, 0, 1, setscorefont());
 void setscorefont()
 {
-    extern void *scoremenu;
     switch(scorefont)
     {
         case 1: menufont(scoremenu, "mono"); break;
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 202d90aa..1895c01c 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -1595,7 +1595,6 @@ void knife::renderstats() { }
 void setscope(bool enable)
 {
     if(player1->weaponsel->type != GUN_SNIPER) return;
-    if(intermission) return;
     sniperrifle *sr = (sniperrifle *)player1->weaponsel;
     sr->setscope(enable);
 }