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

35
Minecraft.World/DirectoryLevelStorage.cpp
View File

@@ -328,7 +328,7 @@ LevelData *DirectoryLevelStorage::prepareLevel()
}
m_bHasLoadedMapDataMappings = true;
}
}
// 4J Jev, removed try/catch
@@ -344,7 +344,7 @@ LevelData *DirectoryLevelStorage::prepareLevel()
return ret;
}
return NULL;
return NULL;
}
void DirectoryLevelStorage::saveLevelData(LevelData *levelData, vector<shared_ptr<Player> > *players)
@@ -428,18 +428,15 @@ void DirectoryLevelStorage::save(shared_ptr<Player> player)
}
}
// 4J Changed return val to bool to check if new player or loaded player
bool DirectoryLevelStorage::load(shared_ptr<Player> player)
// 4J Changed return val to bool to check if new player or loaded player
CompoundTag *DirectoryLevelStorage::load(shared_ptr<Player> player)
{
bool newPlayer = true;
CompoundTag *tag = loadPlayerDataTag( player->getXuid() );
if (tag != NULL)
{
newPlayer = false;
player->load(tag);
delete tag;
}
return newPlayer;
return tag;
}
CompoundTag *DirectoryLevelStorage::loadPlayerDataTag(PlayerUID xuid)
@@ -506,20 +503,20 @@ void DirectoryLevelStorage::clearOldPlayerFiles()
sort(playerFiles->begin(), playerFiles->end(), FileEntry::newestFirst );
for(unsigned int i = MAX_PLAYER_DATA_SAVES; i < playerFiles->size(); ++i )
{
{
FileEntry *file = playerFiles->at(i);
wstring xuidStr = replaceAll( replaceAll(file->data.filename,playerDir.getName(),L""),L".dat",L"");
#if defined(__PS3__) || defined(__ORBIS__) || defined(_DURANGO)
PlayerUID xuid(xuidStr);
PlayerUID xuid(xuidStr);
#else
PlayerUID xuid = _fromString<PlayerUID>(xuidStr);
PlayerUID xuid = _fromString<PlayerUID>(xuidStr);
#endif
deleteMapFilesForPlayer(xuid);
m_saveFile->deleteFile( playerFiles->at(i) );
}
deleteMapFilesForPlayer(xuid);
m_saveFile->deleteFile( playerFiles->at(i) );
}
}
delete playerFiles;
delete playerFiles;
}
}
@@ -704,10 +701,10 @@ void DirectoryLevelStorage::saveMapIdLookup()
);
#else
m_saveFile->writeFile( fileEntry,
&m_saveableMapDataMappings, // data buffer
sizeof(MapDataMappings), // number of bytes to write
&NumberOfBytesWritten // number of bytes written
);
&m_saveableMapDataMappings, // data buffer
sizeof(MapDataMappings), // number of bytes to write
&NumberOfBytesWritten // number of bytes written
);
assert( NumberOfBytesWritten == sizeof(MapDataMappings) );
#endif
}