added GAME_NEOTERIC

[xonotic/darkplaces.git] / common.c

diff --git a/common.c b/common.c
index 43db21a3237c60848320995ff79055067a6d4496..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] = "";
 
 
 /*
@@ -54,15 +55,6 @@ char com_modname[MAX_OSPATH];
 ============================================================================
 */
 
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
-short   (*BigShort) (short l);
-short   (*LittleShort) (short l);
-int     (*BigLong) (int l);
-int     (*LittleLong) (int l);
-float   (*BigFloat) (float l);
-float   (*LittleFloat) (float l);
-#endif
-
 short   ShortSwap (short l)
 {
        qbyte    b1,b2;
@@ -73,13 +65,6 @@ short   ShortSwap (short l)
        return (b1<<8) + b2;
 }
 
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
-short   ShortNoSwap (short l)
-{
-       return l;
-}
-#endif
-
 int    LongSwap (int l)
 {
        qbyte    b1,b2,b3,b4;
@@ -92,13 +77,6 @@ int    LongSwap (int l)
        return ((int)b1<<24) + ((int)b2<<16) + ((int)b3<<8) + b4;
 }
 
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
-int     LongNoSwap (int l)
-{
-       return l;
-}
-#endif
-
 float FloatSwap (float f)
 {
        union
@@ -116,13 +94,6 @@ float FloatSwap (float f)
        return dat2.f;
 }
 
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
-float FloatNoSwap (float f)
-{
-       return f;
-}
-#endif
-
 
 // Extract integers from buffers
 
@@ -353,16 +324,10 @@ int MSG_ReadBytes (int numbytes, unsigned char *out)
        return l;
 }
 
-// used by server (always latest PROTOCOL_DARKPLACES)
-float MSG_ReadDPCoord (void)
-{
-       return (signed short) MSG_ReadLittleShort();
-}
-
 // used by client
 float MSG_ReadCoord (void)
 {
-       if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4)
+       if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
                return (signed short) MSG_ReadLittleShort();
        else if (cl.protocol == PROTOCOL_DARKPLACES1)
                return MSG_ReadLittleFloat();
@@ -410,7 +375,7 @@ void *SZ_GetSpace (sizebuf_t *buf, int length)
                        Host_Error ("SZ_GetSpace: %i is > full buffer size\n", length);
 
                buf->overflowed = true;
-               Con_Printf ("SZ_GetSpace: overflow\n");
+               Con_Print("SZ_GetSpace: overflow\n");
                SZ_Clear (buf);
        }
 
@@ -444,39 +409,47 @@ 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)
                {
                        *cur++ = 0;
-                       Con_Printf("%s", text);
+                       Con_Print(text);
                        cur = text;
                }
        }
@@ -701,14 +674,14 @@ void COM_CheckRegistered (void)
        if (!FS_FileExists("gfx/pop.lmp"))
        {
                if (fs_modified)
-                       Con_Printf ("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n");
+                       Con_Print("Playing shareware version, with modification.\nwarning: most mods require full quake data.\n");
                else
-                       Con_Printf ("Playing shareware version.\n");
+                       Con_Print("Playing shareware version.\n");
                return;
        }
 
        Cvar_Set ("registered", "1");
-       Con_Printf ("Playing registered version.\n");
+       Con_Print("Playing registered version.\n");
 }
 
 
@@ -767,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;
 
@@ -798,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);
@@ -874,40 +870,14 @@ COM_Init
 */
 void COM_Init (void)
 {
-#if !defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)
-       qbyte swaptest[2] = {1,0};
-
-// set the byte swapping variables in a portable manner
-       if ( *(short *)swaptest == 1)
-       {
-               BigShort = ShortSwap;
-               LittleShort = ShortNoSwap;
-               BigLong = LongSwap;
-               LittleLong = LongNoSwap;
-               BigFloat = FloatSwap;
-               LittleFloat = FloatNoSwap;
-       }
-       else
-       {
-               BigShort = ShortNoSwap;
-               LittleShort = ShortSwap;
-               BigLong = LongNoSwap;
-               LittleLong = LongSwap;
-               BigFloat = FloatNoSwap;
-               LittleFloat = FloatSwap;
-       }
-#endif
-
        Cvar_RegisterVariable (&registered);
        Cvar_RegisterVariable (&cmdline);
 
        Mathlib_Init();
 
        FS_Init ();
-       Con_InitLogging();
+       Log_Init ();
        COM_CheckRegistered ();
-
-       COM_InitGameType();
 }