thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRIM: Prevent struct Lights clashing - fixing compilation with older compiler

Browse source
This commit is contained in:
Pawel Kolodziejski 2020-01-06 00:36:40 +01:00
parent e36b8a6e52
commit 37c004f2cd
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/grim/gfx_opengl_shaders.cpp
View file

@ -218,7 +218,7 @@ GfxOpenGLS::GfxOpenGLS() {
_selectedTexture = NULL;
_emergTexture = 0;
_maxLights = 8;
_lights = new Light[_maxLights];
_lights = new GLSLight[_maxLights];
_lightsEnabled = false;
_hasAmbientLight = false;
_backgroundProgram = nullptr;
@ -777,7 +777,7 @@ void GfxOpenGLS::startActorDraw(const Actor *actor) {
_actorProgram->setUniform("hasAmbient", _hasAmbientLight);
if (_lightsEnabled) {
for (int i = 0; i < _maxLights; ++i) {
const Light &l = _lights[i];
const GLSLight &l = _lights[i];
Common::String uniform;
uniform = Common::String::format("lights[%u]._position", i);