ksys/world: Rename CloudMgr to SkyMgr

This commit is contained in:
Léo Lam 2021-05-09 17:50:22 +02:00
parent a92ca1d073
commit 5cb3c9d8b2
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
7 changed files with 12 additions and 12 deletions

View File

@ -1,8 +1,6 @@
target_sources(uking PRIVATE
worldChemicalMgr.cpp
worldChemicalMgr.h
worldCloudMgr.cpp
worldCloudMgr.h
worldDofMgr.cpp
worldDofMgr.h
worldEnvMgr.cpp
@ -15,6 +13,8 @@ target_sources(uking PRIVATE
worldShootingStarMgr.h
worldShootingStarMgrEx.cpp
worldShootingStarMgrEx.h
worldSkyMgr.cpp
worldSkyMgr.h
worldTempMgr.cpp
worldTempMgr.h
worldTimeMgr.cpp

View File

@ -1 +0,0 @@
#include "KingSystem/World/worldCloudMgr.h"

View File

@ -9,7 +9,7 @@ namespace ksys::world {
enum class JobType {
Time,
Cloud,
Sky,
ShootingStar,
Weather,
Temp,

View File

@ -323,8 +323,8 @@ static Job* makeJob(JobType type, sead::Heap* heap) {
switch (type) {
case JobType::Time:
return new (heap) TimeMgr;
case JobType::Cloud:
return new (heap) CloudMgr;
case JobType::Sky:
return new (heap) SkyMgr;
case JobType::ShootingStar:
return new (heap) ShootingStarMgrEx;
case JobType::Weather:

View File

@ -15,10 +15,10 @@
#include "KingSystem/System/StageInfo.h"
#include "KingSystem/Utils/Types.h"
#include "KingSystem/World/worldChemicalMgr.h"
#include "KingSystem/World/worldCloudMgr.h"
#include "KingSystem/World/worldDofMgr.h"
#include "KingSystem/World/worldEnvMgr.h"
#include "KingSystem/World/worldShootingStarMgrEx.h"
#include "KingSystem/World/worldSkyMgr.h"
#include "KingSystem/World/worldTempMgr.h"
#include "KingSystem/World/worldTimeMgr.h"
#include "KingSystem/World/worldWeatherMgr.h"
@ -263,7 +263,7 @@ public:
CalcType getCalcType() const { return mCalcType; }
TimeMgr* getTimeMgr() const { return static_cast<TimeMgr*>(mMgrs[0]); }
CloudMgr* getCloudMgr() const { return static_cast<CloudMgr*>(mMgrs[1]); }
SkyMgr* getCloudMgr() const { return static_cast<SkyMgr*>(mMgrs[1]); }
ShootingStarMgr* getShootingStarMgr() const { return static_cast<ShootingStarMgr*>(mMgrs[2]); }
WeatherMgr* getWeatherMgr() const { return static_cast<WeatherMgr*>(mMgrs[3]); }
TempMgr* getTempMgr() const { return static_cast<TempMgr*>(mMgrs[4]); }

View File

@ -0,0 +1 @@
#include "KingSystem/World/worldSkyMgr.h"

View File

@ -6,16 +6,16 @@
namespace ksys::world {
// TODO
class CloudMgr : public Job {
class SkyMgr : public Job {
public:
CloudMgr();
SkyMgr();
JobType getType() const override { return JobType::Cloud; }
JobType getType() const override { return JobType::Sky; }
void onTimeUpdate();
u8 _20[0x3fb8 - 0x20];
};
KSYS_CHECK_SIZE_NX150(CloudMgr, 0x3fb8);
KSYS_CHECK_SIZE_NX150(SkyMgr, 0x3fb8);
} // namespace ksys::world