mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-19 15:25:39 +00:00
Merge branch 'save_ext' into infrastructure_sharing-sx
This commit is contained in:
commit
2f8d330307
@ -2467,8 +2467,6 @@ static inline void ClearSaveLoadState()
|
|||||||
|
|
||||||
delete _sl.lf;
|
delete _sl.lf;
|
||||||
_sl.lf = NULL;
|
_sl.lf = NULL;
|
||||||
|
|
||||||
SlXvSetCurrentState();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2780,6 +2778,8 @@ static SaveOrLoadResult DoLoad(LoadFilter *reader, bool load_check)
|
|||||||
GamelogStopAction();
|
GamelogStopAction();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SlXvSetCurrentState();
|
||||||
|
|
||||||
return SL_OK;
|
return SL_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2839,6 +2839,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb, boo
|
|||||||
return SL_REINIT;
|
return SL_REINIT;
|
||||||
}
|
}
|
||||||
GamelogStopAction();
|
GamelogStopAction();
|
||||||
|
SlXvSetCurrentState();
|
||||||
return SL_OK;
|
return SL_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user