0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation with SDL1

Browse source 
This fixes two compilation errors when compiling against SDL1. At
least one was brought over from master.
This commit is contained in:
Andreas Löf 2016-02-28 13:21:36 +13:00
parent 46a0eb0e55
commit bdac437efc
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/video.cpp
View file

@ -1104,7 +1104,13 @@ bool CVideo::detect_video_settings(std::pair<int,int>& resolution, int& bpp, int
void CVideo::set_fullscreen(bool ison)
{
#if SDL_VERSION_ATLEAST(2, 0, 0)
if (window && isFullScreen() != ison) {
#else
if (frameBuffer && isFullScreen() != ison) {
#endif
const std::pair<int,int>& res = preferences::resolution();
#if SDL_VERSION_ATLEAST(2, 0, 0)

4
src/video.hpp
View file

@ -251,9 +251,9 @@ private:
class video_event_handler : public events::sdl_handler {
public:
virtual void handle_event(const SDL_Event &) {}
#if SDL_VERSION_ATLEAST(2, 0, 0)
virtual void handle_window_event(const SDL_Event &event);
#endif
video_event_handler() : sdl_handler(false) {}
};