[Fixed] GZDoom build 1415 failed to compile on Ubuntu

[afullo]

It happened at 80%. While proceeding regularly until that, gl_skydome forced the compiler to quit.

Code: Select all

[ 79%] Building CXX object src/CMakeFiles/zdoom.dir/gl/scene/gl_clipper.o
[ 79%] Building CXX object src/CMakeFiles/zdoom.dir/gl/scene/gl_decal.o
[ 79%] Building CXX object src/CMakeFiles/zdoom.dir/gl/scene/gl_drawinfo.o
[ 79%] Building CXX object src/CMakeFiles/zdoom.dir/gl/scene/gl_flats.o
[ 79%] Building CXX object src/CMakeFiles/zdoom.dir/gl/scene/gl_walls.o
[ 80%] Building CXX object src/CMakeFiles/zdoom.dir/gl/scene/gl_sprite.o
[ 80%] Building CXX object src/CMakeFiles/zdoom.dir/gl/scene/gl_skydome.o
/home/afullo/gzdoom/src/gl/scene/gl_skydome.cpp: In member function ‘virtual void GLSkyPortal::DrawContents()’:
/home/afullo/gzdoom/src/gl/scene/gl_skydome.cpp:546:8: error: ‘colormap’ was not declared in this scope
make[2]: *** [src/CMakeFiles/zdoom.dir/gl/scene/gl_skydome.o] Errore 1
make[1]: *** [src/CMakeFiles/zdoom.dir/all] Errore 2
make: *** [all] Errore 2

("Errore" is just Italian for "Error").

Any idea about causes?

Thanks in advance.

[Graf Zahl]

This happens when some people do not listen to common sense and try to fix retarded compiler warnings - without actually testing the change on the compiler throwing the retarded warning.

I reverted this and another similar change.

@Gez: Please do not try to do this again!

[afullo]

Now it works properly, it compiled successfully and I was able to regularly execute the port.

Thanks.

[Edward-san]

Gez was not careful enough to change the copy-paste he did in gl/skydome.cpp:

Code: Select all

-    CM_Index = gl_fixedcolormap < CM_FIRSTSPECIALCOLORMAP + SpecialColormaps.Size() ? gl_fixedcolormap : CM_DEFAULT;
+    if (gl_fixedcolormap < CM_FIRSTSPECIALCOLORMAP + SpecialColormaps.Size()) CM_Index = gl_fixedcolormap;
+    else colormap = CM_DEFAULT;

forgot to change 'colormap' to 'CM_Index' on the second line.

now graf discovered that and reverted the thing ... so close!

[Graf Zahl]

I would have reverted it anyway. I do not approve of such bad code being added just to avoid a warning.
If someone could change the CMakeLists.txt file to disable the warning - that'd be an acceptable fix in my book.

[Edward-san]

I tried to add -Wno-enum-compare as suggested here but didn't work, strangely...