sys: work around incomplete POSIX support in MacOS

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index ba785d59c239c824b953932f3f0d58d8b988959a..812930fd106191afaac45b1fba063ae1a86b7663 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -56,7 +56,7 @@ NULL
 qbool MP_ConsoleCommand(const char *text, size_t textlen)
 {
        prvm_prog_t *prog = MVM_prog;
-       return PRVM_ConsoleCommand(prog, text, textlen, &prog->funcoffsets.GameCommand, false, -1, 0, prog->loaded, "QC function GameCommand is missing");
+       return PRVM_ConsoleCommand(prog, text, textlen, &prog->funcoffsets.GameCommand, false, -1, 0, "QC function GameCommand is missing");
 }
 
 /*
@@ -557,7 +557,7 @@ static void VM_M_getserverlistnumber(prvm_prog_t *prog)
                        break;
                case SLIF_PING:
                        // display inf when a listed server times out and net_slist_pause blocks its removal
-                       PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping ?: INFINITY;
+                       PRVM_G_FLOAT( OFS_RETURN ) = cache->info.ping ? cache->info.ping : INFINITY;
                        break;
                case SLIF_PROTOCOL:
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.protocol;
@@ -793,9 +793,9 @@ static void VM_M_getmousepos(prvm_prog_t *prog)
        if (key_consoleactive || (key_dest != key_menu && key_dest != key_menu_grabbed))
                VectorSet(PRVM_G_VECTOR(OFS_RETURN), 0, 0, 0);
        else if (in_client_mouse)
-               VectorSet(PRVM_G_VECTOR(OFS_RETURN), in_windowmouse_x * vid_conwidth.integer / vid.width, in_windowmouse_y * vid_conheight.integer / vid.height, 0);
+               VectorSet(PRVM_G_VECTOR(OFS_RETURN), in_windowmouse_x * vid_conwidth.integer / vid.mode.width, in_windowmouse_y * vid_conheight.integer / vid.mode.height, 0);
        else
-               VectorSet(PRVM_G_VECTOR(OFS_RETURN), in_mouse_x * vid_conwidth.integer / vid.width, in_mouse_y * vid_conheight.integer / vid.height, 0);
+               VectorSet(PRVM_G_VECTOR(OFS_RETURN), in_mouse_x * vid_conwidth.integer / vid.mode.width, in_mouse_y * vid_conheight.integer / vid.mode.height, 0);
 }
 
 static void VM_M_crypto_getkeyfp(prvm_prog_t *prog)
@@ -1075,7 +1075,7 @@ VM_vlen,                                                          //   #9
 VM_vectoyaw,                                           //  #10
 VM_vectoangles,                                        //  #11
 VM_random,                                                     //  #12
-VM_localcmd_local,                                             //  #13
+VM_localcmd,                                           //  #13
 VM_cvar,                                                               //  #14
 VM_cvar_set,                                           //  #15
 VM_dprint,                                                     //  #16