Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-27 16:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Old level files not loading (#1656)

Browse Source 
* emmo help

* fix parsing live data

---------

Co-authored-by: Aaron Kimbre <aronwk.aaron@gmail.com>
This commit is contained in:
David Markowitz 2024-11-26 20:14:07 -08:00 committed by GitHub
parent 9e7ef8c4ee
commit c37a0c86c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dZoneManager/Level.cpp
View File

@ -131,12 +131,16 @@ void Level::ReadChunks(std::istream& file) {
if (initPos == std::streamoff(0)) { //Really old chunk version if (initPos == std::streamoff(0)) { //Really old chunk version
file.seekg(0); file.seekg(0);
Header header; Header header;
header.id = ChunkTypeID::FileInfo; //I guess? header.id = ChunkTypeID::FileInfo;
BinaryIO::BinaryRead(file, header.chunkVersion); BinaryIO::BinaryRead(file, header.chunkVersion);
BinaryIO::BinaryRead(file, header.chunkType); BinaryIO::BinaryRead(file, header.chunkType);
file.ignore(1); uint8_t important = 0;
BinaryIO::BinaryRead(file, important);
// file.ignore(1); //probably used
if (header.chunkVersion > 36) {
BinaryIO::BinaryRead(file, header.fileInfo.revision); BinaryIO::BinaryRead(file, header.fileInfo.revision);
}
// HARDCODED 3
if (header.chunkVersion >= 45) file.ignore(4); if (header.chunkVersion >= 45) file.ignore(4);
file.ignore(4 * (4 * 3)); file.ignore(4 * (4 * 3));
@ -170,25 +174,32 @@ void Level::ReadChunks(std::istream& file) {
} }
} }
for (uint32_t i = 0; i < 6; ++i) { // skydome info
uint32_t count = 0;
BinaryIO::BinaryRead(file, count);
file.ignore(count);
if (header.chunkVersion >= 33) {
for (uint32_t i = 0; i < 5; ++i) {
uint32_t count = 0; uint32_t count = 0;
BinaryIO::BinaryRead(file, count); BinaryIO::BinaryRead(file, count);
file.ignore(count); file.ignore(count);
} }
}
// editor settings
if (!important && header.chunkVersion >= 37){
file.ignore(4); file.ignore(4);
uint32_t count = 0; uint32_t count = 0;
BinaryIO::BinaryRead(file, count); BinaryIO::BinaryRead(file, count);
file.ignore(count * 12); file.ignore(count * 12);
m_ChunkHeaders.insert(std::make_pair(header.id, header)); }
//Now pretend to be a normal file and read Objects chunk: header.id = ChunkTypeID::SceneObjectData;
Header hdr; header.fileInfo.version = header.chunkVersion;
hdr.id = ChunkTypeID::SceneObjectData; ReadSceneObjectDataChunk(file, header);
ReadSceneObjectDataChunk(file, hdr); m_ChunkHeaders.insert(std::make_pair(header.id, header));
m_ChunkHeaders.insert(std::make_pair(hdr.id, hdr));
} break; } break;
} }
} }
@ -224,8 +235,14 @@ void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
BinaryIO::BinaryRead(file, obj.id); BinaryIO::BinaryRead(file, obj.id);
BinaryIO::BinaryRead(file, obj.lot); BinaryIO::BinaryRead(file, obj.lot);
/*if (header.fileInfo->version >= 0x26)*/ BinaryIO::BinaryRead(file, obj.nodeType); if (header.fileInfo.version >= 38) {
/*if (header.fileInfo->version >= 0x20)*/ BinaryIO::BinaryRead(file, obj.glomId); uint32_t tmp = 1;
BinaryIO::BinaryRead(file, tmp);
if (tmp > -1 && tmp < 11) obj.nodeType = tmp;
}
if (header.fileInfo.version >= 32) {
BinaryIO::BinaryRead(file, obj.glomId);
}
BinaryIO::BinaryRead(file, obj.position); BinaryIO::BinaryRead(file, obj.position);
BinaryIO::BinaryRead(file, obj.rotation); BinaryIO::BinaryRead(file, obj.rotation);