zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-25 05:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compilation with Clang and GCC

Browse source 
src/gl/scene/gl_flats.cpp:215:3: error: cannot jump from this goto statement to its label
src/r_data/models/models.cpp💯18: error: no member named 'floor' in namespace 'std'
This commit is contained in:
alexey.lysiuk 2018-06-02 09:43:33 +03:00
parent 7d515e72c2
commit 81f042f08b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/scene/gl_flats.cpp
View file

@ -207,6 +207,7 @@ void FDrawInfo::ProcessLights(GLFlat *flat, bool istrans)
void FDrawInfo::DrawSubsectors(GLFlat *flat, int pass, bool processlights, bool istrans)
{
int dli = flat->dynlightindex;
auto vcount = flat->sector->ibocount;
gl_RenderState.Apply();
if (gl.legacyMode)
@ -215,7 +216,6 @@ void FDrawInfo::DrawSubsectors(GLFlat *flat, int pass, bool processlights, bool
goto legacy;
}
auto vcount = flat->sector->ibocount;
if (vcount > 0 && !gl_RenderState.GetClipLineShouldBeActive())
{
if (processlights) SetupSectorLights(flat, GLPASS_ALL, &dli);

2
src/r_data/models/models.cpp
View file

@ -97,7 +97,7 @@ void FModelRenderer::RenderModel(float x, float y, float z, FSpriteModelFrame *s
if (smf->rotationSpeed > 0.0000000001)
{
double turns = (I_GetTime() + I_GetTimeFrac()) / (200.0 / smf->rotationSpeed);
turns -= std::floor(turns);
turns -= floor(turns);
rotateOffset = turns * 360.0;
}
else