diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index 8097c5d..1411ba6 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -270,7 +270,7 @@ CStreaming::Init2(void) void CStreaming::Init(void) { -#ifdef USE_TXD_CDIMAGE +/*#ifdef USE_TXD_CDIMAGE int txdHandle = CFileMgr::OpenFile("MODELS\\TXD.IMG", "r"); if (txdHandle) CFileMgr::CloseFile(txdHandle); @@ -285,9 +285,9 @@ CStreaming::Init(void) CStreaming::Init2(); } } -#else +#else*/ CStreaming::Init2(); -#endif +//#endif } void diff --git a/vendor/librw/src/gles1/gl1device.cpp b/vendor/librw/src/gles1/gl1device.cpp index 795202c..a30be35 100644 --- a/vendor/librw/src/gles1/gl1device.cpp +++ b/vendor/librw/src/gles1/gl1device.cpp @@ -930,7 +930,7 @@ setLights(WorldLights *lightData) glDisable(GL_LIGHTING); return 0; - int i, n; + /*int i, n; Light *l; int32 bits = 0; @@ -997,7 +997,7 @@ out: glDisable(GL_LIGHTING); objectDirty = 1; - return bits; + return bits;*/ } void diff --git a/vendor/librw/src/gles1/gl1render.cpp b/vendor/librw/src/gles1/gl1render.cpp index dc0861b..3052f39 100644 --- a/vendor/librw/src/gles1/gl1render.cpp +++ b/vendor/librw/src/gles1/gl1render.cpp @@ -106,7 +106,9 @@ defaultRenderCB(Atomic *atomic, InstanceDataHeader *header) uint32 flags = atomic->geometry->flags; setWorldMatrix(atomic->getFrame()->getLTM()); - int32 vsBits = lightingCB(atomic); + //int32 vsBits = lightingCB(atomic); + + glDisable(GL_LIGHTING); setupVertexInput(header);