Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.World/Painting.cpp
View File

@@ -54,7 +54,7 @@ const int Painting::Motive::MAX_MOTIVE_NAME_LENGTH = 13; //JAVA: "SkullAndRoses
// 4J - added for common ctor code
void Painting::_init( Level *level )
{
motive = nullptr;
motive = NULL;
};
Painting::Painting(Level *level) : HangingEntity( level )
@@ -98,7 +98,7 @@ void Painting::PaintingPostConstructor(int dir, int motive)
}
if (!survivableMotives->empty())
{
this->motive = survivableMotives->at(random->nextInt(static_cast<int>(survivableMotives->size())));
this->motive = survivableMotives->at(random->nextInt((int)survivableMotives->size()));
}
setDir(dir);
}
@@ -138,7 +138,7 @@ void Painting::readAdditionalSaveData(CompoundTag *tag)
this->motive = (Motive *)Motive::values[i];
}
}
if (this->motive == nullptr) motive = (Motive *)Motive::values[ Kebab ];
if (this->motive == NULL) motive = (Motive *)Motive::values[ Kebab ];
HangingEntity::readAdditionalSaveData(tag);
}
@@ -155,7 +155,7 @@ int Painting::getHeight()
void Painting::dropItem(shared_ptr<Entity> causedBy)
{
if ( (causedBy != nullptr) && causedBy->instanceof(eTYPE_PLAYER) )
if ( (causedBy != NULL) && causedBy->instanceof(eTYPE_PLAYER) )
{
shared_ptr<Player> player = dynamic_pointer_cast<Player>(causedBy);
if (player->abilities.instabuild)
@@ -164,5 +164,5 @@ void Painting::dropItem(shared_ptr<Entity> causedBy)
}
}
spawnAtLocation(std::make_shared<ItemInstance>(Item::painting), 0.0f);
spawnAtLocation(shared_ptr<ItemInstance>(new ItemInstance(Item::painting)), 0.0f);
}