From 5cb2d3b424f948597ad763b206af7ec7ad435fe8 Mon Sep 17 00:00:00 2001 From: Bukz Date: Fri, 10 Jun 2011 18:41:26 +0000 Subject: [PATCH] allow showscores during intermissions git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6530 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 2 ++ source/src/scoreboard.cpp | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 554f21a3..826e9e59 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -317,6 +317,8 @@ void playerinfo(const char *cn, const char *attr) { ATTR_INT(health, p->health); ATTR_INT(armour, p->armour); + ATTR_INT(attacking, p->attacking); + ATTR_INT(scoping, p->scoping); ATTR_FLOAT(x, p->o.x); ATTR_FLOAT(y, p->o.y); ATTR_FLOAT(z, p->o.z); diff --git a/source/src/scoreboard.cpp b/source/src/scoreboard.cpp index b47611ca..d44e74de 100644 --- a/source/src/scoreboard.cpp +++ b/source/src/scoreboard.cpp @@ -8,8 +8,7 @@ void *scoremenu = NULL, *teammenu = NULL, *ctfmenu = NULL; void showscores(int on) { if(on) showmenu(m_flags ? "ctf score" : (m_teammode ? "team score" : "score"), false); - else if (!intermission) - { + else { closemenu("score"); closemenu("team score"); closemenu("ctf score");