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

4
Minecraft.World/CommonStats.cpp
View File

@@ -55,7 +55,7 @@ Stat *CommonStats::get_breedEntity(eINSTANCEOF mobType)
Stat *CommonStats::get_tamedEntity(eINSTANCEOF mobType)
{
if (mobType == eTYPE_OZELOT) return GenericStats::lionTamer();
if (mobType == eTYPE_OCELOT) return GenericStats::lionTamer();
else if (mobType == eTYPE_WOLF) return Stats::befriendsWolf;
else return NULL;
}
@@ -93,7 +93,7 @@ Stat *CommonStats::get_itemsCollected(int itemId, int itemAux)
// stor itemsBought(emerald) so I don't have to make yet another massive
// StatArray for Items Bought.
#if (defined _EXTENDED_ACHIEVEMENTS) && (!defined _XBOX_ONE)
if (itemId == Tile::cloth_Id) return Stats::rainbowCollection[itemAux];
if (itemId == Tile::wool_Id) return Stats::rainbowCollection[itemAux];
#endif
if (itemId != Item::emerald_Id) return Stats::itemsCollected[itemId];