dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/spritecache.cpp
#	src/timetable_gui.cpp
This commit is contained in:
Jonathan G Rennison
2023-01-06 20:02:04 +00:00
parent 0310fb0cdc 29af0f8c7b
commit 62d524eaef
19 changed files with 112 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/sdl2_v.h
View File

@@ -20,7 +20,7 @@
/** The SDL video driver. */
class VideoDriver_SDL_Base : public VideoDriver {
public:
VideoDriver_SDL_Base() : sdl_window(nullptr), buffer_locked(false), driver_info(this->GetName()) {}
VideoDriver_SDL_Base() : sdl_window(nullptr), buffer_locked(false) {}
const char *Start(const StringList &param) override;
@@ -44,8 +44,6 @@ public:
std::vector<int> GetListOfMonitorRefreshRates() override;
const char *GetName() const override { return "sdl"; }
const char *GetInfoString() const override { return this->driver_info.c_str(); }
protected: