Removed unused functions S_AmbientOff and S_AmbientOn. Moved S_ClearBuffer declaratio...

[xonotic/darkplaces.git] / common.c

diff --git a/common.c b/common.c
index 4ba50c902a2a91576c2108c4ebfb8862e3c5dc47..f91b2d98ba78d1a2eabfe36bc52fbabaf30b1406 100644 (file)
--- a/common.c
+++ b/common.c
@@ -43,7 +43,8 @@ char com_cmdline[CMDLINE_LENGTH];
 int gamemode;
 char *gamename;
 char *gamedirname;
-char com_modname[MAX_OSPATH];
+char *gamescreenshotname;
+char com_modname[MAX_OSPATH] = "";
 
 
 /*
@@ -408,33 +409,41 @@ void Com_HexDumpToConsole(const qbyte *data, int size)
                if (n > size - i)
                        n = size - i;
                d = data + i;
+               // print offset
                *cur++ = hexchar[(i >> 12) & 15];
                *cur++ = hexchar[(i >>  8) & 15];
                *cur++ = hexchar[(i >>  4) & 15];
                *cur++ = hexchar[(i >>  0) & 15];
                *cur++ = ':';
-               for (j = 0;j < n;j++)
+               // print hex
+               for (j = 0;j < 16;j++)
                {
-                       if (j & 1)
+                       if (j < n)
                        {
-                               *cur++ = hexchar[(d[j] >> 4) & 15] | 0x80;
-                               *cur++ = hexchar[(d[j] >> 0) & 15] | 0x80;
+                               *cur++ = hexchar[(d[j] >> 4) & 15];
+                               *cur++ = hexchar[(d[j] >> 0) & 15];
                        }
                        else
                        {
-                               *cur++ = hexchar[(d[j] >> 4) & 15];
-                               *cur++ = hexchar[(d[j] >> 0) & 15];
+                               *cur++ = ' ';
+                               *cur++ = ' ';
                        }
+                       if ((j & 3) == 0)
+                               *cur++ = ' ';
                }
-               for (;j < 16;j++)
+               // print text
+               for (j = 0;j < 16;j++)
                {
-                       *cur++ = ' ';
-                       *cur++ = ' ';
+                       if (j < n)
+                       {
+                               if (d[j] >= ' ' && d[j] <= 127)
+                                       *cur++ = d[j];
+                               else
+                                       *cur++ = '.';
+                       }
+                       else
+                               *cur++ = ' ';
                }
-               for (j = 0;j < n;j++)
-                       *cur++ = (d[j] >= ' ' && d[j] <= 0x7E) ? d[j] : '.';
-               for (;j < 16;j++)
-                       *cur++ = ' ';
                *cur++ = '\n';
                i += n;
                if (cur >= flushpointer || i >= size)
@@ -731,6 +740,8 @@ void COM_InitGameType (void)
                gamemode = GAME_SOM;
        else if (strstr(name, "tenebrae"))
                gamemode = GAME_TENEBRAE;
+       else if (strstr(name, "neoteric"))
+               gamemode = GAME_NEOTERIC;
        else
                gamemode = GAME_NORMAL;
 
@@ -762,64 +773,85 @@ void COM_InitGameType (void)
                gamemode = GAME_SOM;
        else if (COM_CheckParm ("-tenebrae"))
                gamemode = GAME_TENEBRAE;
+       else if (COM_CheckParm ("-neoteric"))
+               gamemode = GAME_NEOTERIC;
 
        switch(gamemode)
        {
        case GAME_NORMAL:
                gamename = "DarkPlaces-Quake";
                gamedirname = "";
+               gamescreenshotname = "dp";
                break;
        case GAME_HIPNOTIC:
                gamename = "Darkplaces-Hipnotic";
                gamedirname = "hipnotic";
+               gamescreenshotname = "dp";
                break;
        case GAME_ROGUE:
                gamename = "Darkplaces-Rogue";
                gamedirname = "rogue";
+               gamescreenshotname = "dp";
                break;
        case GAME_NEHAHRA:
                gamename = "DarkPlaces-Nehahra";
                gamedirname = "nehahra";
+               gamescreenshotname = "dp";
                break;
        case GAME_NEXUIZ:
                gamename = "Nexuiz";
                gamedirname = "data";
+               gamescreenshotname = "nexuiz";
                break;
        case GAME_TRANSFUSION:
                gamename = "Transfusion";
                gamedirname = "basetf";
+               gamescreenshotname = "transfusion";
                break;
        case GAME_GOODVSBAD2:
                gamename = "GoodVs.Bad2";
                gamedirname = "rts";
+               gamescreenshotname = "gvb2";
                break;
        case GAME_TEU:
                gamename = "TheEvilUnleashed";
                gamedirname = "baseteu";
+               gamescreenshotname = "teu";
                break;
        case GAME_BATTLEMECH:
                gamename = "Battlemech";
                gamedirname = "base";
+               gamescreenshotname = "battlemech";
                break;
        case GAME_ZYMOTIC:
                gamename = "Zymotic";
                gamedirname = "data";
+               gamescreenshotname = "zymotic";
                break;
        case GAME_FNIGGIUM:
                gamename = "Fniggium";
                gamedirname = "data";
+               gamescreenshotname = "fniggium";
                break;
        case GAME_SETHERAL:
                gamename = "Setheral";
                gamedirname = "data";
+               gamescreenshotname = "setheral";
                break;
        case GAME_SOM:
                gamename = "Son of Man";
-               gamedirname = "data";
+               gamedirname = "sonofman";
+               gamescreenshotname = "som";
                break;
        case GAME_TENEBRAE:
                gamename = "DarkPlaces-Tenebrae";
                gamedirname = "tenebrae";
+               gamescreenshotname = "dp";
+               break;
+       case GAME_NEOTERIC:
+               gamename = "Neoteric";
+               gamedirname = "neobase";
+               gamescreenshotname = "neo";
                break;
        default:
                Sys_Error("COM_InitGameType: unknown gamemode %i\n", gamemode);
@@ -844,10 +876,8 @@ void COM_Init (void)
        Mathlib_Init();
 
        FS_Init ();
-       Con_InitLogging();
+       Log_Init ();
        COM_CheckRegistered ();
-
-       COM_InitGameType();
 }