isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-23 16:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MxTypes in TransitionManager. Remove stub marker (oops)

Browse Source
This commit is contained in:
disinvite 2023-10-07 12:08:44 -04:00
parent 41828183ed
commit dd9354ec0c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
LEGO1/mxtransitionmanager.cpp
View File

@ -318,17 +318,17 @@ void MxTransitionManager::SubmitCopyRect(LPDDSURFACEDESC ddsc)
} }
// Copy the copy rect onto the surface // Copy the copy rect onto the surface
char *dst; MxU8 *dst;
DWORD bytesPerPixel = ddsc->ddpfPixelFormat.dwRGBBitCount / 8; MxU32 bytesPerPixel = ddsc->ddpfPixelFormat.dwRGBBitCount / 8;
const char *src = (const char *)m_copyBuffer; const MxU8 *src = (const MxU8 *)m_copyBuffer;
LONG copyPitch; MxS32 copyPitch;
copyPitch = ((m_copyRect.right - m_copyRect.left) + 1) * bytesPerPixel; copyPitch = ((m_copyRect.right - m_copyRect.left) + 1) * bytesPerPixel;
LONG y; MxS32 y;
dst = (char *)ddsc->lpSurface + (ddsc->lPitch * m_copyRect.top) + (bytesPerPixel * m_copyRect.left); dst = (MxU8 *)ddsc->lpSurface + (ddsc->lPitch * m_copyRect.top) + (bytesPerPixel * m_copyRect.left);
for (y = 0; y < m_copyRect.bottom - m_copyRect.top + 1; ++y) { for (y = 0; y < m_copyRect.bottom - m_copyRect.top + 1; ++y) {
memcpy(dst, src, copyPitch); memcpy(dst, src, copyPitch);
@ -355,8 +355,8 @@ void MxTransitionManager::SetupCopyRect(LPDDSURFACEDESC ddsc)
// Check if wait indicator has started // Check if wait indicator has started
if (m_waitIndicator->GetCurrentTickleState() >= MxPresenter::TickleState_Streaming) { if (m_waitIndicator->GetCurrentTickleState() >= MxPresenter::TickleState_Streaming) {
// Setup the copy rect // Setup the copy rect
DWORD copyPitch = (ddsc->ddpfPixelFormat.dwRGBBitCount / 8) * (m_copyRect.right - m_copyRect.left + 1); // This uses m_copyRect, seemingly erroneously MxU32 copyPitch = (ddsc->ddpfPixelFormat.dwRGBBitCount / 8) * (m_copyRect.right - m_copyRect.left + 1); // This uses m_copyRect, seemingly erroneously
DWORD bytesPerPixel = ddsc->ddpfPixelFormat.dwRGBBitCount / 8; MxU32 bytesPerPixel = ddsc->ddpfPixelFormat.dwRGBBitCount / 8;
m_copyRect.left = m_waitIndicator->GetLocationX(); m_copyRect.left = m_waitIndicator->GetLocationX();
m_copyRect.top = m_waitIndicator->GetLocationY(); m_copyRect.top = m_waitIndicator->GetLocationY();
@ -368,14 +368,14 @@ void MxTransitionManager::SetupCopyRect(LPDDSURFACEDESC ddsc)
m_copyRect.bottom = m_copyRect.top + height - 1; m_copyRect.bottom = m_copyRect.top + height - 1;
// Allocate the copy buffer // Allocate the copy buffer
const char *src = (const char*)ddsc->lpSurface + m_copyRect.top * ddsc->lPitch + bytesPerPixel * m_copyRect.left; const MxU8 *src = (const MxU8*)ddsc->lpSurface + m_copyRect.top * ddsc->lPitch + bytesPerPixel * m_copyRect.left;
m_copyBuffer = new char[bytesPerPixel * width * height]; m_copyBuffer = new MxU8[bytesPerPixel * width * height];
if (!m_copyBuffer) if (!m_copyBuffer)
return; return;
// Copy into the copy buffer // Copy into the copy buffer
char *dst = (char*)m_copyBuffer; MxU8 *dst = m_copyBuffer;
for (MxS32 i = 0; i < (m_copyRect.bottom - m_copyRect.top + 1); i++) for (MxS32 i = 0; i < (m_copyRect.bottom - m_copyRect.top + 1); i++)
{ {

2
LEGO1/mxtransitionmanager.h
View File

@ -57,7 +57,7 @@ class MxTransitionManager : public MxCore
MxVideoPresenter *m_waitIndicator; MxVideoPresenter *m_waitIndicator;
RECT m_copyRect; RECT m_copyRect;
void *m_copyBuffer; MxU8 *m_copyBuffer;
flag_bitfield m_copyFlags; flag_bitfield m_copyFlags;
undefined4 m_unk24; undefined4 m_unk24;

2
LEGO1/mxvideopresenter.cpp
View File

@ -57,7 +57,7 @@ MxS32 MxVideoPresenter::GetWidth()
: m_bitmap->GetBmiHeader()->biWidth; : m_bitmap->GetBmiHeader()->biWidth;
} }
// OFFSET: LEGO1 0x1000c800 STUB // OFFSET: LEGO1 0x1000c800
MxS32 MxVideoPresenter::GetHeight() MxS32 MxVideoPresenter::GetHeight()
{ {
return m_unk54 ? m_unk54->height return m_unk54 ? m_unk54->height