claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into experimental

Browse Source
This commit is contained in:
Melissa Goad
2017-07-19 23:06:55 -05:00
parent 23452bd39c ce7877021f
commit ea18d0f879
36 changed files with 1111 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/VIDEO/video.c
View File

@@ -647,6 +647,8 @@ void video_wait_for_buffer()
void video_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
{
if (h <= 0)
return;
video_wait_for_blit();
blit_data.busy = 1;
blit_data.buffer_in_use = 1;
@@ -662,6 +664,8 @@ void video_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
void video_blit_memtoscreen_8(int x, int y, int w, int h)
{
if (h <= 0)
return;
video_wait_for_blit();
blit_data.busy = 1;
blit_data.x = x;
@@ -714,7 +718,7 @@ void take_screenshot()
info = localtime(&now);
memset(screenshot_fn, 0, 8192);
memset(screenshot_fn_partial, 0, 4096);
memset(screenshot_path, 0, 4096);
memset(screenshot_path, 0, 8192);
pclog("Video API is: %i\n", vid_api);
append_filename_w(screenshot_path, pcempath, L"screenshots", 4095);
if (!DirectoryExists(screenshot_path))