Skip to content

Commit bf51f8e

Browse files
committed
fix load/save mismatch in missions
When `$Contrail Speed Threshold:` and `+Volumetric Nebula:` are used in a mission, builds since 23.1 would throw an error, since the fields were loaded in a different order than they were saved. It turned out that the save order was the correct order, so this fixes the load order.
1 parent f89cd69 commit bf51f8e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

code/mission/missionparse.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -804,15 +804,15 @@ void parse_mission_info(mission *pm, bool basic = false)
804804
stuff_float(&Neb2_fog_far_mult);
805805
}
806806

807-
if (optional_string("+Volumetric Nebula:")) {
808-
pm->volumetrics.emplace().parse_volumetric_nebula();
809-
}
810-
811807
// Goober5000 - ship contrail speed threshold
812808
if (optional_string("$Contrail Speed Threshold:")){
813809
stuff_int(&pm->contrail_threshold);
814810
}
815811

812+
if (optional_string("+Volumetric Nebula:")) {
813+
pm->volumetrics.emplace().parse_volumetric_nebula();
814+
}
815+
816816
// get the number of players if in a multiplayer mission
817817
if ( pm->game_type & MISSION_TYPE_MULTI ) {
818818
if ( optional_string("+Num Players:") ) {

0 commit comments

Comments
 (0)