General fixes

This commit is contained in:
qloak committed 2026-08-07 11:28:28 -07:00
1 parent d2dadc1df6
commit 3780fdb1cf
4 files changed
+16 -14

No files matched your search

@@ -406,6 +406,12 @@ bool DLCManager::processDLCDataFile(DWORD &dwFilesProcessed, PBYTE pbData, DWORD
unsigned int uiVersion=*(unsigned int *)pbData;
uiCurrentByte+=sizeof(int);
if(uiVersion > CURRENT_DLC_VERSION_NUM)
{
if(pbData!=NULL) delete [] pbData;
app.DebugPrintf("DLC version of %d is newer than this build can read (%d)\n", uiVersion, CURRENT_DLC_VERSION_NUM);
return false;
}
if(uiVersion < CURRENT_DLC_VERSION_NUM)
{
if(pbData!=NULL) delete [] pbData;
@@ -613,6 +619,11 @@ DWORD DLCManager::retrievePackID(PBYTE pbData, DWORD dwLength, DLCPack *pack)
unsigned int uiVersion=*(unsigned int *)pbData;
uiCurrentByte+=sizeof(int);
if(uiVersion > CURRENT_DLC_VERSION_NUM)
{
app.DebugPrintf("DLC version of %d is newer than this build can read (%d)\n", uiVersion, CURRENT_DLC_VERSION_NUM);
return 0;
}
if(uiVersion < CURRENT_DLC_VERSION_NUM)
{
app.DebugPrintf("DLC version of %d is too old to be read\n", uiVersion);
@@ -454,12 +454,7 @@ void CXuiSceneAbstractContainer::SetPointerText(vector<HtmlString> *description,
return;
}
wstring combinedText;
for(size_t i = 0; i < description->size(); ++i)
{
combinedText += (*description)[i].text;
if(i + 1 < description->size()) combinedText += L"\n";
}
wstring combinedText = HtmlString::Compose(description);
vector<wstring> unformattedStrings;
for(size_t i = 0; i < description->size(); ++i)
@@ -141,14 +141,12 @@ void ShutdownManager::SysUtilCallback(uint64_t status, uint64_t param, void *use
StartShutdown();
break;
case CELL_SYSUTIL_SYSTEM_MENU_OPEN:
// Tell the game UI to stop processing
case CELL_SYSUTIL_DRAWING_BEGIN:
StorageManager.SetSystemUIDisplaying(true);
break;
case CELL_SYSUTIL_DRAWING_END:
StorageManager.SetSystemUIDisplaying(false);
break;
case CELL_SYSUTIL_DRAWING_BEGIN:
case CELL_SYSUTIL_SYSTEM_MENU_CLOSE:
StorageManager.SetSystemUIDisplaying(false);
break;
case CELL_SYSUTIL_BGMPLAYBACK_PLAY:
if( minecraft )
@@ -141,14 +141,12 @@ void ShutdownManager::SysUtilCallback(uint64_t status, uint64_t param, void *use
StartShutdown();
break;
case CELL_SYSUTIL_SYSTEM_MENU_OPEN:
// Tell the game UI to stop processing
case CELL_SYSUTIL_DRAWING_BEGIN:
StorageManager.SetSystemUIDisplaying(true);
break;
case CELL_SYSUTIL_DRAWING_END:
StorageManager.SetSystemUIDisplaying(false);
break;
case CELL_SYSUTIL_DRAWING_BEGIN:
case CELL_SYSUTIL_SYSTEM_MENU_CLOSE:
StorageManager.SetSystemUIDisplaying(false);
break;
case CELL_SYSUTIL_BGMPLAYBACK_PLAY:
if( minecraft )