From b2604c9cf7a833d7c7fbd1eff19c53b55565beaa Mon Sep 17 00:00:00 2001 From: inspectredc Date: Thu, 28 Mar 2024 19:32:15 +0000 Subject: [PATCH] use same order as commands for latest torch --- src/port/game/GeoLayoutParser.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/port/game/GeoLayoutParser.cpp b/src/port/game/GeoLayoutParser.cpp index b6809f41..aa2b0226 100644 --- a/src/port/game/GeoLayoutParser.cpp +++ b/src/port/game/GeoLayoutParser.cpp @@ -232,11 +232,12 @@ void process_cmd_node_camera() { Vec3f pos, focus; + const auto type = GeoLayoutParser::mReader->ReadUInt16(); + ReadVec3f(pos); ReadVec3f(focus); const auto addr = GeoLayoutParser::mReader->ReadUInt32(); - const auto type = GeoLayoutParser::mReader->ReadUInt16(); GraphNodeCamera* graphNode = init_graph_node_camera(gGraphNodePool, nullptr, pos, focus, GetFunctionByAddr(addr), type); @@ -350,10 +351,11 @@ void process_cmd_nop2() {} void process_cmd_node_animated_part() { Vec3s translation; const auto drawingLayer = GeoLayoutParser::mReader->ReadUByte(); - void* displayList = ResourceGetDataByCrc(GeoLayoutParser::mReader->ReadUInt64()); ReadVec3s(translation); + void* displayList = ResourceGetDataByCrc(GeoLayoutParser::mReader->ReadUInt64()); + GraphNodeAnimatedPart* graphNode = init_graph_node_animated_part(gGraphNodePool, nullptr, drawingLayer, displayList, translation);