move weather back to gfx & add world:client/environment.json file
This commit is contained in:
+1
-2
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user