changed several DPrint's and developer cvar checks to higher developer cvar levels...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6177 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cd_shared.c b/cd_shared.c
index 8ffaa1185ed47639422467b29331f952774f4b4c..89dcbdbf633b8ce55d8cbb671d43613d916c83cd 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -60,6 +60,7 @@ qboolean cdPlaying = false;
 qboolean cdPlayLooping = false;
 unsigned char cdPlayTrack;
 
+cl_cdstate_t cd;
 
 static void CDAudio_Eject (void)
 {

diff --git a/cdaudio.h b/cdaudio.h
index 02e3fa1b123b74e535d7e092ab3aff3822ce21db..22318c8e0bc37c87fbe8227fbb0e90bb734cdcde 100644 (file)
--- a/cdaudio.h
+++ b/cdaudio.h
@@ -18,6 +18,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+typedef struct cl_cdstate_s
+{
+       qboolean Valid;
+       qboolean Playing;
+       qboolean PlayLooping;
+       unsigned char PlayTrack;
+}
+cl_cdstate_t;
+
+//extern cl_cdstate_t cd;
+
 extern qboolean cdValid;
 extern qboolean cdPlaying;
 extern qboolean cdPlayLooping;

diff --git a/console.c b/console.c
index d72e24bfec35d0279ba708333abc034f967bb715..a54d46df945f75335ea7242b82699bd56a90710b 100644 (file)
--- a/console.c
+++ b/console.c
@@ -981,7 +981,7 @@ qboolean GetMapList (const char *s, char *completedname, int completednamebuffer
                                        keyname[l] = 0;
                                        if (!COM_ParseToken(&data, false))
                                                break;
-                                       if (developer.integer >= 2)
+                                       if (developer.integer >= 100)
                                                Con_Printf("key: %s %s\n", keyname, com_token);
                                        if (!strcmp(keyname, "message"))
                                        {

diff --git a/cvar.c b/cvar.c
index 886ea96e8b2385b842e86d2d0491f4bb8cde476c..f836721f0641ce98383cfb8c482662de1abc9c1d 100644 (file)
--- a/cvar.c
+++ b/cvar.c
@@ -262,7 +262,7 @@ void Cvar_SetQuick (cvar_t *var, const char *value)
                return;
        }
 
-       if (developer.integer)
+       if (developer.integer >= 100)
                Con_Printf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value);
 
        Cvar_SetQuick_Internal(var, value);
@@ -320,7 +320,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
        cvar_t *current, *next, *cvar;
        char *oldstr;
 
-       if (developer.integer)
+       if (developer.integer >= 100)
                Con_Printf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags);
 
 // first check to see if it has already been defined
@@ -329,7 +329,7 @@ void Cvar_RegisterVariable (cvar_t *variable)
        {
                if (cvar->flags & CVAR_ALLOCATED)
                {
-                       if (developer.integer)
+                       if (developer.integer >= 100)
                                Con_Printf("...  replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags);
                        // fixed variables replace allocated ones
                        // (because the engine directly accesses fixed variables)
@@ -411,7 +411,7 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags)
        int hashindex;
        cvar_t *current, *next, *cvar;
 
-       if (developer.integer)
+       if (developer.integer >= 100)
                Con_Printf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags);
 
 // first check to see if it has already been defined

diff --git a/fs.c b/fs.c
index a0fdcde45b918da9c6e81c7b934d80ece2de1bca..58c5ed0a0ab763c3aca028185f94c3306c7b5e30 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -1331,8 +1331,8 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet)
                                // Found it
                                if (!diff)
                                {
-                                       if (!quiet)
-                                               Con_DPrintf("FS_FindFile: %s in %s\n",
+                                       if (!quiet && developer.integer >= 10)
+                                               Con_Printf("FS_FindFile: %s in %s\n",
                                                                        pak->files[middle].name, pak->filename);
 
                                        if (index != NULL)
@@ -1353,8 +1353,8 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet)
                        dpsnprintf(netpath, sizeof(netpath), "%s%s", search->filename, name);
                        if (FS_SysFileExists (netpath))
                        {
-                               if (!quiet)
-                                       Con_DPrintf("FS_FindFile: %s\n", netpath);
+                               if (!quiet && developer.integer >= 10)
+                                       Con_Printf("FS_FindFile: %s\n", netpath);
 
                                if (index != NULL)
                                        *index = -1;
@@ -1363,8 +1363,8 @@ static searchpath_t *FS_FindFile (const char *name, int* index, qboolean quiet)
                }
        }
 
