Don't lerp nailgun and super nailgun. Trades smoothness for better muzzle flash

[xonotic/darkplaces.git] / csprogs.c

diff --git a/csprogs.c b/csprogs.c
index 4f47741b586ecc27cd2efac6ab5916893067718b..23135e0bf983c4d119c29cc066deec23d2f18332 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -20,10 +20,10 @@ void CL_VM_PreventInformationLeaks(void)
        prvm_prog_t *prog = CLVM_prog;
        if(!cl.csqc_loaded)
                return;
-       CSQC_BEGIN
-               VM_ClearTraceGlobals(prog);
-               PRVM_clientglobalfloat(trace_networkentity) = 0;
-       CSQC_END
+CSQC_BEGIN
+       VM_ClearTraceGlobals(prog);
+       PRVM_clientglobalfloat(trace_networkentity) = 0;
+CSQC_END
 }
 
 //[515]: these are required funcs
@@ -227,7 +227,7 @@ static void CSQC_SetGlobals (double frametime)
        prvm_prog_t *prog = CLVM_prog;
        CSQC_BEGIN
                PRVM_clientglobalfloat(time) = cl.time;
-               PRVM_clientglobalfloat(cltime) = realtime; // Spike named it that way.
+               PRVM_clientglobalfloat(cltime) = host.realtime; // Spike named it that way.
                PRVM_clientglobalfloat(frametime) = frametime;
                PRVM_clientglobalfloat(servercommandframe) = cls.servermovesequence;
                PRVM_clientglobalfloat(clientcommandframe) = cl.movecmd[0].sequence;
@@ -442,20 +442,20 @@ qboolean CL_VM_InputEvent (int eventtype, float x, float y)
        if(!cl.csqc_loaded)
                return false;
 
-       CSQC_BEGIN
-               if (!PRVM_clientfunction(CSQC_InputEvent))
-                       r = false;
-               else
-               {
-                       PRVM_clientglobalfloat(time) = cl.time;
-                       PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
-                       PRVM_G_FLOAT(OFS_PARM0) = eventtype;
-                       PRVM_G_FLOAT(OFS_PARM1) = x; // key or x
-                       PRVM_G_FLOAT(OFS_PARM2) = y; // ascii or y
-                       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_InputEvent), "QC function CSQC_InputEvent is missing");
-                       r = CSQC_RETURNVAL != 0;
-               }
-       CSQC_END
+CSQC_BEGIN
+       if (!PRVM_clientfunction(CSQC_InputEvent))
+               r = false;
+       else
+       {
+               PRVM_clientglobalfloat(time) = cl.time;
+               PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
+               PRVM_G_FLOAT(OFS_PARM0) = eventtype;
+               PRVM_G_FLOAT(OFS_PARM1) = x; // key or x
+               PRVM_G_FLOAT(OFS_PARM2) = y; // ascii or y
+               prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_InputEvent), "QC function CSQC_InputEvent is missing");
+               r = CSQC_RETURNVAL != 0;
+       }
+CSQC_END
        return r;
 }
 
@@ -502,7 +502,7 @@ qboolean CL_VM_UpdateView (double frametime)
        return true;
 }
 
-qboolean CL_VM_ConsoleCommand (const char *cmd)
+qboolean CL_VM_ConsoleCommand (const char *text)
 {
        prvm_prog_t *prog = CLVM_prog;
        int restorevm_tempstringsbuf_cursize;
@@ -515,7 +515,7 @@ qboolean CL_VM_ConsoleCommand (const char *cmd)
                PRVM_clientglobalfloat(time) = cl.time;
                PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
                restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
-               PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, cmd);
+               PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, text);
                prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_ConsoleCommand), "QC function CSQC_ConsoleCommand is missing");
                prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
                r = CSQC_RETURNVAL != 0;
@@ -565,7 +565,7 @@ void CL_VM_Parse_StuffCmd (const char *msg)
                int sizeflags = csqc_progcrc.flags;
                csqc_progcrc.flags &= ~CVAR_READONLY;
                csqc_progsize.flags &= ~CVAR_READONLY;
-               Cmd_ExecuteString(&cmd_clientfromserver, msg, src_command, true);
+               Cmd_ExecuteString(&cmd_client, msg, src_command, true);
                csqc_progcrc.flags = crcflags;
                csqc_progsize.flags = sizeflags;
                return;
@@ -598,7 +598,7 @@ void CL_VM_Parse_StuffCmd (const char *msg)
                                l = sizeof(buf) - 1;
                        strlcpy(buf, p, l + 1); // strlcpy needs a + 1 as it includes the newline!
 
-                       Cmd_ExecuteString(&cmd_clientfromserver, buf, src_command, true);
+                       Cmd_ExecuteString(&cmd_client, buf, src_command, true);
 
                        p += l;
                        if(*p == '\n')
@@ -606,13 +606,13 @@ void CL_VM_Parse_StuffCmd (const char *msg)
                        else
                                break; // end of string or overflow
                }
-               Cmd_ExecuteString(&cmd_clientfromserver, "curl --clear_autodownload", src_command, true); // don't inhibit CSQC loading
+               Cmd_ExecuteString(&cmd_client, "curl --clear_autodownload", src_command, true); // don't inhibit CSQC loading
                return;
        }
 
        if(!cl.csqc_loaded)
        {
-               Cbuf_AddText(&cmd_clientfromserver, msg);
+               Cbuf_AddText(&cmd_client, msg);
                return;
        }
        CSQC_BEGIN
@@ -626,7 +626,7 @@ void CL_VM_Parse_StuffCmd (const char *msg)
                prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
        }
        else
-               Cbuf_AddText(&cmd_clientfromserver, msg);
+               Cbuf_AddText(&cmd_client, msg);
        CSQC_END
 }
 
@@ -1149,7 +1149,7 @@ void CL_VM_Init (void)
        prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Init), "QC function CSQC_Init is missing");
 
        // Once CSQC_Init was called, we consider csqc code fully initialized.
-       prog->inittime = realtime;
+       prog->inittime = host.realtime;
 
        cl.csqc_loaded = true;
 
@@ -1168,16 +1168,16 @@ void CL_VM_ShutDown (void)
        //Cvar_SetValueQuick(&csqc_progsize, -1);
        if(!cl.csqc_loaded)
                return;
-       CSQC_BEGIN
-               if (prog->loaded)
-               {
-                       PRVM_clientglobalfloat(time) = cl.time;
-                       PRVM_clientglobaledict(self) = 0;
-                       if (PRVM_clientfunction(CSQC_Shutdown))
-                               prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Shutdown), "QC function CSQC_Shutdown is missing");
-               }
-               PRVM_Prog_Reset(prog);
-       CSQC_END
+CSQC_BEGIN
+       if (prog->loaded)
+       {
+               PRVM_clientglobalfloat(time) = cl.time;
+               PRVM_clientglobaledict(self) = 0;
+               if (PRVM_clientfunction(CSQC_Shutdown))
+                       prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Shutdown), "QC function CSQC_Shutdown is missing");
+       }
+       PRVM_Prog_Reset(prog);
+CSQC_END
        Con_DPrint("CSQC ^1unloaded\n");
        cl.csqc_loaded = false;
 }