This commit is contained in:
MihailRis
2024-05-19 08:40:43 +03:00
parent c5f663b7cb
commit 47c6e35a0b
6 changed files with 54 additions and 48 deletions
+1 -1
View File
@@ -66,7 +66,7 @@ std::unique_ptr<Content> ContentBuilder::build() {
if (def.rotatable) {
for (uint i = 0; i < BlockRotProfile::MAX_COUNT; i++) {
def.rt.hitboxes[i].reserve(def.hitboxes.size());
for (AABB& aabb : def.hitboxes) {
for (AABB aabb : def.hitboxes) {
def.rotations.variants[i].transform(aabb);
def.rt.hitboxes[i].push_back(aabb);
}
+3 -1
View File
@@ -353,7 +353,9 @@ void ContentLoader::load(ContentBuilder& builder) {
std::string full = colon == std::string::npos ? pack->id + ":" + name : name;
if (colon != std::string::npos) name[colon] = '/';
auto& def = builder.createBlock(full);
if (colon != std::string::npos) def.scriptName = name.substr(0, colon) + '/' + def.scriptName;
if (colon != std::string::npos) {
def.scriptName = name.substr(0, colon) + '/' + def.scriptName;
}
loadBlock(def, full, name);
stats.totalBlocks++;
if (!def.hidden) {