mirror of https://github.com/OpenTTD/OpenTTD.git
Codechange: move Save/Load functions of same chunk next to each other
This commit is contained in:
parent
af3aba7a88
commit
5cd0c65787
|
@ -143,75 +143,6 @@ void SaveLoad_LinkGraph(LinkGraph &lg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Save a link graph job.
|
|
||||||
* @param lgj LinkGraphJob to be saved.
|
|
||||||
*/
|
|
||||||
static void DoSave_LGRJ(LinkGraphJob *lgj)
|
|
||||||
{
|
|
||||||
SlObject(lgj, GetLinkGraphJobDesc());
|
|
||||||
_num_nodes = lgj->Size();
|
|
||||||
SlObject(const_cast<LinkGraph *>(&lgj->Graph()), GetLinkGraphDesc());
|
|
||||||
SaveLoad_LinkGraph(const_cast<LinkGraph &>(lgj->Graph()));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save a link graph.
|
|
||||||
* @param lg LinkGraph to be saved.
|
|
||||||
*/
|
|
||||||
static void DoSave_LGRP(LinkGraph *lg)
|
|
||||||
{
|
|
||||||
_num_nodes = lg->Size();
|
|
||||||
SlObject(lg, GetLinkGraphDesc());
|
|
||||||
SaveLoad_LinkGraph(*lg);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load all link graphs.
|
|
||||||
*/
|
|
||||||
static void Load_LGRP()
|
|
||||||
{
|
|
||||||
int index;
|
|
||||||
while ((index = SlIterateArray()) != -1) {
|
|
||||||
if (!LinkGraph::CanAllocateItem()) {
|
|
||||||
/* Impossible as they have been present in previous game. */
|
|
||||||
NOT_REACHED();
|
|
||||||
}
|
|
||||||
LinkGraph *lg = new (index) LinkGraph();
|
|
||||||
SlObject(lg, GetLinkGraphDesc());
|
|
||||||
lg->Init(_num_nodes);
|
|
||||||
SaveLoad_LinkGraph(*lg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load all link graph jobs.
|
|
||||||
*/
|
|
||||||
static void Load_LGRJ()
|
|
||||||
{
|
|
||||||
int index;
|
|
||||||
while ((index = SlIterateArray()) != -1) {
|
|
||||||
if (!LinkGraphJob::CanAllocateItem()) {
|
|
||||||
/* Impossible as they have been present in previous game. */
|
|
||||||
NOT_REACHED();
|
|
||||||
}
|
|
||||||
LinkGraphJob *lgj = new (index) LinkGraphJob();
|
|
||||||
SlObject(lgj, GetLinkGraphJobDesc());
|
|
||||||
LinkGraph &lg = const_cast<LinkGraph &>(lgj->Graph());
|
|
||||||
SlObject(&lg, GetLinkGraphDesc());
|
|
||||||
lg.Init(_num_nodes);
|
|
||||||
SaveLoad_LinkGraph(lg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load the link graph schedule.
|
|
||||||
*/
|
|
||||||
static void Load_LGRS()
|
|
||||||
{
|
|
||||||
SlObject(&LinkGraphSchedule::instance, GetLinkGraphScheduleDesc());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spawn the threads for running link graph calculations.
|
* Spawn the threads for running link graph calculations.
|
||||||
* Has to be done after loading as the cargo classes might have changed.
|
* Has to be done after loading as the cargo classes might have changed.
|
||||||
|
@ -242,6 +173,17 @@ void AfterLoadLinkGraphs()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save a link graph.
|
||||||
|
* @param lg LinkGraph to be saved.
|
||||||
|
*/
|
||||||
|
static void DoSave_LGRP(LinkGraph *lg)
|
||||||
|
{
|
||||||
|
_num_nodes = lg->Size();
|
||||||
|
SlObject(lg, GetLinkGraphDesc());
|
||||||
|
SaveLoad_LinkGraph(*lg);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Save all link graphs.
|
* Save all link graphs.
|
||||||
*/
|
*/
|
||||||
|
@ -253,6 +195,36 @@ static void Save_LGRP()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load all link graphs.
|
||||||
|
*/
|
||||||
|
static void Load_LGRP()
|
||||||
|
{
|
||||||
|
int index;
|
||||||
|
while ((index = SlIterateArray()) != -1) {
|
||||||
|
if (!LinkGraph::CanAllocateItem()) {
|
||||||
|
/* Impossible as they have been present in previous game. */
|
||||||
|
NOT_REACHED();
|
||||||
|
}
|
||||||
|
LinkGraph *lg = new (index) LinkGraph();
|
||||||
|
SlObject(lg, GetLinkGraphDesc());
|
||||||
|
lg->Init(_num_nodes);
|
||||||
|
SaveLoad_LinkGraph(*lg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Save a link graph job.
|
||||||
|
* @param lgj LinkGraphJob to be saved.
|
||||||
|
*/
|
||||||
|
static void DoSave_LGRJ(LinkGraphJob *lgj)
|
||||||
|
{
|
||||||
|
SlObject(lgj, GetLinkGraphJobDesc());
|
||||||
|
_num_nodes = lgj->Size();
|
||||||
|
SlObject(const_cast<LinkGraph *>(&lgj->Graph()), GetLinkGraphDesc());
|
||||||
|
SaveLoad_LinkGraph(const_cast<LinkGraph &>(lgj->Graph()));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Save all link graph jobs.
|
* Save all link graph jobs.
|
||||||
*/
|
*/
|
||||||
|
@ -264,6 +236,26 @@ static void Save_LGRJ()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load all link graph jobs.
|
||||||
|
*/
|
||||||
|
static void Load_LGRJ()
|
||||||
|
{
|
||||||
|
int index;
|
||||||
|
while ((index = SlIterateArray()) != -1) {
|
||||||
|
if (!LinkGraphJob::CanAllocateItem()) {
|
||||||
|
/* Impossible as they have been present in previous game. */
|
||||||
|
NOT_REACHED();
|
||||||
|
}
|
||||||
|
LinkGraphJob *lgj = new (index) LinkGraphJob();
|
||||||
|
SlObject(lgj, GetLinkGraphJobDesc());
|
||||||
|
LinkGraph &lg = const_cast<LinkGraph &>(lgj->Graph());
|
||||||
|
SlObject(&lg, GetLinkGraphDesc());
|
||||||
|
lg.Init(_num_nodes);
|
||||||
|
SaveLoad_LinkGraph(lg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Save the link graph schedule.
|
* Save the link graph schedule.
|
||||||
*/
|
*/
|
||||||
|
@ -272,6 +264,14 @@ static void Save_LGRS()
|
||||||
SlObject(&LinkGraphSchedule::instance, GetLinkGraphScheduleDesc());
|
SlObject(&LinkGraphSchedule::instance, GetLinkGraphScheduleDesc());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load the link graph schedule.
|
||||||
|
*/
|
||||||
|
static void Load_LGRS()
|
||||||
|
{
|
||||||
|
SlObject(&LinkGraphSchedule::instance, GetLinkGraphScheduleDesc());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Substitute pointers in link graph schedule.
|
* Substitute pointers in link graph schedule.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue