miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 1.7.0-RC1

Browse Source
This commit is contained in:
Pavel Stupnikov
2017-04-09 22:34:33 +03:00
parent 20c478da3f 3433ae02f4
commit 2a02067397
262 changed files with 4673 additions and 3860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/video/win32_v.cpp
+11 -4
View File
@@ -1,4 +1,4 @@
/* $Id: win32_v.cpp 27167 2015-02-22 23:06:45Z frosch $ */
/* $Id: win32_v.cpp 27775 2017-03-11 13:05:54Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -1199,7 +1199,7 @@ void VideoDriver_Win32::MainLoop()
_draw_threaded = false;
} else {
_draw_continue = true;
_draw_threaded = ThreadObject::New(&PaintWindowThread, NULL, &_draw_thread);
_draw_threaded = ThreadObject::New(&PaintWindowThread, NULL, &_draw_thread, "ottd:draw-win32");
/* Free the mutex if we won't be able to use it. */
if (!_draw_threaded) {
@@ -1334,11 +1334,18 @@ bool VideoDriver_Win32::ToggleFullscreen(bool full_screen)
}
bool VideoDriver_Win32::AfterBlitterChange()
{
return AllocateDibSection(_screen.width, _screen.height, true) && this->MakeWindow(_fullscreen);
}
void VideoDriver_Win32::AcquireBlitterLock()
{
if (_draw_mutex != NULL) _draw_mutex->BeginCritical(true);
bool ret = AllocateDibSection(_screen.width, _screen.height, true) && this->MakeWindow(_fullscreen);
}
void VideoDriver_Win32::ReleaseBlitterLock()
{
if (_draw_mutex != NULL) _draw_mutex->EndCritical(true);
return ret;
}
void VideoDriver_Win32::EditBoxLostFocus()