diff --git a/.gitignore b/.gitignore index 3082d61c7..c7c2fb23a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.swp *.o *.exe *.user @@ -32,4 +33,4 @@ Makefile.me *.settings config.log *.sconsign.dblite -*.sconf_temp \ No newline at end of file +*.sconf_temp diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp index c0e045573..57d4f8d96 100644 --- a/src/graphics/Renderer.cpp +++ b/src/graphics/Renderer.cpp @@ -123,8 +123,10 @@ 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) @@ -2374,7 +2376,9 @@ 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)