libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-07 10:21:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA2: Add error check on TaskStacks loading

Browse Source
This commit is contained in:
a/ 2021-07-11 03:22:44 +09:00
parent b919df6bcb
commit 9238ed9903
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/saga2/task.cpp
View File

@ -135,6 +135,8 @@ public:
// list.
void newTaskStack(TaskStack *p);
void newTaskStack(TaskStack *p, TaskID id);
// Place a TaskStack back into the inactive list.
void deleteTaskStack(TaskStack *p);
@ -229,7 +231,7 @@ void TaskStackList::read(Common::InSaveFile *in) {
debugC(3, kDebugSaveload, "Loading Task Stack %d", id);
ts = new TaskStack;
_list[id] = ts;
newTaskStack(ts, id);
ts->read(in);
@ -326,6 +328,12 @@ void TaskStackList::newTaskStack(TaskStack *p) {
}
}
void TaskStackList::newTaskStack(TaskStack *p, TaskID id) {
if (_list[id])
error("Task already exists");
_list[id] = p;
}
//----------------------------------------------------------------------
// Remove the specified TaskStack from the active list and place it
// back into the inactive list
@ -498,7 +506,7 @@ void loadTaskStacks(SaveFileReader &saveGame) {
}
void loadTaskStacks(Common::InSaveFile *in, int32 chunkSize) {
debugC(2, kDebugSaveload, "Saving Task Stacks");
debugC(2, kDebugSaveload, "Loading Task Stacks");
// If there is no saved data, simply call the default constructor
if (chunkSize == 0) {