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).
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user