-       if (!quiet)
-               Con_DPrintf("FS_FindFile: can't find %s\n", name);
+       if (!quiet && developer.integer >= 10)
+               Con_Printf("FS_FindFile: can't find %s\n", name);
 
        if (index != NULL)
                *index = -1;

diff --git a/image.c b/image.c
index 21e809ed8360ddd11a0c24f05261e578ef09c106..3fa3f3ba1ff07663d91ed12260e30bf847c2d1e9 100644 (file)
--- a/image.c
+++ b/image.c
@@ -754,7 +754,8 @@ unsigned char *loadimagepixels (const char *filename, qboolean complain, int mat
                        Mem_Free(f);
                        if (data)
                        {
-                               Con_DPrintf("loaded image %s (%dx%d)\n", name, image_width, image_height);
+                               if (developer.integer >= 10)
+                                       Con_Printf("loaded image %s (%dx%d)\n", name, image_width, image_height);
                                if (developer_memorydebug.integer)
                                        Mem_CheckSentinelsGlobal();
                                return data;

diff --git a/model_alias.c b/model_alias.c
index 6fd2a67d1e3213a7487dc9592d47a9a17cd7fc1f..faa82a9f7a6a3ce684cfc84a7e90ac4ead15cb4e 100644 (file)
--- a/model_alias.c
+++ b/model_alias.c
@@ -1796,7 +1796,7 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
                version = LittleLong(pchunk->version);
                recordsize = LittleLong(pchunk->recordsize);
                numrecords = LittleLong(pchunk->numrecords);
-               if (developer.integer)
+               if (developer.integer >= 100)
                        Con_Printf("%s: %s %x: %i * %i = %i\n", loadmodel->name, pchunk->id, version, recordsize, numrecords, recordsize * numrecords);
                if (version != 0x1e83b9 && version != 0x1e9179 && version != 0x2e)
                        Con_Printf ("%s: chunk %s has unknown version %x (0x1e83b9, 0x1e9179 and 0x2e are currently supported), trying to load anyway!\n", loadmodel->name, pchunk->id, version);
@@ -1966,7 +1966,7 @@ void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend)
                version = LittleLong(pchunk->version);
                recordsize = LittleLong(pchunk->recordsize);
                numrecords = LittleLong(pchunk->numrecords);
-               if (developer.integer)
+               if (developer.integer >= 100)
                        Con_Printf("%s: %s %x: %i * %i = %i\n", animname, pchunk->id, version, recordsize, numrecords, recordsize * numrecords);
                if (version != 0x1e83b9 && version != 0x1e9179 && version != 0x2e)
                        Con_Printf ("%s: chunk %s has unknown version %x (0x1e83b9, 0x1e9179 and 0x2e are currently supported), trying to load anyway!\n", animname, pchunk->id, version);

diff --git a/netconn.c b/netconn.c
index 00d5dd075ec2cd17935e0510fff3a06dc88ba82c..bf5481c79fd0b0eaff3f0c2376464361f504c643 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -1309,7 +1309,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                /*
                if (!strncmp(string, "ping", 4))
                {
-                       if (developer.integer)
+                       if (developer.integer >= 10)
                                Con_Printf("Received ping from %s, sending ack\n", UDP_AddrToString(readaddr));
                        NetConn_WriteString(mysocket, "\377\377\377\377ack", peeraddress);
                        return true;
@@ -1459,7 +1459,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                switch (c)
                {
                case CCREP_ACCEPT:
-                       if (developer.integer)
+                       if (developer.integer >= 10)
                                Con_Printf("Datagram_ParseConnectionless: received CCREP_ACCEPT from %s.\n", addressstring2);
                        if (cls.connect_trying)
                        {
@@ -1477,14 +1477,14 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                        }
                        break;
                case CCREP_REJECT:
-                       if (developer.integer)
+                       if (developer.integer >= 10)
                                Con_Printf("Datagram_ParseConnectionless: received CCREP_REJECT from %s.\n", addressstring2);
                        cls.connect_trying = false;
                        M_Update_Return_Reason((char *)data);
                        break;
 #if 0
                case CCREP_SERVER_INFO:
-                       if (developer.integer)
+                       if (developer.integer >= 10)
                                Con_Printf("Datagram_ParseConnectionless: received CCREP_SERVER_INFO from %s.\n", addressstring2);
                        if (cls.state != ca_dedicated)
                        {
@@ -1519,12 +1519,12 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                        break;
                case CCREP_PLAYER_INFO:
                        // we got a CCREP_PLAYER_INFO??
-                       //if (developer.integer)
+                       //if (developer.integer >= 10)
                                Con_Printf("Datagram_ParseConnectionless: received CCREP_PLAYER_INFO from %s.\n", addressstring2);
                        break;
                case CCREP_RULE_INFO:
                        // we got a CCREP_RULE_INFO??
-                       //if (developer.integer)
+                       //if (developer.integer >= 10)
                                Con_Printf("Datagram_ParseConnectionless: received CCREP_RULE_INFO from %s.\n", addressstring2);
                        break;
 #endif
@@ -1789,7 +1789,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                        stringbuf[length] = 0;
                        string = stringbuf;
 
-                       if (developer.integer)
+                       if (developer.integer >= 10)
                        {
                                LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
                                Con_Printf("NetConn_ServerParsePacket: %s sent us a command:\n", addressstring2);
@@ -1833,7 +1833,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                                // check engine protocol
                                                if (strcmp(SearchInfostring(string, "protocol"), "darkplaces 3"))
                                                {
-                                                       if (developer.integer)
+                                                       if (developer.integer >= 10)
                                                                Con_Printf("Datagram_ParseConnectionless: sending \"reject Wrong game protocol.\" to %s.\n", addressstring2);
                                                        NetConn_WriteString(mysocket, "\377\377\377\377reject Wrong game protocol.", peeraddress);
                                                }
@@ -1847,7 +1847,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                                        {
                                                                // client is still trying to connect,
                                                                // so we send a duplicate reply
-                                                               if (developer.integer)
+                                                               if (developer.integer >= 10)
                                                                        Con_Printf("Datagram_ParseConnectionless: sending duplicate accept to %s.\n", addressstring2);
                                                                NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress);
                                                        }
@@ -1877,7 +1877,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                                                        {
                                                                                // allocated connection
                                                                                LHNETADDRESS_ToString(peeraddress, conn->address, sizeof(conn->address), true);
-                                                                               if (developer.integer)
+                                                                               if (developer.integer >= 10)
                                                                                        Con_Printf("Datagram_ParseConnectionless: sending \"accept\" to %s.\n", conn->address);
                                                                                NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress);
                                                                                // now set up the client
@@ -1890,7 +1890,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                                                else
                                                                {
                                                                        // server is full
-                                                                       if (developer.integer)
+                                                                       if (developer.integer >= 10)
                                                                                Con_Printf("Datagram_ParseConnectionless: sending \"reject Server is full.\" to %s.\n", addressstring2);
                                                                        NetConn_WriteString(mysocket, "\377\377\377\377reject Server is full.", peeraddress);
                                                                }
@@ -1910,7 +1910,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
 
                                if (NetConn_BuildStatusResponse(challenge, response, sizeof(response), false))
                                {
-                                       if (developer.integer)
+                                       if (developer.integer >= 10)
                                                Con_Printf("Sending reply to master %s - %s\n", addressstring2, response);
                                        NetConn_WriteString(mysocket, response, peeraddress);
                                }
@@ -1926,7 +1926,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
 
                                if (NetConn_BuildStatusResponse(challenge, response, sizeof(response), true))
                                {
-                                       if (developer.integer)
+                                       if (developer.integer >= 10)
                                                Con_Printf("Sending reply to client %s - %s\n", addressstring2, response);
                                        NetConn_WriteString(mysocket, response, peeraddress);
                                }
@@ -1975,7 +1975,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                        /*
                        if (!strncmp(string, "ping", 4))
                        {
-                               if (developer.integer)
+                               if (developer.integer >= 10)
                                        Con_Printf("Received ping from %s, sending ack\n", UDP_AddrToString(readaddr));
                                NetConn_WriteString(mysocket, "\377\377\377\377ack", peeraddress);
                                return true;
@@ -2001,13 +2001,13 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                switch (c)
                                {
                                case CCREQ_CONNECT:
-                                       //if (developer.integer)
+                                       if (developer.integer >= 10)
                                                Con_Printf("Datagram_ParseConnectionless: received CCREQ_CONNECT from %s.\n", addressstring2);
                                        if (length >= (int)strlen("QUAKE") + 1 + 1)
                                        {
                                                if (memcmp(data, "QUAKE", strlen("QUAKE") + 1) != 0 || (int)data[strlen("QUAKE") + 1] != NET_PROTOCOL_VERSION)
                                                {
-                                                       if (developer.integer)
+                                                       if (developer.integer >= 10)
                                                                Con_Printf("Datagram_ParseConnectionless: sending CCREP_REJECT \"Incompatible version.\" to %s.\n", addressstring2);
                                                        SZ_Clear(&net_message);
                                                        // save space for the header, filled in later
@@ -2031,7 +2031,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                                                {
                                                                        // client is still trying to connect,
                                                                        // so we send a duplicate reply
-                                                                       if (developer.integer)
+                                                                       if (developer.integer >= 10)
                                                                                Con_Printf("Datagram_ParseConnectionless: sending duplicate CCREP_ACCEPT to %s.\n", addressstring2);
                                                                        SZ_Clear(&net_message);
                                                                        // save space for the header, filled in later
@@ -2065,7 +2065,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                                                        // connect to the client
                                                                        // everything is allocated, just fill in the details
                                                                        strlcpy (conn->address, addressstring2, sizeof (conn->address));
-                                                                       if (developer.integer)
+                                                                       if (developer.integer >= 10)
                                                                                Con_Printf("Datagram_ParseConnectionless: sending CCREP_ACCEPT to %s.\n", addressstring2);
                                                                        // send back the info about the server connection
                                                                        SZ_Clear(&net_message);
@@ -2084,7 +2084,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                                                }
                                                                else
                                                                {
-                                                                       //if (developer.integer)
+                                                                       if (developer.integer >= 10)
                                                                                Con_Printf("Datagram_ParseConnectionless: sending CCREP_REJECT \"Server is full.\" to %s.\n", addressstring2);
                                                                        // no room; try to let player know
                                                                        SZ_Clear(&net_message);
@@ -2102,11 +2102,11 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                        break;
 #if 0
                                case CCREQ_SERVER_INFO:
-                                       if (developer.integer)
+                                       if (developer.integer >= 10)
                                                Con_Printf("Datagram_ParseConnectionless: received CCREQ_SERVER_INFO from %s.\n", addressstring2);
                                        if (sv.active && !strcmp(MSG_ReadString(), "QUAKE"))
                                        {
-                                               if (developer.integer)
+                                               if (developer.integer >= 10)
                                                        Con_Printf("Datagram_ParseConnectionless: sending CCREP_SERVER_INFO to %s.\n", addressstring2);
                                                SZ_Clear(&net_message);
                                                // save space for the header, filled in later
@@ -2125,7 +2125,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                        }
                                        break;
                                case CCREQ_PLAYER_INFO:
-                                       if (developer.integer)
+                                       if (developer.integer >= 10)
                                                Con_Printf("Datagram_ParseConnectionless: received CCREQ_PLAYER_INFO from %s.\n", addressstring2);
                                        if (sv.active)
                                        {
@@ -2156,7 +2156,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                                        }
                                        break;
                                case CCREQ_RULE_INFO:
-                                       if (developer.integer)
+                                       if (developer.integer >= 10)
                                                Con_Printf("Datagram_ParseConnectionless: received CCREQ_RULE_INFO from %s.\n", addressstring2);
                                        if (sv.active)
                                        {

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 4fe245f2c33c251ab8a8af8d479384296716676b..f5c13fdee93370e03ca9347aea9ad2d5db411c17 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -1563,13 +1563,13 @@ void VM_fopen(void)
 
        if (VM_FILES[filenum] == NULL)
        {
-               if (developer.integer)
+               if (developer.integer >= 10)
                        Con_Printf("VM_fopen: %s: %s mode %s failed\n", PRVM_NAME, filename, modestring);
                PRVM_G_FLOAT(OFS_RETURN) = -1;
        }
        else
        {
-               if (developer.integer)
+               if (developer.integer >= 10)
                        Con_Printf("VM_fopen: %s: %s mode %s opened as #%i\n", PRVM_NAME, filename, modestring, filenum);
                PRVM_G_FLOAT(OFS_RETURN) = filenum;
        }
@@ -1600,7 +1600,7 @@ void VM_fclose(void)
                Con_Printf("VM_fclose: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME);
                return;
        }
-       if (developer.integer)
+       if (developer.integer >= 10)
                Con_Printf("VM_fclose: %s: #%i closed\n", PRVM_NAME, filenum);
        FS_Close(VM_FILES[filenum]);
        VM_FILES[filenum] = NULL;
@@ -1650,7 +1650,7 @@ void VM_fgets(void)
                if (c != '\n')
                        FS_UnGetc(VM_FILES[filenum], (unsigned char)c);
        }
-       if (developer.integer >= 3)
+       if (developer.integer >= 100)
                Con_Printf("fgets: %s: %s\n", PRVM_NAME, string);
        if (c >= 0 || end)
                PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(string);
@@ -1688,7 +1688,7 @@ void VM_fputs(void)
        VM_VarString(1, string, sizeof(string));
        if ((stringlength = (int)strlen(string)))
                FS_Write(VM_FILES[filenum], string, stringlength);
-       if (developer.integer)
+       if (developer.integer >= 100)
                Con_Printf("fputs: %s: %s\n", PRVM_NAME, string);
 }
 

diff --git a/prvm_edict.c b/prvm_edict.c
index b78b98791c19c1cfc83dc05077209d795fe971b2..c9a3a5d28bc77d8a50ed30cba95a263b20472e68 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -1893,7 +1893,7 @@ int PRVM_SetEngineString(const char *s)
                if (prog->knownstrings[i] == s)
                        return -1 - i;
        // new unknown engine string
-       if (developer.integer >= 3)
+       if (developer.integer >= 100)
                Con_Printf("new engine string %p\n", s);
        for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++)
                if (!prog->knownstrings[i])

diff --git a/r_shadow.c b/r_shadow.c
index a255a51f714dc3cb1bffafab7ecb40ef2cda6867..566158af45f3818b73ab2752039d1e7cade172b2 100644 (file)
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -2174,7 +2174,8 @@ void R_RTLight_Compile(rtlight_t *rtlight)
                }
        }
 
-       Con_DPrintf("static light built: %f %f %f : %f %f %f box, %i shadow volume triangles (in %i meshes)\n", rtlight->cullmins[0], rtlight->cullmins[1], rtlight->cullmins[2], rtlight->cullmaxs[0], rtlight->cullmaxs[1], rtlight->cullmaxs[2], shadowtris, shadowmeshes);
+       if (developer.integer >= 10)
+               Con_Printf("static light built: %f %f %f : %f %f %f box, %i shadow volume triangles (in %i meshes)\n", rtlight->cullmins[0], rtlight->cullmins[1], rtlight->cullmins[2], rtlight->cullmaxs[0], rtlight->cullmaxs[1], rtlight->cullmaxs[2], shadowtris, shadowmeshes);
 }
 
 void R_RTLight_Uncompile(rtlight_t *rtlight)

diff --git a/todo b/todo
index fcccd5282d9fc3462c09664ca35b308a261cbed6..fff96104afe3c7dcce8947f2dad02e69366132f3 100644 (file)
--- a/todo
+++ b/todo
@@ -16,6 +16,7 @@
 -d (Morphed) bug darkplaces renderer: Morphed's colormapping experiments in nexuiz show a difference in gloss color with GLSL vs dot3 path, http://img494.imageshack.us/img494/8745/nexuiz0000258lf.jpg http://www.nexuiz.com/forums/index.php?showtopic=1531 - and apparently it looks right or wrong depending on view point, suddenly switching (Morphed)
 -d (Mr Fribbles) feature darkplaces particles: reimplement quake effects for a cl_particles_quake mode (Mr Fribbles, metlslime)
 -d (QuakeMatt) change darkplaces menu: remove gl_combine from menu as it's not saved to config and really shouldn't be changed except when debugging drivers (QuakeMatt)
+-d (Sajt) bug dpmod: shouldn't get double kill for killing something and its corpse (Sajt)
 -d (Speedy) feature darkplaces init: add -demolooponly option which makes escape key quit, and disables all other keys (Speedy)
 -d (Spike) change darkplaces prvm: disable the unknown opcode error in progs loading so that fteqcc fastarrays progs will load (Spike)
 -d (Toddd) bug darkplaces client: fix gl_flashblend, it's still drawing rtdlights even when gl_flashblend is on (Toddd)
@@ -31,6 +32,7 @@
 -d (flum) bug darkplaces client: corona on your own muzzleflash is annoying when looking down because it can be seen, disable corona on all muzzleflashes (flum)
 -d (hyenur) change dpmod: make cells only 30 damage, they're too powerful now (hyenur)
 -d (innovati) bug darkplaces WGL client: fix GDI input init/shutdown, it is using weird mouse acceleration and not restoring it on exit (innovati)
+-d (innovati) bug dpmod: respawning still on fire (innovati)
 -d (lcatlnx) bug darkplaces sound: sound is sometimes coming from the wrong side apparently (lcatlnx)
 -d (mashakos) bug darkplaces input: fix the mouse move when console is raised in glx, probably by ignoring the first move after console raise (mashakos)
 -d (mrinsane) bug darkplaces renderer: r_wateralpha 1 water that has lightmapping is black in r_shadow_realtime_world 1 mode, but only if the map was loaded in r_shadow_realtime_world 1 mode, if started in 0 and then going to 1 it does not have black water, this is probably lightmap updates not occurring in rtworld mode (mrinsane)
@@ -39,8 +41,6 @@
 -d (yummyluv) feature darkplaces protocol: add buttons 9-16 (yummyluv)
 -f (James D) bug darkplaces server: losing runes on episode completion, completing episode 1 then 2 then 3 causes it to forget 1, then 4 causes it to forget 2 and 3, making it impossible to open the boss gate (James D)
 -f (Wazat) bug darkplaces: client's slowmo detection (measuring packet times and comparing to game time changes) may be making the game unpleasant (Wazat)
-0 change darkplaces client: particles shouldn't be using contents checks to decide whether to die, they should use movement traces
-0 bug darkplaces renderer: deluxemaps are not detected in some maps that do have them?  (SavageX)
 0 bug darkplaces client: GAME_NEHAHRA: make sure cutscenes and movies work, got a report of seeing a black screen (NightFright)
 0 bug darkplaces client: fix cl_bobmodel bug which momentarily jolts the gun when you pass through a trigger, pick up an item, etc, Sajt thinks this is related to console prints as well as centerprint (Sajt)
 0 bug darkplaces client: prydon cursor highlighting of EF_SELECTABLE entities flickers with lower server framerate than client framerate (carni)
@@ -48,9 +48,11 @@
 0 bug darkplaces csqc: engine-based rocket entities have a trail but they don't glow if csqc is used
 0 bug darkplaces loader: make rtlight entity loader support q3map/q3map2 lights properly, they use a spawnflag for LINEAR mode, by default they use 1/(x*x) falloff (Carni, motorsep)
 0 bug darkplaces loader: occasional crash due to memory corruption when doing "deathmatch 1;map start" during demo loop (Willis)
+0 bug darkplaces renderer: deluxemaps are not detected in some maps that do have them?  (SavageX)
 0 bug darkplaces renderer: modify r_showtris_polygonoffset to push back all filled geometry, not lines, because polygonoffset will not affect GL_LINES at all
 0 bug darkplaces renderer: monsters teleporting in really slow down rendering, perhaps the teleport light is casting huge shadows?  new information suggests it is the particles. (romi, lcatlnx)
 0 bug darkplaces renderer: r_wateralpha on maps that are not watervised shows sky, this is a known glquake bug but it is fixable in darkplaces at load time by marking opposite-content (water-empty, empty-water) leafs as visible in their pvs sets, this involves checking the portal flow...  (knghtbrd)
+0 bug darkplaces renderer: showfps values 2 and 3 are printing bogus numbers like -2 billion (Willis)
 0 bug darkplaces server: Blood Mage monsters are stuck in place apparently (steven a)
 0 bug darkplaces server: SV_PushMove is ignoring model type in its angles_x handling, where as the renderer checks only model type to determine angles_x handling (Urre)
 0 bug darkplaces server: SV_PushMove's call to SV_ClipMoveToEntity should do a trace, not just a point test, to support hollow pusher models (Urre)
@@ -67,8 +69,6 @@
 0 bug dpmod: monsters falling out of level? (Sajt)
 0 bug dpmod: monsters shouldn't constantly do sightsounds on a slain player, it's annoying and silly
 0 bug dpmod: monsters that spawn underwater shouldn't drown, just because it somewhat breaks the intended behavior of maps
-0 bug dpmod: respawning still on fire (innovati)
-0 bug dpmod: shouldn't get double kill for killing something and its corpse (Sajt)
 0 bug dpmod: test for any unnamed death messages that might be happening
 0 bug hmap2 -qbsp: errors still occur in mrinsane's newmap.map file, tyrqbsp does not have these problems (mrinsane)
 0 bug hmap2 -qbsp: portal clipped away errors and a crash occur in vaccui (Epicenter)
@@ -77,6 +77,7 @@
 0 bug hmap2: figure out why there is a subtle difference between bmodel lighting and wall lighting, something to do with nudges causing different attenuation? (Urre)
 0 bug hmap: strip .map extension from filename if present
 0 change darkplaces client: disable all possible 'cheat' things unless -developer is given on commandline, this includes r_show*, r_test, gl_lightmaps, r_fullbright
+0 change darkplaces client: particles shouldn't be using contents checks to decide whether to die, they should use movement traces
 0 change darkplaces client: restrict wateralpha and such cvars according to what is permitted in qw serverinfo?
 0 change darkplaces extensions: edit FRIK_FILE documentation to mention that fgets uses its own separate buffer, so only one fgets can be done at a time without uzing strzone, but that darkplaces uses standard tempstrings for fgets (it doesn't - change it!) and mention DP_QC_MULTIPLETEMPSTRINGS (FrikaC)
 0 change darkplaces extensions: edit FRIK_FILE documentation to mention that strcat uses its own separate buffer, and that a = strcat(a, b);a = strcat(a, c); works correctly despite this, also mention that in DP strcat uses standard tempstrings, and mention DP_QC_MULTIPLETEMPSTRINGS (FrikaC)

diff --git a/zone.c b/zone.c
index 92cf1f35dee244a99836bdbc774ec66233b85e51..6999200ae6589dd7a7277997fb6dcbd11e8f4229 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -193,7 +193,7 @@ static void _Mem_FreeBlock(memheader_t *mem, const char *filename, int fileline)
        {
 #endif
                pool->realsize -= sizeof(memheader_t) + mem->size + sizeof(int);
-               if (developer.integer)
+               if (developer_memorydebug.integer)
                        memset(mem, 0xBF, sizeof(memheader_t) + mem->size + sizeof(int));
                free(mem);
 #if MEMCLUMPING