tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-04-30 09:01:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

focus lost fixing, also see 98e8b7c .

Browse source
This commit is contained in:
Zero Fanker 2024-11-27 22:11:51 -05:00
parent f0f2439be0
commit 4fae8378db
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
MissionEditor/IsoView.cpp
View file

@ -5417,16 +5417,8 @@ void CIsoView::DrawMap()
mapwidth = Map->GetWidth();
mapheight = Map->GetHeight();
DDSURFACEDESC2 ddsd;
ZeroMemory(&ddsd, sizeof(ddsd));
ddsd.dwSize = sizeof(DDSURFACEDESC2);
ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT;
lpdsBack->GetSurfaceDesc(&ddsd);
#ifdef NOSURFACES
lpdsBack->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT | DDLOCK_NOSYSLOCK, NULL);
#ifdef NOSURFACES
auto ddsd = getDDDescBasic(false);
#endif
// we render texts and waypoints last as they should be always visible anyway and because text rendering is currently done using GDI -> getting a DC for every text is too slow nowadays
@ -6190,7 +6182,7 @@ void CIsoView::DrawMap()
Blit((LPDIRECTDRAWSURFACE4)pics["CELLTAG"].pic, drawCoords.x - 1, drawCoords.y - 1);
#ifdef NOSURFACES
lpdsBack->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT | DDLOCK_NOSYSLOCK, NULL);
auto ddsd = getDDDesc(false);
#endif
}
@ -6230,7 +6222,7 @@ void CIsoView::DrawMap()
m_waypoints_to_render.push_back({ waypointImageCoords.x, waypointImageCoords.y });
m_texts_to_render.push_back({ ID.GetString(), waypointTextCoords.x, waypointTextCoords.y, RGB(0,0,255), false, useFont9, true });
#ifdef NOSURFACES
lpdsBack->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT | DDLOCK_NOSYSLOCK, NULL);
ddsd = getDDDescBasic(false);
#endif
}
@ -6322,6 +6314,25 @@ std::tuple<DDSURFACEDESC2, LPDIRECTDRAWSURFACE4, bool> CIsoView::getDDDesc(bool
return { ddsd, dds, useHighRes };
}
DDSURFACEDESC2 CIsoView::getDDDescBasic(bool recreated)
{
DDSURFACEDESC2 ddsd;
ZeroMemory(&ddsd, sizeof(ddsd));
ddsd.dwSize = sizeof(DDSURFACEDESC2);
ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT;
lpdsBack->GetSurfaceDesc(&ddsd);
auto const lockRet = lpdsBack->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT | DDLOCK_NOSYSLOCK, NULL);
if (lockRet == DDERR_SURFACELOST && !recreated) {
ReInitializeDDraw();
return getDDDescBasic(true);
}
ASSERT(lockRet == S_OK);
ASSERT(ddsd.lpSurface != nullptr);
return ddsd;
}
void CIsoView::RenderUIOverlay()
{
if (!m_textDefault) {

1
MissionEditor/IsoView.h
View file

@ -123,6 +123,7 @@ protected:
virtual void Dump(CDumpContext& dc) const;
#endif
std::tuple<DDSURFACEDESC2, LPDIRECTDRAWSURFACE4, bool> getDDDesc(bool recreated);
DDSURFACEDESC2 getDDDescBasic(bool recreated);
// generated message maps
//{{AFX_MSG(CIsoView)