move weather back to gfx & add world:client/environment.json file

This commit is contained in:
MihailRis
2025-03-09 22:50:45 +03:00
parent 7a86cbdd60
commit db620010a3
11 changed files with 68 additions and 37 deletions
+1 -2
View File
@@ -208,7 +208,6 @@ void WorldInfo::deserialize(const dv::value& root) {
totalTime = timeobj["total-time"].asNumber();
}
if (root.has("weather")) {
weather.deserialize(root["weather"]);
fog = root["weather"]["fog"].asNumber();
}
nextInventoryId = root["next-inventory-id"].asInteger(2);
@@ -232,7 +231,7 @@ dv::value WorldInfo::serialize() const {
timeobj["day-time-speed"] = daytimeSpeed;
timeobj["total-time"] = totalTime;
root["weather"] = weather.serialize();
root["weather"] = dv::object();
root["weather"]["fog"] = fog;
root["next-inventory-id"] = nextInventoryId;
-3
View File
@@ -7,7 +7,6 @@
#include "content/ContentPack.hpp"
#include "interfaces/Serializable.hpp"
#include "io/fwd.hpp"
#include "Weather.hpp"
#include "typedefs.hpp"
#include "util/timeutil.hpp"
@@ -46,8 +45,6 @@ struct WorldInfo : public Serializable {
int major = 0, minor = -1;
Weather weather {};
dv::value serialize() const override;
void deserialize(const dv::value& src) override;
};