Added optional float global sb_showscores to CSQC that represents the engine's +shows...

float sb_showscores;

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7562 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/csprogs.c b/csprogs.c
index 116381fc8154eb22b3ef17f9f8037f23ce380134..518f28e7ca893fdd0ff956435e2813830fa44ad5 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -436,6 +436,18 @@ void CL_VM_UpdateIntermissionState (int intermission)
                CSQC_END
        }
 }
+void CL_VM_UpdateShowingScoresState (int showingscores)
+{
+       prvm_eval_t *val;
+       if(cl.csqc_loaded)
+       {
+               CSQC_BEGIN
+               val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.sb_showscores);
+               if(val)
+                       val->_float = showingscores;
+               CSQC_END
+       }
+}
 void CL_VM_UpdateCoopDeathmatchGlobals (int gametype)
 {
        // Avoid global names for clean(er) coding

diff --git a/progsvm.h b/progsvm.h
index 52dfd03b216b9288ce077f1a09cc59f7cbfbc1ba..43b34bee8540f8408c0a595d2272e1bc2a2ad942 100644 (file)
--- a/progsvm.h
+++ b/progsvm.h
@@ -242,6 +242,7 @@ typedef struct prvm_prog_globaloffsets_s
        int dmg_take; // csqc
        int dmg_save; // csqc
        int dmg_origin; // csqc
+       int sb_showscores; // csqc
        
 }
 prvm_prog_globaloffsets_t;

diff --git a/prvm_edict.c b/prvm_edict.c
index 947d8972433e6083e7267a86ff9b80750c366f75..02d15dbadd7ff413bc6c88aa2615128479c7b5d4 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -1459,6 +1459,7 @@ void PRVM_FindOffsets(void)
        prog->globaloffsets.dmg_take                      = PRVM_ED_FindGlobalOffset("dmg_take");
        prog->globaloffsets.dmg_save                      = PRVM_ED_FindGlobalOffset("dmg_save");
        prog->globaloffsets.dmg_origin                    = PRVM_ED_FindGlobalOffset("dmg_origin");
+       prog->globaloffsets.sb_showscores                 = PRVM_ED_FindGlobalOffset("sb_showscores");
 
        // menu qc only uses some functions, nothing else
        prog->funcoffsets.m_display                       = PRVM_ED_FindFunctionOffset("m_display");

diff --git a/sbar.c b/sbar.c
index 0e673576f069a6e7772cfe1d70c2c5a514e31583..e0c7ec870faa04e36ab2df6b0f612788c7f6c4c7 100644 (file)
--- a/sbar.c
+++ b/sbar.c
@@ -110,6 +110,8 @@ void Sbar_DeathmatchOverlay (void);
 void Sbar_IntermissionOverlay (void);
 void Sbar_FinaleOverlay (void);
 
+void CL_VM_UpdateShowingScoresState (int showingscores);
+
 
 /*
 ===============
@@ -123,6 +125,7 @@ void Sbar_ShowScores (void)
        if (sb_showscores)
                return;
        sb_showscores = true;
+       CL_VM_UpdateShowingScoresState(sb_showscores);
 }
 
 /*
@@ -135,6 +138,7 @@ Tab key up
 void Sbar_DontShowScores (void)
 {
        sb_showscores = false;
+       CL_VM_UpdateShowingScoresState(sb_showscores);
 }
 
 void sbar_start(void)