diff --git a/.gitignore b/.gitignore index c7c2fb23a..3082d61c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -*.swp *.o *.exe *.user @@ -33,4 +32,4 @@ Makefile.me *.settings config.log *.sconsign.dblite -*.sconf_temp +*.sconf_temp \ No newline at end of file diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp index 57d4f8d96..c0e045573 100644 --- a/src/graphics/Renderer.cpp +++ b/src/graphics/Renderer.cpp @@ -123,10 +123,8 @@ void Renderer::clearScreen(float alpha) glClear(GL_COLOR_BUFFER_BIT); #endif #ifdef OGLI -#ifndef OGLR std::fill(vid, vid+(VIDXRES*VIDYRES), 0); #endif -#endif } #ifdef OGLR void Renderer::checkShader(GLuint shader, char * shname) @@ -2376,9 +2374,7 @@ void Renderer::ClearAccumulation() std::fill(fire_r[0]+0, fire_r[(YRES/CELL)-1]+((XRES/CELL)-1), 0); std::fill(fire_g[0]+0, fire_g[(YRES/CELL)-1]+((XRES/CELL)-1), 0); std::fill(fire_b[0]+0, fire_b[(YRES/CELL)-1]+((XRES/CELL)-1), 0); -#ifndef OGLR std::fill(persistentVid, persistentVid+(VIDXRES*YRES), 0); -#endif } void Renderer::AddRenderMode(unsigned int mode)