diff --git a/src/client/chat.qc b/src/client/chat.qc index c7e1e789..3203e04f 100644 --- a/src/client/chat.qc +++ b/src/client/chat.qc @@ -14,6 +14,8 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +var bool autocvar_cl_chat_enabled = true; + #define CHAT_LINES 5 #define CHAT_TIME 5 @@ -56,6 +58,9 @@ Chat_Draw(void) Font_DrawText(temppos + [0,16], tempstr, g_fntChat); } + if (autocvar_cl_chat_enabled == false) + return; + g_chatpos[0] = g_hudmins[0] + 16; g_chatpos[1] = g_hudmins[1] + g_hudres[1] - 128; @@ -100,6 +105,11 @@ Chat_Parse(string msg) } g_chattime = time + CHAT_TIME; + + /* we need to be silent */ + if (autocvar_cl_chat_enabled == false) + return; + localsound("misc/talk.wav"); /* log to client console */ diff --git a/src/gs-entbase/shared/spraylogo.qc b/src/gs-entbase/shared/spraylogo.qc index f465cc2e..23915dc3 100644 --- a/src/gs-entbase/shared/spraylogo.qc +++ b/src/gs-entbase/shared/spraylogo.qc @@ -105,7 +105,7 @@ const string g_spray_mat = \ "polygonOffset\n" \ "{\n" \ "map $rt:%s\n" \ - "blendfunc GL_DST_COLOR GL_ZERO\n" \ + "blendfunc GL_DST_COLOR GL_ONE\n" \ "rgbGen vertex\n" \ "}\n" \ "}"; diff --git a/src/vgui/ui_window.qc b/src/vgui/ui_window.qc index 0220a9c8..55574a83 100644 --- a/src/vgui/ui_window.qc +++ b/src/vgui/ui_window.qc @@ -59,7 +59,8 @@ class CUIWindow:CUIWidget virtual void(void(void) vFunc) CallOnResize; virtual void(void(void) vFunc) CallOnMove; - + + virtual bool(void) Visible; virtual void(void) Draw; virtual void(void) Hide; virtual void(float, float, float, float) Input; @@ -87,6 +88,12 @@ void CUIWindow::CUIWindow(void) SetSize([320,240]); } +bool +CUIWindow::Visible(void) +{ + return (m_iFlags & WINDOW_VISIBLE) ? true : false; +} + void CUIWindow::SetTitle (string strName) { m_strTitle = strName;