(Round 1) Break up host_cmd.c

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index ace22bfa74c2ac5009dcde180ea00b2adb0e7dea..df6497fa2437ea5c85a5da14632db698d0f23d5f 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -171,7 +171,7 @@ vector      getresolution(float number)
 static void VM_M_getresolution(prvm_prog_t *prog)
 {
        int nr, fs;
-       VM_SAFEPARMCOUNTRANGE(1, 2, VM_getresolution);
+       VM_SAFEPARMCOUNTRANGE(1, 2, VM_M_getresolution);
 
        nr = (int)PRVM_G_FLOAT(OFS_PARM0);
 
@@ -521,7 +521,7 @@ static void VM_M_getserverlistnumber(prvm_prog_t *prog)
        const serverlist_entry_t *cache;
        int hostnr;
 
-       VM_SAFEPARMCOUNT(2, VM_M_getserverliststring);
+       VM_SAFEPARMCOUNT(2, VM_M_getserverlistnumber);
 
        PRVM_G_INT(OFS_RETURN) = OFS_NULL;
 
@@ -868,7 +868,7 @@ static void VM_M_crypto_getmykeyfp(prvm_prog_t *prog)
        int i;
        char keyfp[FP64_SIZE + 1];
 
-       VM_SAFEPARMCOUNT(1,VM_M_crypto_getmykey);
+       VM_SAFEPARMCOUNT(1, VM_M_crypto_getmykeyfp);
 
        i = PRVM_G_FLOAT( OFS_PARM0 );
        switch(Crypto_RetrieveLocalKey(i, keyfp, sizeof(keyfp), NULL, 0, NULL))
@@ -890,7 +890,7 @@ static void VM_M_crypto_getmyidfp(prvm_prog_t *prog)
        int i;
        char idfp[FP64_SIZE + 1];
 
-       VM_SAFEPARMCOUNT(1,VM_M_crypto_getmykey);
+       VM_SAFEPARMCOUNT(1, VM_M_crypto_getmyidfp);
 
        i = PRVM_G_FLOAT( OFS_PARM0 );
        switch(Crypto_RetrieveLocalKey(i, NULL, 0, idfp, sizeof(idfp), NULL))
@@ -912,7 +912,7 @@ static void VM_M_crypto_getmyidstatus(prvm_prog_t *prog)
        int i;
        qboolean issigned;
 
-       VM_SAFEPARMCOUNT(1,VM_M_crypto_getmykey);
+       VM_SAFEPARMCOUNT(1, VM_M_crypto_getmyidstatus);
 
        i = PRVM_G_FLOAT( OFS_PARM0 );
        switch(Crypto_RetrieveLocalKey(i, NULL, 0, NULL, 0, &issigned))
@@ -944,7 +944,7 @@ VM_vlen,                                                            //   #9
 VM_vectoyaw,                                           //  #10
 VM_vectoangles,                                        //  #11
 VM_random,                                                     //  #12
-VM_localcmd,                                           //  #13
+VM_localcmd_client,                                            //  #13
 VM_cvar,                                                               //  #14
 VM_cvar_set,                                           //  #15
 VM_dprint,                                                     //  #16
@@ -1612,7 +1612,8 @@ void MVM_init_cmd(prvm_prog_t *prog)
        r_refdef_scene_t *scene;
 
        VM_Cmd_Init(prog);
-       VM_Polygons_Reset(prog);
+       prog->polygonbegin_model = NULL;
+       prog->polygonbegin_guess2d = 0;
 
        scene = R_GetScenePointer( RST_MENU );
 
@@ -1624,7 +1625,8 @@ void MVM_init_cmd(prvm_prog_t *prog)
        scene->maxentities = MAX_EDICTS + 256 + 512;
        scene->entities = (entity_render_t **)Mem_Alloc(prog->progs_mempool, sizeof(entity_render_t *) * scene->maxentities);
 
-       scene->ambient = 32.0f;
+       // LadyHavoc: what is this for?
+       scene->ambientintensity = 32.0f;
 }
 
 void MVM_reset_cmd(prvm_prog_t *prog)
@@ -1633,5 +1635,6 @@ void MVM_reset_cmd(prvm_prog_t *prog)
 
        //VM_Cmd_Init();
        VM_Cmd_Reset(prog);
-       VM_Polygons_Reset(prog);
+       prog->polygonbegin_model = NULL;
+       prog->polygonbegin_guess2d = 0;
 }