libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-07 11:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BAGEL: Fix freeze when using inventory items

Browse Source
This commit is contained in:
SupSuper 2024-03-23 18:11:05 +00:00 committed by Eugene Sandulenko
parent 92342172ac
commit 1013083516
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/bagel/baglib/character_object.cpp
View File

@ -270,6 +270,8 @@ BOOL CBagCharacterObject::DoAdvance() {
// frame.
//
if (IsModal() || !m_bPanim || CBagMasterWin::GetPanimations()) {
// TODO: Not sure what this is for, it just gets stuck in an infinite loop
#if 0
if (bPDAWand) {
while (!_smacker->needsUpdate()) {
g_system->delayMillis(10);
@ -277,6 +279,7 @@ BOOL CBagCharacterObject::DoAdvance() {
return FALSE;
}
}
#endif
if (_smacker->needsUpdate()) {
bDoAdvance = TRUE;
@ -377,22 +380,7 @@ ERROR_CODE CBagCharacterObject::Update(CBofBitmap *pBmp, CBofPoint pt, CBofRect
// Get access to the current sDev
// Paint in the new pos
ERROR_CODE errCode;
#if BOF_MAC
if (m_pBmpBuf) {
m_pBmpBuf->Lock();
MacintizeBitmap(m_pBmpBuf->GetPixelAddress(0, 0), ABS(m_pBmpBuf->Height() * m_pBmpBuf->Width()));
#endif
errCode = m_pBmpBuf->Paint(pBmp, (pt.x + (NewPos.x - OrigPos.x)), (pt.y + (NewPos.y - OrigPos.y)), nullptr, m_nCharTransColor);
#if BOF_MAC
MacintizeBitmap(m_pBmpBuf->GetPixelAddress(0, 0), ABS(m_pBmpBuf->Height() * m_pBmpBuf->Width()));
m_pBmpBuf->UnLock();
}
#endif
if (errCode) {
return ERR_UNKNOWN;
}
return m_pBmpBuf->Paint(pBmp, (pt.x + (NewPos.x - OrigPos.x)), (pt.y + (NewPos.y - OrigPos.y)), nullptr, m_nCharTransColor);
}
return ERR_NONE;