Change directory text colour in console from blue to light cyan (#197)

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index ba785d59c239c824b953932f3f0d58d8b988959a..4dc597d7270a9262e4fb376d0e16aadd63c0e57b 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -56,7 +56,9 @@ NULL
 qbool MP_ConsoleCommand(const char *text, size_t textlen)
 {
        prvm_prog_t *prog = MVM_prog;
 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");
+       if (setjmp(mp_abort))
+               return false;
+       return PRVM_ConsoleCommand(prog, text, textlen, &prog->funcoffsets.GameCommand, false, -1, 0, "QC function GameCommand is missing");

 }
 
 /*
 }
 
 /*


@@ -279,7 +281,7 @@ static void VM_M_getserverliststat(prvm_prog_t *prog)
                PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_sortflags;
                return;
        default:
                PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_sortflags;
                return;
        default:

-               VM_Warning(prog, "VM_M_getserverliststat: bad type %i!\n", type );
+               VM_Warning(prog, "VM_M_getserverliststat: bad type (%i) passed!\n", type);

        }
 }
 
        }
 }
 


@@ -323,13 +325,14 @@ static void VM_M_setserverlistmaskstring(prvm_prog_t *prog)
                mask = &serverlist_ormasks[masknr - 512 ];
        else
        {
                mask = &serverlist_ormasks[masknr - 512 ];
        else
        {

-               VM_Warning(prog, "VM_M_setserverlistmaskstring: invalid mask number %i\n", masknr );
+               VM_Warning(prog, "VM_M_setserverlistmaskstring: invalid mask number (%i) passed!\n", masknr);

                return;
        }
 
        field = (int) PRVM_G_FLOAT( OFS_PARM1 );
 
                return;
        }
 
        field = (int) PRVM_G_FLOAT( OFS_PARM1 );
 

-       switch( field ) {
+       switch( field )
+       {

                case SLIF_CNAME:
                        mask->info.cname_len = dp_strlcpy(mask->info.cname, str, sizeof(mask->info.cname));
                        break;
                case SLIF_CNAME:
                        mask->info.cname_len = dp_strlcpy(mask->info.cname, str, sizeof(mask->info.cname));
                        break;


@@ -352,7 +355,7 @@ static void VM_M_setserverlistmaskstring(prvm_prog_t *prog)
                        mask->info.game_len = dp_strlcpy(mask->info.game, str, sizeof(mask->info.game));
                        break;
                default:
                        mask->info.game_len = dp_strlcpy(mask->info.game, str, sizeof(mask->info.game));
                        break;
                default:

-                       VM_Warning(prog, "VM_M_setserverlistmaskstring: Bad field number %i passed!\n", field );
+                       VM_Warning(prog, "VM_M_setserverlistmaskstring: Bad field number (%i) passed!\n", field);

                        return;
        }
 
                        return;
        }
 


@@ -385,14 +388,15 @@ static void VM_M_setserverlistmasknumber(prvm_prog_t *prog)
                mask = &serverlist_ormasks[masknr - 512 ];
        else
        {
                mask = &serverlist_ormasks[masknr - 512 ];
        else
        {

-               VM_Warning(prog, "VM_M_setserverlistmasknumber: invalid mask number %i\n", masknr );
+               VM_Warning(prog, "VM_M_setserverlistmasknumber: invalid mask number (%i) passed!\n", masknr);

                return;
        }
 
        number = (int)PRVM_G_FLOAT( OFS_PARM2 );
        field = (int) PRVM_G_FLOAT( OFS_PARM1 );
 
                return;
        }
 
        number = (int)PRVM_G_FLOAT( OFS_PARM2 );
        field = (int) PRVM_G_FLOAT( OFS_PARM1 );
 

-       switch( field ) {
+       switch( field )
+       {

                case SLIF_MAXPLAYERS:
                        mask->info.maxplayers = number;
                        break;
                case SLIF_MAXPLAYERS:
                        mask->info.maxplayers = number;
                        break;


@@ -421,7 +425,7 @@ static void VM_M_setserverlistmasknumber(prvm_prog_t *prog)
                        mask->info.isfavorite = number != 0;
                        break;
                default:
                        mask->info.isfavorite = number != 0;
                        break;
                default:

-                       VM_Warning(prog, "VM_M_setserverlistmasknumber: Bad field number %i passed!\n", field );
+                       VM_Warning(prog, "VM_M_setserverlistmasknumber: Bad field number (%i) passed!\n", field);

                        return;
        }
 
                        return;
        }
 


@@ -469,12 +473,13 @@ static void VM_M_getserverliststring(prvm_prog_t *prog)
        {
                if(hostnr < 0 || (unsigned)hostnr >= serverlist_viewcount)
                {
        {
                if(hostnr < 0 || (unsigned)hostnr >= serverlist_viewcount)
                {

-                       Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
+                       VM_Warning(prog, "VM_M_getserverliststring: bad hostnr (%i) passed!\n", hostnr);

                        return;
                }
                cache = ServerList_GetViewEntry(hostnr);
        }
                        return;
                }
                cache = ServerList_GetViewEntry(hostnr);
        }

-       switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
+       switch( (int) PRVM_G_FLOAT(OFS_PARM0) )
+       {

                case SLIF_CNAME:
                        PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cache->info.cname, cache->info.cname_len);
                        break;
                case SLIF_CNAME:
                        PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cache->info.cname, cache->info.cname_len);
                        break;


@@ -504,7 +509,7 @@ static void VM_M_getserverliststring(prvm_prog_t *prog)
                        PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cache->line2, cache->line2_len);
                        break;
                default:
                        PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cache->line2, cache->line2_len);
                        break;
                default:

-                       Con_Print("VM_M_getserverliststring: bad field number passed!\n");
+                       VM_Warning(prog, "VM_M_getserverliststring: bad field number (%i) passed!\n", (int)PRVM_G_FLOAT(OFS_PARM0));

        }
 }
 
        }
 }
 


@@ -534,12 +539,13 @@ static void VM_M_getserverlistnumber(prvm_prog_t *prog)
        {
                if(hostnr < 0 || (unsigned)hostnr >= serverlist_viewcount)
                {
        {
                if(hostnr < 0 || (unsigned)hostnr >= serverlist_viewcount)
                {

-                       Con_Print("VM_M_getserverliststring: bad hostnr passed!\n");
+                       VM_Warning(prog, "VM_M_getserverliststring: bad hostnr (%i) passed!\n", hostnr);

                        return;
                }
                cache = ServerList_GetViewEntry(hostnr);
        }
                        return;
                }
                cache = ServerList_GetViewEntry(hostnr);
        }

-       switch( (int) PRVM_G_FLOAT(OFS_PARM0) ) {
+       switch( (int) PRVM_G_FLOAT(OFS_PARM0) )
+       {

                case SLIF_MAXPLAYERS:
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.maxplayers;
                        break;
                case SLIF_MAXPLAYERS:
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.maxplayers;
                        break;


@@ -557,7 +563,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
                        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;
                        break;
                case SLIF_PROTOCOL:
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.protocol;


@@ -569,7 +575,7 @@ static void VM_M_getserverlistnumber(prvm_prog_t *prog)
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.isfavorite;
                        break;
                default:
                        PRVM_G_FLOAT( OFS_RETURN ) = cache->info.isfavorite;
                        break;
                default:

-                       Con_Print("VM_M_getserverlistnumber: bad field number passed!\n");
+                       VM_Warning(prog, "VM_M_getserverlistnumber: bad field number (%i) passed!\n", (int)PRVM_G_FLOAT(OFS_PARM0));

        }
 }
 
        }
 }
 


@@ -793,9 +799,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)
        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
        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)
 }
 
 static void VM_M_crypto_getkeyfp(prvm_prog_t *prog)


@@ -1075,7 +1081,7 @@ VM_vlen,                                                          //   #9
 VM_vectoyaw,                                           //  #10
 VM_vectoangles,                                        //  #11
 VM_random,                                                     //  #12
 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
 VM_cvar,                                                               //  #14
 VM_cvar_set,                                           //  #15
 VM_dprint,                                                     //  #16