Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -62,8 +62,8 @@ ZoneFile *ZonedChunkStorage::getZoneFile(int x, int z, bool create)
|
||||
|
||||
if ( !file.exists() )
|
||||
{
|
||||
if (!create) return nullptr;
|
||||
HANDLE ch = CreateFile(wstringtofilename(file.getPath()), GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
|
||||
if (!create) return NULL;
|
||||
HANDLE ch = CreateFile(wstringtofilename(file.getPath()), GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
||||
CloseHandle(ch);
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ ZoneFile *ZonedChunkStorage::getZoneFile(int x, int z, bool create)
|
||||
zoneFile->lastUse = tickCount;
|
||||
if (!zoneFile->containsSlot(slot))
|
||||
{
|
||||
if (!create) return nullptr;
|
||||
if (!create) return NULL;
|
||||
}
|
||||
return zoneFile;
|
||||
|
||||
@@ -85,14 +85,14 @@ ZoneFile *ZonedChunkStorage::getZoneFile(int x, int z, bool create)
|
||||
ZoneIo *ZonedChunkStorage::getBuffer(int x, int z, bool create)
|
||||
{
|
||||
ZoneFile *zoneFile = getZoneFile(x, z, create);
|
||||
if (zoneFile == nullptr) return nullptr;
|
||||
if (zoneFile == NULL) return NULL;
|
||||
return zoneFile->getZoneIo(getSlot(x, z));
|
||||
}
|
||||
|
||||
LevelChunk *ZonedChunkStorage::load(Level *level, int x, int z)
|
||||
{
|
||||
ZoneIo *zoneIo = getBuffer(x, z, false);
|
||||
if (zoneIo == nullptr) return nullptr;
|
||||
if (zoneIo == NULL) return NULL;
|
||||
|
||||
LevelChunk *lc = new LevelChunk(level, x, z);
|
||||
lc->unsaved = false;
|
||||
|
||||
Reference in New Issue
Block a user