fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move more spammy message from "developer 1" to "developer 2", continued: 

- .ent, .lit not found in COM_FindFile (they will usually be missing, we print a message with "develoepr 1" when they are found)
- "trying to load" .ent file
- "bad chunk length"

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1214 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Eric Wasylishen 2015-05-25 18:38:37 +00:00
parent b750698e93
commit 621fa18dd8
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Quake/common.c
View File

@ -1620,10 +1620,12 @@ static int COM_FindFile (const char *filename, int *handle, FILE **file,
} }
if (strcmp(COM_FileGetExtension(filename), "pcx") != 0 if (strcmp(COM_FileGetExtension(filename), "pcx") != 0
&& strcmp(COM_FileGetExtension(filename), "tga") != 0) && strcmp(COM_FileGetExtension(filename), "tga") != 0
&& strcmp(COM_FileGetExtension(filename), "lit") != 0
&& strcmp(COM_FileGetExtension(filename), "ent") != 0)
Con_DPrintf ("FindFile: can't find %s\n", filename); Con_DPrintf ("FindFile: can't find %s\n", filename);
else Con_DPrintf2("FindFile: can't find %s\n", filename); else Con_DPrintf2("FindFile: can't find %s\n", filename);
// Log pcx and tga texture misses only if (developer.value >= 2) // Log pcx, tga, lit, ent misses only if (developer.value >= 2)
if (handle) if (handle)
*handle = -1; *handle = -1;

4
Quake/gl_model.c
View File

@ -685,7 +685,7 @@ void Mod_LoadLighting (lump_t *l)
i = LittleLong(((int *)data)[1]); i = LittleLong(((int *)data)[1]);
if (i == 1) if (i == 1)
{ {
Con_DPrintf("%s loaded", litfilename); Con_DPrintf("%s loaded\n", litfilename);
loadmodel->lightdata = data + 8; loadmodel->lightdata = data + 8;
return; return;
} }
@ -753,7 +753,7 @@ void Mod_LoadEntities (lump_t *l)
q_strlcpy(entfilename, loadmodel->name, sizeof(entfilename)); q_strlcpy(entfilename, loadmodel->name, sizeof(entfilename));
COM_StripExtension(entfilename, entfilename, sizeof(entfilename)); COM_StripExtension(entfilename, entfilename, sizeof(entfilename));
q_strlcat(entfilename, ".ent", sizeof(entfilename)); q_strlcat(entfilename, ".ent", sizeof(entfilename));
Con_DPrintf("trying to load %s\n", entfilename); Con_DPrintf2("trying to load %s\n", entfilename);
mark = Hunk_LowMark(); mark = Hunk_LowMark();
ents = (char *) COM_LoadHunkFile (entfilename, &path_id); ents = (char *) COM_LoadHunkFile (entfilename, &path_id);
if (ents) if (ents)

2
Quake/snd_mem.c
View File

@ -212,7 +212,7 @@ static void FindNextChunk (const char *name)
if (iff_chunk_len < 0 || iff_chunk_len > iff_end - data_p) if (iff_chunk_len < 0 || iff_chunk_len > iff_end - data_p)
{ {
data_p = NULL; data_p = NULL;
Con_DPrintf("bad \"%s\" chunk length (%d)\n", name, iff_chunk_len); Con_DPrintf2("bad \"%s\" chunk length (%d)\n", name, iff_chunk_len);
return; return;
} }
last_chunk = data_p + ((iff_chunk_len + 1) & ~1); last_chunk = data_p + ((iff_chunk_len + 1) & ~1);