Merge branch 'main' into blocks-metadata

This commit is contained in:
MihailRis
2024-09-19 14:51:47 +03:00
73 changed files with 1866 additions and 1730 deletions
+5 -5
View File
@@ -6,7 +6,7 @@
#include <vector>
#include "constants.hpp"
#include "data/dynamic.hpp"
#include "data/dv.hpp"
#include "typedefs.hpp"
#include "Content.hpp"
#include "files/world_regions_fwd.hpp"
@@ -64,10 +64,10 @@ public:
names.emplace_back("");
}
}
void setup(dynamic::List* list, const ContentUnitDefs<U>& defs) {
if (list) {
for (size_t i = 0; i < list->size(); i++) {
std::string name = list->str(i);
void setup(const dv::value& list, const ContentUnitDefs<U>& defs) {
if (list != nullptr) {
for (size_t i = 0; i < list.size(); i++) {
const std::string& name = list[i].asString();
if (auto def = defs.find(name)) {
set(i, name, def->rt.id);
} else {