Added support for assigning coop and deathmatch global float values to optional CSQC...

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

diff --git a/csprogs.c b/csprogs.c
index 06e1a33345f22d562dfeb84073765bc3cdae6dc7..bb51c500407901a6684019106685cb94aa4169de 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -409,6 +409,43 @@ void CL_VM_UpdateIntermissionState (int intermission)
                CSQC_END
        }
 }
                CSQC_END
        }
 }

+void CL_VM_UpdateCoopDeathmatchGlobals (int gametype)
+{
+       // Avoid global names for clean(er) coding
+       int localcoop;
+       int localdeathmatch;
+
+       prvm_eval_t *val;
+       if(cl.csqc_loaded)
+       {
+               if(gametype == GAME_COOP)
+               {
+                       localcoop = 1;
+                       localdeathmatch = 0;
+               }
+               else
+               if(gametype == GAME_DEATHMATCH)
+               {
+                       localcoop = 0;
+                       localdeathmatch = 1;
+               }
+               else
+               {
+                       // How did the ServerInfo send an unknown gametype?
+                       // Better just assign the globals as 0...
+                       localcoop = 0;
+                       localdeathmatch = 0;
+               }
+               CSQC_BEGIN
+               val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.coop);
+               if(val)
+                       val->_float = localcoop;
+               val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.deathmatch);
+               if(val)
+                       val->_float = localdeathmatch;
+               CSQC_END
+       }
+}

 
 float CL_VM_Event (float event)                //[515]: needed ? I'd say "YES", but don't know for what :D
 {
 
 float CL_VM_Event (float event)                //[515]: needed ? I'd say "YES", but don't know for what :D
 {


@@ -660,6 +697,9 @@ void CL_VM_Init (void)
 
        cl.csqc_vidvars.drawcrosshair = false;
        cl.csqc_vidvars.drawenginesbar = false;
 
        cl.csqc_vidvars.drawcrosshair = false;
        cl.csqc_vidvars.drawenginesbar = false;

+
+       // Update Coop and Deathmatch Globals (at this point the client knows them from ServerInfo)
+       CL_VM_UpdateCoopDeathmatchGlobals(cl.gametype);

 }
 
 void CL_VM_ShutDown (void)
 }
 
 void CL_VM_ShutDown (void)

diff --git a/progsvm.h b/progsvm.h
index c3346e3af7568ce39bcfa12eaf4dee2324bcfb1d..727fa402c6ab0abb48be9d29de6585506e13419c 100644 (file)
--- a/progsvm.h
+++ b/progsvm.h
@@ -237,6 +237,8 @@ typedef struct prvm_prog_globaloffsets_s
        int trace_dphittexturename; // ssqc / csqc
        int trace_dpstartcontents; // ssqc / csqc
        int intermission; // csqc
        int trace_dphittexturename; // ssqc / csqc
        int trace_dpstartcontents; // ssqc / csqc
        int intermission; // csqc

+       int coop; // csqc
+       int deathmatch; // csqc

 }
 prvm_prog_globaloffsets_t;
 
 }
 prvm_prog_globaloffsets_t;
 

diff --git a/prvm_edict.c b/prvm_edict.c
index 555eaa2918ec181d206dfb89628003db1c6e7dca..50bd175aa508bdbc411d59c804465c2f857bd901 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -1441,6 +1441,8 @@ void PRVM_FindOffsets(void)
        prog->globaloffsets.trace_dphittexturename        = PRVM_ED_FindGlobalOffset("trace_dphittexturename");
        prog->globaloffsets.trace_dpstartcontents         = PRVM_ED_FindGlobalOffset("trace_dpstartcontents");
        prog->globaloffsets.intermission                  = PRVM_ED_FindGlobalOffset("intermission");
        prog->globaloffsets.trace_dphittexturename        = PRVM_ED_FindGlobalOffset("trace_dphittexturename");
        prog->globaloffsets.trace_dpstartcontents         = PRVM_ED_FindGlobalOffset("trace_dpstartcontents");
        prog->globaloffsets.intermission                  = PRVM_ED_FindGlobalOffset("intermission");

+       prog->globaloffsets.coop                          = PRVM_ED_FindGlobalOffset("coop");
+       prog->globaloffsets.deathmatch                    = PRVM_ED_FindGlobalOffset("deathmatch");

 
        // menu qc only uses some functions, nothing else
        prog->funcoffsets.m_display                       = PRVM_ED_FindFunctionOffset("m_display");
 
        // menu qc only uses some functions, nothing else
        prog->funcoffsets.m_display                       = PRVM_ED_FindFunctionOffset("m_display");