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

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Minecraft.World/Painting.cpp
View File

@@ -74,23 +74,34 @@ Painting::Painting(Level *level, int xTile, int yTile, int zTile, int dir) : Han
}
// 4J Stu - Added this so that we can use some shared_ptr functions that were needed in the ctor
void Painting::PaintingPostConstructor(int dir)
// 4J Stu - Added motive param for debugging/artists only
void Painting::PaintingPostConstructor(int dir, int motive)
{
vector<Motive *> *survivableMotives = new vector<Motive *>();
for (int i = 0 ; i < LAST_VALUE; i++)
#ifndef _CONTENT_PACKAGE
if (app.DebugArtToolsOn() && motive >= 0)
{
this->motive = (Motive *)Motive::values[i];
this->motive = (Motive *)Motive::values[motive];
setDir(dir);
if (survives())
{
survivableMotives->push_back(this->motive);
}
}
if (!survivableMotives->empty())
else
#endif
{
this->motive = survivableMotives->at(random->nextInt((int)survivableMotives->size()));
vector<Motive *> *survivableMotives = new vector<Motive *>();
for (int i = 0 ; i < LAST_VALUE; i++)
{
this->motive = (Motive *)Motive::values[i];
setDir(dir);
if (survives())
{
survivableMotives->push_back(this->motive);
}
}
if (!survivableMotives->empty())
{
this->motive = survivableMotives->at(random->nextInt((int)survivableMotives->size()));
}
setDir(dir);
}
setDir(dir);
}
Painting::Painting(Level *level, int x, int y, int z, int dir, wstring motiveName) : HangingEntity( level , x, y, z, dir )
@@ -142,7 +153,16 @@ int Painting::getHeight()
return motive->h;
}
void Painting::dropItem()
void Painting::dropItem(shared_ptr<Entity> causedBy)
{
if ( (causedBy != NULL) && causedBy->instanceof(eTYPE_PLAYER) )
{
shared_ptr<Player> player = dynamic_pointer_cast<Player>(causedBy);
if (player->abilities.instabuild)
{
return;
}
}
spawnAtLocation(shared_ptr<ItemInstance>(new ItemInstance(Item::painting)), 0.0f);
}