ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some "\n"-related stuff 

add missing "\n"s to some Printf()-like calls (in Rend2)
drop erroneous "\n"s from some Error()-like calls (in Rend2)
drop erroneous "\n" from a Com_Error() call (in vm_sparc.c)
This commit is contained in:
/dev/humancontroller 2013-05-30 15:32:44 -05:00 committed by Zack Middleton
parent 242dcf9cf8
commit 2d54a12615
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/qcommon/vm_sparc.c
View File

@ -701,7 +701,7 @@ static void dst_insn_append(struct func_info * const fp)
static void ErrJump(void) static void ErrJump(void)
{ {
Com_Error(ERR_DROP, "program tried to execute code outside VM\n"); Com_Error(ERR_DROP, "program tried to execute code outside VM");
exit(1); exit(1);
} }

10
code/renderergl2/tr_bsp.c
View File

@ -350,7 +350,7 @@ static void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
} }
if (!size) if (!size)
ri.Error(ERR_DROP, "Bad header for %s!\n", filename); ri.Error(ERR_DROP, "Bad header for %s!", filename);
size -= 2; size -= 2;
p += 2; p += 2;
@ -368,10 +368,10 @@ static void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
#if 0 // HDRFILE_RGBE #if 0 // HDRFILE_RGBE
if (size != tr.lightmapSize * tr.lightmapSize * 4) if (size != tr.lightmapSize * tr.lightmapSize * 4)
ri.Error(ERR_DROP, "Bad size for %s (%i)!\n", filename, size); ri.Error(ERR_DROP, "Bad size for %s (%i)!", filename, size);
#else // HDRFILE_FLOAT #else // HDRFILE_FLOAT
if (size != tr.lightmapSize * tr.lightmapSize * 12) if (size != tr.lightmapSize * tr.lightmapSize * 12)
ri.Error(ERR_DROP, "Bad size for %s (%i)!\n", filename, size); ri.Error(ERR_DROP, "Bad size for %s (%i)!", filename, size);
#endif #endif
} }
else else
@ -2184,7 +2184,7 @@ static void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
{ {
//ri.Printf(PRINT_ALL, "Found!\n"); //ri.Printf(PRINT_ALL, "Found!\n");
if (size != sizeof(float) * 3 * (verts->filelen / sizeof(*dv))) if (size != sizeof(float) * 3 * (verts->filelen / sizeof(*dv)))
ri.Error(ERR_DROP, "Bad size for %s (%i, expected %i)!\n", filename, size, (int)((sizeof(float)) * 3 * (verts->filelen / sizeof(*dv)))); ri.Error(ERR_DROP, "Bad size for %s (%i, expected %i)!", filename, size, (int)((sizeof(float)) * 3 * (verts->filelen / sizeof(*dv))));
} }
} }
@ -2685,7 +2685,7 @@ void R_LoadLightGrid( lump_t *l ) {
if (size != sizeof(float) * 6 * numGridPoints) if (size != sizeof(float) * 6 * numGridPoints)
{ {
ri.Error(ERR_DROP, "Bad size for %s (%i, expected %i)!\n", filename, size, (int)(sizeof(float)) * 6 * numGridPoints); ri.Error(ERR_DROP, "Bad size for %s (%i, expected %i)!", filename, size, (int)(sizeof(float)) * 6 * numGridPoints);
} }
w->hdrLightGrid = ri.Hunk_Alloc(size, h_low); w->hdrLightGrid = ri.Hunk_Alloc(size, h_low);

2
code/renderergl2/tr_fbo.c
View File

@ -107,7 +107,7 @@ FBO_t *FBO_Create(const char *name, int width, int height)
if(strlen(name) >= MAX_QPATH) if(strlen(name) >= MAX_QPATH)
{ {
ri.Error(ERR_DROP, "FBO_Create: \"%s\" is too long\n", name); ri.Error(ERR_DROP, "FBO_Create: \"%s\" is too long", name);
} }
if(width <= 0 || width > glRefConfig.maxRenderbufferSize) if(width <= 0 || width > glRefConfig.maxRenderbufferSize)

6
code/renderergl2/tr_glsl.c
View File

@ -431,7 +431,8 @@ static void GLSL_LinkProgram(GLhandleARB program)
if(!linked) if(!linked)
{ {
GLSL_PrintInfoLog(program, qfalse); GLSL_PrintInfoLog(program, qfalse);
ri.Error(ERR_DROP, "\nshaders failed to link"); ri.Printf(PRINT_ALL, "\n");
ri.Error(ERR_DROP, "shaders failed to link");
} }
} }
@ -445,7 +446,8 @@ static void GLSL_ValidateProgram(GLhandleARB program)
if(!validated) if(!validated)
{ {
GLSL_PrintInfoLog(program, qfalse); GLSL_PrintInfoLog(program, qfalse);
ri.Error(ERR_DROP, "\nshaders failed to validate"); ri.Printf(PRINT_ALL, "\n");
ri.Error(ERR_DROP, "shaders failed to validate");
} }
} }

4
code/renderergl2/tr_shade_calc.c
View File

@ -456,10 +456,10 @@ static void Autosprite2Deform( void ) {
vec3_t forward; vec3_t forward;
if ( tess.numVertexes & 3 ) { if ( tess.numVertexes & 3 ) {
ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count", tess.shader->name ); ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count\n", tess.shader->name );
} }
if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) { if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count", tess.shader->name ); ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count\n", tess.shader->name );
} }
if ( backEnd.currentEntity != &tr.worldEntity ) { if ( backEnd.currentEntity != &tr.worldEntity ) {