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

Fix ninjago crashes (#837)

Browse Source 
Fixed reading speed from rail paths
Made the config of rail paths be read in sanely due to not having a type
Fixes #835
This commit is contained in:
Aaron Kimbrell 2022-11-14 13:57:49 -06:00 committed by GitHub
parent 37524af549
commit 3fa6ea4cea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dZoneManager/Zone.cpp
View File

@ -504,6 +504,8 @@ void Zone::LoadPath(std::istream& file) {
BinaryIO::BinaryRead(file, waypoint.racing.planeWidth); BinaryIO::BinaryRead(file, waypoint.racing.planeWidth);
BinaryIO::BinaryRead(file, waypoint.racing.planeHeight); BinaryIO::BinaryRead(file, waypoint.racing.planeHeight);
BinaryIO::BinaryRead(file, waypoint.racing.shortestDistanceToEnd); BinaryIO::BinaryRead(file, waypoint.racing.shortestDistanceToEnd);
} else if (path.pathType == PathType::Rail) {
if (path.pathVersion > 16) BinaryIO::BinaryRead(file, waypoint.rail.speed);
} }
// object LDF configs // object LDF configs
@ -529,7 +531,7 @@ void Zone::LoadPath(std::istream& file) {
} }
LDFBaseData* ldfConfig = nullptr; LDFBaseData* ldfConfig = nullptr;
if (path.pathType == PathType::Movement) { if (path.pathType == PathType::Movement || path.pathType == PathType::Rail) {
ldfConfig = LDFBaseData::DataFromString(parameter + "=0:" + value); ldfConfig = LDFBaseData::DataFromString(parameter + "=0:" + value);
} else { } else {
ldfConfig = LDFBaseData::DataFromString(parameter + "=" + value); ldfConfig = LDFBaseData::DataFromString(parameter + "=" + value);

1
dZoneManager/Zone.h
View File

@ -75,7 +75,6 @@ struct RacingPathWaypoint {
struct RailPathWaypoint { struct RailPathWaypoint {
float speed; float speed;
std::vector<LDFBaseData*> config;
}; };
struct PathWaypoint { struct PathWaypoint {