Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-04-27 17:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing property path checks for new zones (#783)

Browse Source 
Co-authored-by: Jett <55758076+Jettford@users.noreply.github.com>
This commit is contained in:
Aaron Kimbrell 2022-10-24 00:54:21 -05:00 committed by GitHub
parent 366c3db7fe
commit 8d44f2f5da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dZoneManager/Zone.cpp
View File

@ -403,30 +403,42 @@ void Zone::LoadPath(std::ifstream& file) {
BinaryIO::BinaryRead(file, path.property.price); BinaryIO::BinaryRead(file, path.property.price);
BinaryIO::BinaryRead(file, path.property.rentalTime); BinaryIO::BinaryRead(file, path.property.rentalTime);
BinaryIO::BinaryRead(file, path.property.associatedZone); BinaryIO::BinaryRead(file, path.property.associatedZone);
uint8_t count1;
BinaryIO::BinaryRead(file, count1); if (path.pathVersion >= 5) {
for (uint8_t i = 0; i < count1; ++i) { uint8_t count1;
uint16_t character; BinaryIO::BinaryRead(file, count1);
BinaryIO::BinaryRead(file, character); for (uint8_t i = 0; i < count1; ++i) {
path.property.displayName.push_back(character); uint16_t character;
BinaryIO::BinaryRead(file, character);
path.property.displayName.push_back(character);
}
uint32_t count2;
BinaryIO::BinaryRead(file, count2);
for (uint8_t i = 0; i < count2; ++i) {
uint16_t character;
BinaryIO::BinaryRead(file, character);
path.property.displayDesc.push_back(character);
}
} }
uint32_t count2;
BinaryIO::BinaryRead(file, count2); if (path.pathVersion >= 6) {
for (uint8_t i = 0; i < count2; ++i) { int32_t unknown1;
uint16_t character; BinaryIO::BinaryRead(file, unknown1);
BinaryIO::BinaryRead(file, character); }
path.property.displayDesc.push_back(character);
if (path.pathVersion >= 7) {
BinaryIO::BinaryRead(file, path.property.cloneLimit);
BinaryIO::BinaryRead(file, path.property.repMultiplier);
BinaryIO::BinaryRead(file, path.property.rentalTimeUnit);
}
if (path.pathVersion >= 8) {
BinaryIO::BinaryRead(file, path.property.achievementRequired);
BinaryIO::BinaryRead(file, path.property.playerZoneCoords.x);
BinaryIO::BinaryRead(file, path.property.playerZoneCoords.y);
BinaryIO::BinaryRead(file, path.property.playerZoneCoords.z);
BinaryIO::BinaryRead(file, path.property.maxBuildHeight);
} }
int32_t unknown1;
BinaryIO::BinaryRead(file, unknown1);
BinaryIO::BinaryRead(file, path.property.cloneLimit);
BinaryIO::BinaryRead(file, path.property.repMultiplier);
BinaryIO::BinaryRead(file, path.property.rentalTimeUnit);
BinaryIO::BinaryRead(file, path.property.achievementRequired);
BinaryIO::BinaryRead(file, path.property.playerZoneCoords.x);
BinaryIO::BinaryRead(file, path.property.playerZoneCoords.y);
BinaryIO::BinaryRead(file, path.property.playerZoneCoords.z);
BinaryIO::BinaryRead(file, path.property.maxBuildHeight);
} else if (path.pathType == PathType::Camera) { } else if (path.pathType == PathType::Camera) {
uint8_t count; uint8_t count;
BinaryIO::BinaryRead(file, count); BinaryIO::BinaryRead(file, count);