From ee6f3dff11ff4a011ebc123c0071d34e4e528eb2 Mon Sep 17 00:00:00 2001 From: mtabachenko Date: Mon, 21 Dec 2009 00:19:35 +0000 Subject: [PATCH] winport: - add to new custom printscreen code 3D render info; --- desmume/ChangeLog | 2 +- desmume/src/windows/main.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/desmume/ChangeLog b/desmume/ChangeLog index 3a3d98b69..3f02a0ffb 100644 --- a/desmume/ChangeLog +++ b/desmume/ChangeLog @@ -11,7 +11,7 @@ General/Core: bug: fix huge rerecording movie file handle leak enh: support devkitpro argv enh: add gbaslot-rom commandline - enh: add EXXXXXXX cheat codes + bug: fix EXXXXXXX cheat codes Graphics: bug: fix a mistakenly rendered OBJ window diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index 3f3a1e4eb..1bbfc6265 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -3276,11 +3276,11 @@ void ScreenshotToClipboard() HDC hScreenDC = GetDC(NULL); HDC hMemDC = CreateCompatibleDC(hScreenDC); - HBITMAP hMemBitmap = CreateCompatibleBitmap(hScreenDC, 256, 384 + (14 * (twolinever ? 5:4))); + HBITMAP hMemBitmap = CreateCompatibleBitmap(hScreenDC, 256, 384 + (14 * (twolinever ? 6:5))); HBITMAP hOldBitmap = (HBITMAP)SelectObject(hMemDC, hMemBitmap); HFONT hOldFont = (HFONT)SelectObject(hMemDC, hFont); - RECT rc; SetRect(&rc, 0, 0, 256, 384 + (14 * (twolinever ? 5:4))); + RECT rc; SetRect(&rc, 0, 0, 256, 384 + (14 * (twolinever ? 6:5))); BITMAPV4HEADER bmi; memset(&bmi, 0, sizeof(bmi)); @@ -3323,6 +3323,9 @@ void ScreenshotToClipboard() sprintf(str, "FPS: %i/%i | %s", mainLoopData.fps, mainLoopData.fps3d, paused ? "Paused":"Running"); TextOut(hMemDC, 8, 384 + 14 * (twolinever ? 4:3), str, strlen(str)); + sprintf(str, "3D Render: %s", core3DList[cur3DCore]->name); + TextOut(hMemDC, 8, 384 + 14 * (twolinever ? 5:4), str, strlen(str)); + OpenClipboard(NULL); EmptyClipboard(); SetClipboardData(CF_BITMAP, hMemBitmap);