merged some diffs between sdl.cpp and sdl_gl.cpp. Ideally, one should be the subclass of the other, or they should share a common baseclass - a lot of code is duplicated, and we have to fix bugs in two places.
svn-id: r4622
This commit is contained in:
parent
07966f6ccc
commit
c80d11090a
2 changed files with 7 additions and 11 deletions
3
sdl.cpp
3
sdl.cpp
|
@ -33,8 +33,6 @@
|
|||
#include <SDL.h>
|
||||
#include <SDL_thread.h>
|
||||
|
||||
#define MAX(a,b) (((a)<(b)) ? (b) : (a))
|
||||
#define MIN(a,b) (((a)>(b)) ? (b) : (a))
|
||||
|
||||
class OSystem_SDL : public OSystem {
|
||||
public:
|
||||
|
@ -960,7 +958,6 @@ bool OSystem_SDL::poll_event(Event *event) {
|
|||
quit();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
bool OSystem_SDL::set_sound_proc(void *param, SoundProc *proc, byte format) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue