mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-05-27 22:04:39 +00:00
fix: unglob all of /Build/Common
This commit is contained in:
@@ -294,7 +294,7 @@ void CScene_DebugOverlay::SetSpawnToPlayerPos()
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
void CScene_DebugOverlay::SaveLimitedFile(int chunkRadius)
|
||||
{
|
||||
unordered_map<File, RegionFile *, FileKeyHash, FileKeyEq> newFileCache;
|
||||
std::unordered_map<File, RegionFile *, FileKeyHash, FileKeyEq> newFileCache;
|
||||
|
||||
Minecraft *pMinecraft = Minecraft::GetInstance();
|
||||
|
||||
@@ -305,7 +305,7 @@ void CScene_DebugOverlay::SaveLimitedFile(int chunkRadius)
|
||||
|
||||
// TODO Make this only happen for the new save
|
||||
//SetSpawnToPlayerPos();
|
||||
FileEntry *origFileEntry = currentSave->createFile( wstring( L"level.dat" ) );
|
||||
FileEntry *origFileEntry = currentSave->createFile( std::wstring( L"level.dat" ) );
|
||||
byteArray levelData( origFileEntry->getFileSize() );
|
||||
DWORD bytesRead;
|
||||
currentSave->setFilePointer(origFileEntry,0,NULL,FILE_BEGIN);
|
||||
@@ -316,7 +316,7 @@ void CScene_DebugOverlay::SaveLimitedFile(int chunkRadius)
|
||||
&bytesRead // number of bytes read
|
||||
);
|
||||
|
||||
FileEntry *newFileEntry = newSave.createFile( wstring( L"level.dat" ) );
|
||||
FileEntry *newFileEntry = newSave.createFile( std::wstring( L"level.dat" ) );
|
||||
DWORD bytesWritten;
|
||||
newSave.writeFile( newFileEntry,
|
||||
levelData.data, // data buffer
|
||||
@@ -363,9 +363,9 @@ void CScene_DebugOverlay::SaveLimitedFile(int chunkRadius)
|
||||
}
|
||||
#endif
|
||||
|
||||
RegionFile *CScene_DebugOverlay::getRegionFile(unordered_map<File, RegionFile *, FileKeyHash, FileKeyEq> &newFileCache, ConsoleSaveFile *saveFile, const wstring &prefix, int chunkX, int chunkZ) // 4J - TODO was synchronized
|
||||
RegionFile *CScene_DebugOverlay::getRegionFile(std::unordered_map<File, RegionFile *, FileKeyHash, FileKeyEq> &newFileCache, ConsoleSaveFile *saveFile, const std::wstring &prefix, int chunkX, int chunkZ) // 4J - TODO was synchronized
|
||||
{
|
||||
File file( prefix + wstring(L"r.") + _toString(chunkX>>5) + L"." + _toString(chunkZ>>5) + L".mcr" );
|
||||
File file( prefix + std::wstring(L"r.") + _toString(chunkX>>5) + L"." + _toString(chunkZ>>5) + L".mcr" );
|
||||
|
||||
RegionFile *ref = NULL;
|
||||
AUTO_VAR(it, newFileCache.find(file));
|
||||
@@ -383,7 +383,7 @@ RegionFile *CScene_DebugOverlay::getRegionFile(unordered_map<File, RegionFile *,
|
||||
return reg;
|
||||
}
|
||||
|
||||
DataOutputStream *CScene_DebugOverlay::getChunkDataOutputStream(unordered_map<File, RegionFile *, FileKeyHash, FileKeyEq> &newFileCache, ConsoleSaveFile *saveFile, const wstring &prefix, int chunkX, int chunkZ)
|
||||
DataOutputStream *CScene_DebugOverlay::getChunkDataOutputStream(std::unordered_map<File, RegionFile *, FileKeyHash, FileKeyEq> &newFileCache, ConsoleSaveFile *saveFile, const std::wstring &prefix, int chunkX, int chunkZ)
|
||||
{
|
||||
RegionFile *r = getRegionFile(newFileCache, saveFile, prefix, chunkX, chunkZ);
|
||||
return r->getChunkDataOutputStream(chunkX & 31, chunkZ & 31);
|
||||
|
||||
Reference in New Issue
Block a user