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

Cleaned up more framebuffer stuff that should have been in e205e42d44

Browse source 
Some additional uses from master that I forgot to add to the aforementioned commit,
and at least one thing I messed up in conflict resolution.
This commit is contained in:
Charles Dang 2018-03-19 01:45:43 +11:00
parent cbf34d2db3
commit af4db845d6
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/video.cpp
View file

@ -102,12 +102,6 @@ void CVideo::initSDL()
CVideo::~CVideo()
{
if(sdl_get_version() >= version_info(2, 0, 6)) {
// Because SDL will free the framebuffer,
// ensure that we won't attempt to free it.
frameBuffer.clear_without_free();
}
LOG_DP << "calling SDL_Quit()\n";
SDL_Quit();
assert(singleton_);
@ -146,8 +140,6 @@ void CVideo::blit_surface(int x, int y, surface surf, SDL_Rect* srcrect, SDL_Rec
void CVideo::make_fake()
{
fake_screen_ = true;
image::set_pixel_format(frameBuffer->format);
}
void CVideo::make_test_fake()
@ -231,7 +223,7 @@ void CVideo::set_window_mode(const MODE_EVENT mode, const point& size)
SDL_Rect CVideo::screen_area(bool as_pixels) const
{
if(!window) {
return {0, 0, frameBuffer->w, frameBuffer->h};
return sdl::empty_rect;
}
// First, get the renderer size in pixels.