From 1e0534c92208a8922a066878603b30cd8dcfb842 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Fri, 13 May 2022 11:41:33 -0700 Subject: [PATCH] NSSpraylogo: Handle vid_reload's gracefully --- src/gs-entbase/shared/spraylogo.qc | 17 +++++++++-------- src/shared/defs.h | 7 ++++--- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/gs-entbase/shared/spraylogo.qc b/src/gs-entbase/shared/spraylogo.qc index 6423ed03..9ceee1b9 100644 --- a/src/gs-entbase/shared/spraylogo.qc +++ b/src/gs-entbase/shared/spraylogo.qc @@ -88,7 +88,7 @@ CSEv_Spraylogo(void) #endif #ifdef CLIENT -class CSpraylogo +class NSSpraylogo:NSEntity { vector m_vecColor; vector m_vecPosition; @@ -99,7 +99,7 @@ class CSpraylogo int m_iInitialized; bool m_bMonochrome; - void(void) CSpraylogo; + void(void) NSSpraylogo; virtual float(void) predraw; virtual void(void) RendererRestarted; }; @@ -128,13 +128,13 @@ const string g_spray_mat_0 = \ "}"; void -CSpraylogo::RendererRestarted(void) +NSSpraylogo::RendererRestarted(void) { - m_iInitialized = false; + m_iInitialized = FALSE; } float -CSpraylogo::predraw(void) +NSSpraylogo::predraw(void) { int iSize; @@ -184,18 +184,19 @@ CSpraylogo::predraw(void) } void -CSpraylogo::CSpraylogo(void) +NSSpraylogo::NSSpraylogo(void) { // boo m_vecColor = [1,1,1]; m_bMonochrome = false; + isCSQC = true; } void Spray_Parse(void) { - spawnfunc_CSpraylogo(); - CSpraylogo spSelf =(CSpraylogo)self; + spawnfunc_NSSpraylogo(); + NSSpraylogo spSelf =(NSSpraylogo)self; spSelf.drawmask = MASK_ENGINE; spSelf.m_vecPosition[0] = readcoord(); spSelf.m_vecPosition[1] = readcoord(); diff --git a/src/shared/defs.h b/src/shared/defs.h index b10b0bc2..b86d65e4 100644 --- a/src/shared/defs.h +++ b/src/shared/defs.h @@ -35,7 +35,8 @@ void _NSLog(string msg) { - print(sprintf("%f %s\n", time, msg)); + if (cvar("g_developer") == 1) + print(sprintf("%f %s\n", time, msg)); } #define NSLog(x, ...) _NSLog(sprintf(x, __VA_ARGS__)) @@ -184,9 +185,9 @@ __wrap string precache_model(string m) { #ifdef CLIENT - NSLog("^3Client precaching model ^7%s\n", m); + NSLog("^3Client precaching model ^7%s", m); #else - NSLog("^3Server precaching model ^7%s\n", m); + NSLog("^3Server precaching model ^7%s", m); #endif return prior(m); }