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:
@@ -133,7 +133,9 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile *sourceSave, ConsoleS
|
||||
|
||||
if(progress)
|
||||
{
|
||||
#ifndef _WINDOWS64
|
||||
progress->progressStage(IDS_SAVETRANSFER_STAGE_CONVERTING);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Overworld
|
||||
@@ -167,10 +169,11 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile *sourceSave, ConsoleS
|
||||
bos.flush();
|
||||
dos->close();
|
||||
dos->deleteChildStream();
|
||||
delete dos;
|
||||
delete dos;
|
||||
dis->deleteChildStream();
|
||||
delete dis;
|
||||
}
|
||||
|
||||
delete dis;
|
||||
|
||||
++currentProgress;
|
||||
if(progress) progress->progressStagePercentage( (currentProgress*100)/progressTarget);
|
||||
@@ -212,9 +215,10 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile *sourceSave, ConsoleS
|
||||
dos->close();
|
||||
dos->deleteChildStream();
|
||||
delete dos;
|
||||
dis->deleteChildStream();
|
||||
delete dis;
|
||||
}
|
||||
|
||||
delete dis;
|
||||
|
||||
++currentProgress;
|
||||
if(progress) progress->progressStagePercentage((currentProgress*100)/progressTarget);
|
||||
@@ -254,9 +258,10 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile *sourceSave, ConsoleS
|
||||
dos->close();
|
||||
dos->deleteChildStream();
|
||||
delete dos;
|
||||
dis->deleteChildStream();
|
||||
delete dis;
|
||||
}
|
||||
|
||||
delete dis;
|
||||
|
||||
++currentProgress;
|
||||
if(progress) progress->progressStagePercentage((currentProgress*100)/progressTarget);
|
||||
|
||||
Reference in New Issue
Block a user