[Pingus-CVS] [pingus] push by address@hidden - Fixed incorrect bitfield query, | instead of & on 2011-10-14 02:34 GMT

[pingus]

Revision: d3ae509ffcf0
Author:   Ingo Ruhnke <address@hidden>
Date:     Thu Oct 13 19:34:13 2011
Log:      Fixed incorrect bitfield query, | instead of &

http://code.google.com/p/pingus/source/detail?r=d3ae509ffcf0

Modified:
 /src/engine/display/opengl/opengl_framebuffer.cpp
 /src/engine/display/sdl_framebuffer.cpp

=======================================
--- /src/engine/display/opengl/opengl_framebuffer.cpp	Thu Oct 13 19:03:23  
2011
+++ /src/engine/display/opengl/opengl_framebuffer.cpp	Thu Oct 13 19:34:13  
2011
@@ -82,13 +82,13 @@
 bool
 OpenGLFramebuffer::is_fullscreen() const
 {
-  return screen->flags | SDL_FULLSCREEN;
+  return screen->flags & SDL_FULLSCREEN;
 }

 bool
 OpenGLFramebuffer::is_resizable() const
 {
-  return screen->flags | SDL_RESIZABLE;
+  return screen->flags & SDL_RESIZABLE;
 }

 void
=======================================
--- /src/engine/display/sdl_framebuffer.cpp     Thu Oct 13 19:03:23 2011
+++ /src/engine/display/sdl_framebuffer.cpp     Thu Oct 13 19:34:13 2011
@@ -448,13 +448,13 @@
 bool
 SDLFramebuffer::is_fullscreen() const
 {
-  return screen->flags | SDL_FULLSCREEN;
+  return screen->flags & SDL_FULLSCREEN;
 }

 bool
 SDLFramebuffer::is_resizable() const
 {
-  return screen->flags | SDL_RESIZABLE;
+  return screen->flags & SDL_RESIZABLE;
 }

 void