feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -156,10 +156,10 @@ void UIScene_SaveMessage::handleTimerComplete(int id)
|
||||
app.SetOptionsCallbackStatus(0,C4JStorage::eOptions_Callback_Read_CorruptDeletePending);
|
||||
m_bIgnoreInput=false;
|
||||
// give the option to delete the save
|
||||
UINT uiIDA[1];
|
||||
uiIDA[0]=IDS_CONFIRM_OK;
|
||||
ui.RequestMessageBox(IDS_CORRUPT_FILE, IDS_CORRUPT_OPTIONS, uiIDA, 1,
|
||||
0,&UIScene_SaveMessage::DeleteOptionsDialogReturned,this, app.GetStringTable());
|
||||
UINT uiIDA[2];
|
||||
uiIDA[0]=IDS_CORRUPT_OPTIONS_RETRY;
|
||||
uiIDA[1]=IDS_CORRUPT_OPTIONS_DELETE;
|
||||
ui.RequestErrorMessage(IDS_CORRUPT_FILE, IDS_CORRUPT_OPTIONS, uiIDA, 2, 0,&UIScene_SaveMessage::DeleteOptionsDialogReturned,this);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
@@ -173,10 +173,16 @@ void UIScene_SaveMessage::handleTimerComplete(int id)
|
||||
int UIScene_SaveMessage::DeleteOptionsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
|
||||
{
|
||||
//UIScene_SaveMessage* pClass = (UIScene_SaveMessage*)pParam;
|
||||
|
||||
// kick off the delete
|
||||
StorageManager.DeleteOptionsData(iPad);
|
||||
|
||||
if(result == C4JStorage::EMessage_ResultAccept)
|
||||
{
|
||||
// retry loading the options file
|
||||
StorageManager.ReadFromProfile(iPad);
|
||||
}
|
||||
else // result == EMessage_ResultDecline
|
||||
{
|
||||
// kick off the delete
|
||||
StorageManager.DeleteOptionsData(iPad);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user