diff --git a/src/format.h b/src/format.h index cfb21b6..4875df3 100644 --- a/src/format.h +++ b/src/format.h @@ -3837,7 +3837,6 @@ namespace TR { t.texCoord[1] = t.texCoordAtlas[1] = short2( d.x1, d.y1 );\ t.texCoord[2] = t.texCoordAtlas[2] = short2( d.x2, d.y2 );\ t.texCoord[3] = t.texCoordAtlas[3] = short2( d.x3, d.y3 );\ - ASSERT(d.x0 < 256 && d.x1 < 256 && d.x2 < 256 && d.x3 < 256 && d.y0 < 256 && d.y1 < 256 && d.y2 < 256 && d.y3 < 256);\ } switch (version) { diff --git a/src/gameflow.h b/src/gameflow.h index 13b5033..04e3a25 100644 --- a/src/gameflow.h +++ b/src/gameflow.h @@ -1151,10 +1151,10 @@ namespace TR { CHECK_FILE("video/1/CANYON.RPL"); break; case LVL_TR1_10B : - CHECK_FILE("FMV/PIRAMID.FMV"); - CHECK_FILE("FMV/PIRAMID.RPL"); - CHECK_FILE("video/1/PIRAMID.FMV"); - CHECK_FILE("video/1/PIRAMID.RPL"); + CHECK_FILE("FMV/PYRAMID.FMV"); + CHECK_FILE("FMV/PYRAMID.RPL"); + CHECK_FILE("video/1/PYRAMID.FMV"); + CHECK_FILE("video/1/PYRAMID.RPL"); break; case LVL_TR1_CUT_4 : CHECK_FILE("FMV/PRISON.FMV"); diff --git a/src/gapi_gl.h b/src/gapi_gl.h index 688cd8c..17c1d9b 100644 --- a/src/gapi_gl.h +++ b/src/gapi_gl.h @@ -455,7 +455,7 @@ namespace GAPI { glCompileShader(obj); glGetShaderInfoLog(obj, sizeof(info), NULL, info); - if (info[0]) LOG("! shader: %s\n", info); + if (info[0] && strlen(info) > 8) LOG("! shader: %s\n", info); glAttachShader(ID, obj); glDeleteShader(obj); @@ -467,7 +467,7 @@ namespace GAPI { glLinkProgram(ID); glGetProgramInfoLog(ID, sizeof(info), NULL, info); - if (info[0]) LOG("! program: %s\n", info); + if (info[0] && strlen(info) > 8) LOG("! program: %s\n", info); return checkLink(); } diff --git a/src/utils.h b/src/utils.h index 2efa7f2..6b58852 100644 --- a/src/utils.h +++ b/src/utils.h @@ -20,6 +20,7 @@ #else #define ASSERT(expr) + //#define ASSERT(expr) if (expr) {} else { LOG("ASSERT:\n %s:%d\n %s => %s\n", __FILE__, __LINE__, __FUNCTION__, #expr); } #ifdef _OS_LINUX #define LOG(...) printf(__VA_ARGS__); fflush(stdout) #else