mirror of
https://github.com/nzp-team/fteqw.git
synced 2024-11-10 14:42:13 +00:00
kill some unnecessary Sys_Errors
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1733 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
e19c431a28
commit
a32c1af46d
4 changed files with 23 additions and 5 deletions
|
@ -457,7 +457,11 @@ readit:
|
||||||
net_message.cursize = LittleLong (net_message.cursize);
|
net_message.cursize = LittleLong (net_message.cursize);
|
||||||
//Con_Printf("read: %ld bytes\n", net_message.cursize);
|
//Con_Printf("read: %ld bytes\n", net_message.cursize);
|
||||||
if (net_message.cursize > MAX_OVERALLMSGLEN)
|
if (net_message.cursize > MAX_OVERALLMSGLEN)
|
||||||
Sys_Error ("Demo message > MAX_OVERALLMSGLEN");
|
{
|
||||||
|
Con_Printf ("Demo message > MAX_OVERALLMSGLEN\n");
|
||||||
|
CL_StopPlayback ();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
r = readdemobytes (net_message.data, net_message.cursize);
|
r = readdemobytes (net_message.data, net_message.cursize);
|
||||||
if (r != net_message.cursize)
|
if (r != net_message.cursize)
|
||||||
{
|
{
|
||||||
|
|
|
@ -47,11 +47,19 @@ char *ReadGreyTargaFile (qbyte *data, int flen, tgaheader_t *tgahead, int asgrey
|
||||||
|
|
||||||
if (tgahead->version!=1
|
if (tgahead->version!=1
|
||||||
&& tgahead->version!=3)
|
&& tgahead->version!=3)
|
||||||
Sys_Error ("LoadGrayTGA: Only type 1 and 3 greyscale targa images are understood.\n");
|
{
|
||||||
|
Con_Printf("LoadGrayTGA: Only type 1 and 3 greyscale targa images are understood.\n");
|
||||||
|
BZ_Free(pixels);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
if (tgahead->version==1 && tgahead->bpp != 8 &&
|
if (tgahead->version==1 && tgahead->bpp != 8 &&
|
||||||
tgahead->cm_size != 24 && tgahead->cm_len != 256)
|
tgahead->cm_size != 24 && tgahead->cm_len != 256)
|
||||||
Sys_Error ("LoadGrayTGA: Strange palette type\n");
|
{
|
||||||
|
Con_Printf("LoadGrayTGA: Strange palette type\n");
|
||||||
|
BZ_Free(pixels);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
columns = tgahead->width;
|
columns = tgahead->width;
|
||||||
rows = tgahead->height;
|
rows = tgahead->height;
|
||||||
|
|
|
@ -2154,7 +2154,10 @@ void COM_CheckRegistered (void)
|
||||||
|
|
||||||
for (i=0 ; i<128 ; i++)
|
for (i=0 ; i<128 ; i++)
|
||||||
if (pop[i] != (unsigned short)BigShort (check[i]))
|
if (pop[i] != (unsigned short)BigShort (check[i]))
|
||||||
Sys_Error ("Corrupted data file.");
|
{
|
||||||
|
Con_TPrintf (TL_SHAREWAREVERSION);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
static_registered = true;
|
static_registered = true;
|
||||||
Con_TPrintf (TL_REGISTEREDVERSION);
|
Con_TPrintf (TL_REGISTEREDVERSION);
|
||||||
|
|
|
@ -1435,7 +1435,10 @@ qboolean Mod_LoadDoomLevel(model_t *mod)
|
||||||
COM_StripExtension(mod->name, name);
|
COM_StripExtension(mod->name, name);
|
||||||
|
|
||||||
if (!COM_LoadTempFile(va("%s", mod->name)))
|
if (!COM_LoadTempFile(va("%s", mod->name)))
|
||||||
Sys_Error("Wad map %s does not exist\n", mod->name);
|
{
|
||||||
|
Con_Printf("Wad map %s does not exist\n", mod->name);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
gl_nodes = (void *)COM_LoadMallocFile (va("%s.gl_nodes", name));
|
gl_nodes = (void *)COM_LoadMallocFile (va("%s.gl_nodes", name));
|
||||||
if (gl_nodes && com_filesize>0)
|
if (gl_nodes && com_filesize>0)
|
||||||
|
|
Loading…
Reference in a new issue