mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-17 10:30:47 +02:00
Code Issues Releases Wiki Activity

fix PYRAMID FMV

Browse Source
This commit is contained in:
XProger
2018-10-25 21:45:47 +03:00
parent 4e3df17276
commit 7f15db1899
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/format.h
View File

@@ -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) {

8
src/gameflow.h
View File

@@ -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");

4
src/gapi_gl.h
View File

@@ -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();
}

1
src/utils.h
View File

@@ -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