mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-27 20:51:36 +00:00
Introduce a namespace in Loader
All functions had a `LDR_` prefix. The prefix is removed. Functions and globals which are only used in Loader.cpp are now contained in an anonymous namespace.
This commit is contained in:
@@ -449,7 +449,7 @@ void CSimulation2Impl::Update(int turnLength, const std::vector<SimulationComman
|
||||
|
||||
// Load the map into the secondary simulation
|
||||
|
||||
LDR_BeginRegistering();
|
||||
PS::Loader::BeginRegistering();
|
||||
std::unique_ptr<CMapReader> mapReader = std::make_unique<CMapReader>();
|
||||
|
||||
std::string mapType;
|
||||
@@ -470,8 +470,8 @@ void CSimulation2Impl::Update(int turnLength, const std::vector<SimulationComman
|
||||
NULL, NULL, m_SecondaryContext.get(), INVALID_PLAYER, true); // throws exception on failure
|
||||
}
|
||||
|
||||
LDR_EndRegistering();
|
||||
ENSURE(LDR_NonprogressiveLoad() == INFO::OK);
|
||||
PS::Loader::EndRegistering();
|
||||
ENSURE(PS::Loader::NonprogressiveLoad() == INFO::OK);
|
||||
ENSURE(m_SecondaryComponentManager->DeserializeState(primaryStateBefore.state));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user