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

9
Minecraft.World/Villages.cpp
View File

@@ -64,14 +64,12 @@ void Villages::tick()
void Villages::removeVillages()
{
//for (Iterator<Village> it = villages.iterator(); it.hasNext();)
for(AUTO_VAR(it, villages.begin()); it != villages.end(); )
{
shared_ptr<Village> village = *it; //it.next();
shared_ptr<Village> village = *it;
if (village->canRemove())
{
it = villages.erase(it);
//it.remove();
setDirty();
}
else
@@ -90,7 +88,6 @@ shared_ptr<Village> Villages::getClosestVillage(int x, int y, int z, int maxDist
{
shared_ptr<Village> closest = nullptr;
float closestDistSqr = Float::MAX_VALUE;
//for (Village village : villages)
for(AUTO_VAR(it, villages.begin()); it != villages.end(); ++it)
{
shared_ptr<Village> village = *it;
@@ -118,13 +115,11 @@ void Villages::processNextQuery()
void Villages::cluster()
{
// note doesn't merge or split existing villages
//for (int i = 0; i < unclustered.size(); ++i)
for(AUTO_VAR(it, unclustered.begin()); it != unclustered.end(); ++it)
{
shared_ptr<DoorInfo> di = *it; //unclustered.get(i);
shared_ptr<DoorInfo> di = *it;
bool found = false;
//for (Village village : villages)
for(AUTO_VAR(itV, villages.begin()); itV != villages.end(); ++itV)
{
shared_ptr<Village> village = *itV;