summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatthijs <matthijs@openttd.org>2013-02-14 11:06:06 +0000
committermatthijs <matthijs@openttd.org>2013-02-14 11:06:06 +0000
commitafcb4a25b22abb229dd302339fbf7b603c0e1deb (patch)
tree91802f4cf479328726e96f4ab0e05ce4e1035e96
parent97decad0616ad7f0c3eed902d0cb338fbd6a81c0 (diff)
downloadopenttd-afcb4a25b22abb229dd302339fbf7b603c0e1deb.tar.xz
(svn r24992) -Codechange: [SDL] Make CreateMainSurface and PollEvent private methods instead of static functions.
-rw-r--r--src/video/sdl_v.cpp4
-rw-r--r--src/video/sdl_v.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index 050f746c9..2050ab03f 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -216,7 +216,7 @@ static void GetAvailableVideoMode(uint *w, uint *h)
#define SDL_LoadBMP(file) SDL_LoadBMP_RW(SDL_CALL SDL_RWFromFile(file, "rb"), 1)
#endif
-static bool CreateMainSurface(uint w, uint h)
+bool VideoDriver_SDL::CreateMainSurface(uint w, uint h)
{
SDL_Surface *newscreen, *icon;
char caption[50];
@@ -394,7 +394,7 @@ static uint32 ConvertSdlKeyIntoMy(SDL_keysym *sym)
return (key << 16) + sym->unicode;
}
-static int PollEvent()
+int VideoDriver_SDL::PollEvent()
{
SDL_Event ev;
diff --git a/src/video/sdl_v.h b/src/video/sdl_v.h
index e4df2a30a..6c69d68d8 100644
--- a/src/video/sdl_v.h
+++ b/src/video/sdl_v.h
@@ -34,6 +34,9 @@ public:
/* virtual */ bool ClaimMousePointer();
/* virtual */ const char *GetName() const { return "sdl"; }
+private:
+ int PollEvent();
+ bool CreateMainSurface(uint w, uint h);
};
/** Factory for the SDL video driver. */