mirror of https://github.com/zeldaret/botw.git
ksys/world: Rename SkyMgr to EnvMgr
EnvPalettes and other Env stuff are handled by this manager. Cloud/sky properties are handled by "CloudMgr" (which will be renamed to SkyMgr) instead.
This commit is contained in:
parent
1fb3ae9368
commit
a92ca1d073
|
@ -5,6 +5,8 @@ target_sources(uking PRIVATE
|
||||||
worldCloudMgr.h
|
worldCloudMgr.h
|
||||||
worldDofMgr.cpp
|
worldDofMgr.cpp
|
||||||
worldDofMgr.h
|
worldDofMgr.h
|
||||||
|
worldEnvMgr.cpp
|
||||||
|
worldEnvMgr.h
|
||||||
worldJob.cpp
|
worldJob.cpp
|
||||||
worldJob.h
|
worldJob.h
|
||||||
worldManager.cpp
|
worldManager.cpp
|
||||||
|
@ -13,8 +15,6 @@ target_sources(uking PRIVATE
|
||||||
worldShootingStarMgr.h
|
worldShootingStarMgr.h
|
||||||
worldShootingStarMgrEx.cpp
|
worldShootingStarMgrEx.cpp
|
||||||
worldShootingStarMgrEx.h
|
worldShootingStarMgrEx.h
|
||||||
worldSkyMgr.cpp
|
|
||||||
worldSkyMgr.h
|
|
||||||
worldTempMgr.cpp
|
worldTempMgr.cpp
|
||||||
worldTempMgr.h
|
worldTempMgr.h
|
||||||
worldTimeMgr.cpp
|
worldTimeMgr.cpp
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
#include "KingSystem/World/worldEnvMgr.h"
|
|
@ -6,11 +6,11 @@
|
||||||
namespace ksys::world {
|
namespace ksys::world {
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
class SkyMgr : public Job {
|
class EnvMgr : public Job {
|
||||||
public:
|
public:
|
||||||
SkyMgr();
|
EnvMgr();
|
||||||
|
|
||||||
JobType getType() const override { return JobType::Sky; }
|
JobType getType() const override { return JobType::Env; }
|
||||||
|
|
||||||
void resetForStageUnload();
|
void resetForStageUnload();
|
||||||
|
|
||||||
|
@ -19,6 +19,6 @@ public:
|
||||||
|
|
||||||
u8 _20[0x6b618 - 0x20];
|
u8 _20[0x6b618 - 0x20];
|
||||||
};
|
};
|
||||||
KSYS_CHECK_SIZE_NX150(SkyMgr, 0x6b618);
|
KSYS_CHECK_SIZE_NX150(EnvMgr, 0x6b618);
|
||||||
|
|
||||||
} // namespace ksys::world
|
} // namespace ksys::world
|
|
@ -14,7 +14,7 @@ enum class JobType {
|
||||||
Weather,
|
Weather,
|
||||||
Temp,
|
Temp,
|
||||||
Wind,
|
Wind,
|
||||||
Sky,
|
Env,
|
||||||
Dof,
|
Dof,
|
||||||
Chemical,
|
Chemical,
|
||||||
};
|
};
|
||||||
|
|
|
@ -333,8 +333,8 @@ static Job* makeJob(JobType type, sead::Heap* heap) {
|
||||||
return new (heap) TempMgr;
|
return new (heap) TempMgr;
|
||||||
case JobType::Wind:
|
case JobType::Wind:
|
||||||
return new (heap) WindMgr;
|
return new (heap) WindMgr;
|
||||||
case JobType::Sky:
|
case JobType::Env:
|
||||||
return new (heap) SkyMgr;
|
return new (heap) EnvMgr;
|
||||||
case JobType::Dof:
|
case JobType::Dof:
|
||||||
return new (heap) DofMgr;
|
return new (heap) DofMgr;
|
||||||
case JobType::Chemical:
|
case JobType::Chemical:
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
#include "KingSystem/World/worldChemicalMgr.h"
|
#include "KingSystem/World/worldChemicalMgr.h"
|
||||||
#include "KingSystem/World/worldCloudMgr.h"
|
#include "KingSystem/World/worldCloudMgr.h"
|
||||||
#include "KingSystem/World/worldDofMgr.h"
|
#include "KingSystem/World/worldDofMgr.h"
|
||||||
|
#include "KingSystem/World/worldEnvMgr.h"
|
||||||
#include "KingSystem/World/worldShootingStarMgrEx.h"
|
#include "KingSystem/World/worldShootingStarMgrEx.h"
|
||||||
#include "KingSystem/World/worldSkyMgr.h"
|
|
||||||
#include "KingSystem/World/worldTempMgr.h"
|
#include "KingSystem/World/worldTempMgr.h"
|
||||||
#include "KingSystem/World/worldTimeMgr.h"
|
#include "KingSystem/World/worldTimeMgr.h"
|
||||||
#include "KingSystem/World/worldWeatherMgr.h"
|
#include "KingSystem/World/worldWeatherMgr.h"
|
||||||
|
@ -268,7 +268,7 @@ public:
|
||||||
WeatherMgr* getWeatherMgr() const { return static_cast<WeatherMgr*>(mMgrs[3]); }
|
WeatherMgr* getWeatherMgr() const { return static_cast<WeatherMgr*>(mMgrs[3]); }
|
||||||
TempMgr* getTempMgr() const { return static_cast<TempMgr*>(mMgrs[4]); }
|
TempMgr* getTempMgr() const { return static_cast<TempMgr*>(mMgrs[4]); }
|
||||||
WindMgr* getWindMgr() const { return static_cast<WindMgr*>(mMgrs[5]); }
|
WindMgr* getWindMgr() const { return static_cast<WindMgr*>(mMgrs[5]); }
|
||||||
SkyMgr* getSkyMgr() const { return static_cast<SkyMgr*>(mMgrs[6]); }
|
EnvMgr* getSkyMgr() const { return static_cast<EnvMgr*>(mMgrs[6]); }
|
||||||
DofMgr* getDofMgr() const { return static_cast<DofMgr*>(mMgrs[7]); }
|
DofMgr* getDofMgr() const { return static_cast<DofMgr*>(mMgrs[7]); }
|
||||||
ChemicalMgr* getChemicalMgr() const { return static_cast<ChemicalMgr*>(mMgrs[8]); }
|
ChemicalMgr* getChemicalMgr() const { return static_cast<ChemicalMgr*>(mMgrs[8]); }
|
||||||
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
#include "KingSystem/World/worldSkyMgr.h"
|
|
Loading…
Reference in New Issue