summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-05-09 17:50:22 +0200
committerLéo Lam <leo@leolam.fr>2021-05-09 17:50:22 +0200
commit5cb3c9d8b2394df5ad02af1b4e6424fd3ded12cb (patch)
treee1063cc8de52a21fe7e2def06650cd0d258cce2b /src
parenta92ca1d07313f1569ddf2d14ed840e0909bb7511 (diff)
ksys/world: Rename CloudMgr to SkyMgr
Diffstat (limited to 'src')
-rw-r--r--src/KingSystem/World/CMakeLists.txt4
-rw-r--r--src/KingSystem/World/worldCloudMgr.cpp1
-rw-r--r--src/KingSystem/World/worldJob.h2
-rw-r--r--src/KingSystem/World/worldManager.cpp4
-rw-r--r--src/KingSystem/World/worldManager.h4
-rw-r--r--src/KingSystem/World/worldSkyMgr.cpp1
-rw-r--r--src/KingSystem/World/worldSkyMgr.h (renamed from src/KingSystem/World/worldCloudMgr.h)8
7 files changed, 12 insertions, 12 deletions
diff --git a/src/KingSystem/World/CMakeLists.txt b/src/KingSystem/World/CMakeLists.txt
index 6c85ccd8..66f9071c 100644
--- a/src/KingSystem/World/CMakeLists.txt
+++ b/src/KingSystem/World/CMakeLists.txt
@@ -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
diff --git a/src/KingSystem/World/worldCloudMgr.cpp b/src/KingSystem/World/worldCloudMgr.cpp
deleted file mode 100644
index 1b0a5f58..00000000
--- a/src/KingSystem/World/worldCloudMgr.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "KingSystem/World/worldCloudMgr.h"
diff --git a/src/KingSystem/World/worldJob.h b/src/KingSystem/World/worldJob.h
index 5e7df2d5..88624f48 100644
--- a/src/KingSystem/World/worldJob.h
+++ b/src/KingSystem/World/worldJob.h
@@ -9,7 +9,7 @@ namespace ksys::world {
enum class JobType {
Time,
- Cloud,
+ Sky,
ShootingStar,
Weather,
Temp,
diff --git a/src/KingSystem/World/worldManager.cpp b/src/KingSystem/World/worldManager.cpp
index 18b24c69..eb712229 100644
--- a/src/KingSystem/World/worldManager.cpp
+++ b/src/KingSystem/World/worldManager.cpp
@@ -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:
diff --git a/src/KingSystem/World/worldManager.h b/src/KingSystem/World/worldManager.h
index 4ce652af..81aff384 100644
--- a/src/KingSystem/World/worldManager.h
+++ b/src/KingSystem/World/worldManager.h
@@ -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]); }
diff --git a/src/KingSystem/World/worldSkyMgr.cpp b/src/KingSystem/World/worldSkyMgr.cpp
new file mode 100644
index 00000000..1c847003
--- /dev/null
+++ b/src/KingSystem/World/worldSkyMgr.cpp
@@ -0,0 +1 @@
+#include "KingSystem/World/worldSkyMgr.h"
diff --git a/src/KingSystem/World/worldCloudMgr.h b/src/KingSystem/World/worldSkyMgr.h
index 2249d546..b9de9bc0 100644
--- a/src/KingSystem/World/worldCloudMgr.h
+++ b/src/KingSystem/World/worldSkyMgr.h
@@ -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