Skip to content

Commit 02f7873

Browse files
MaleclypseMaleclypse
authored
Merge pull request #82004 from Procyonae/RemoveLegacyMissionHandling
Remove legacy mission handling
2 parents 353115f + 028ace5 commit 02f7873

File tree

3 files changed

+2
-279
lines changed

3 files changed

+2
-279
lines changed

‎src/mission.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,6 @@ struct mission_type {
236236
* Get the mission_type object of the given id. Returns null if the input is invalid!
237237
*/
238238
static const mission_type *get( const mission_type_id &id );
239-
/**
240-
* Converts the legacy int id to a string_id.
241-
*/
242-
static mission_type_id from_legacy( int old_id );
243239
/**
244240
* Returns a random id of a mission type that can be started at the defined origin
245241
* around tripoint p, see @ref mission_start.

‎src/missiondef.cpp‎

Lines changed: 0 additions & 269 deletions
Original file line numberDiff line numberDiff line change
@@ -13,180 +13,6 @@
1313
#include "item.h"
1414
#include "rng.h"
1515

16-
static const mission_type_id mission_MISSION_EXPLORE_SARCOPHAGUS( "MISSION_EXPLORE_SARCOPHAGUS" );
17-
static const mission_type_id
18-
mission_MISSION_FREE_MERCHANTS_EVAC_1( "MISSION_FREE_MERCHANTS_EVAC_1" );
19-
static const mission_type_id
20-
mission_MISSION_FREE_MERCHANTS_EVAC_2( "MISSION_FREE_MERCHANTS_EVAC_2" );
21-
static const mission_type_id
22-
mission_MISSION_FREE_MERCHANTS_EVAC_3( "MISSION_FREE_MERCHANTS_EVAC_3" );
23-
static const mission_type_id
24-
mission_MISSION_FREE_MERCHANTS_EVAC_4( "MISSION_FREE_MERCHANTS_EVAC_4" );
25-
static const mission_type_id mission_MISSION_GET_ANTIBIOTICS( "MISSION_GET_ANTIBIOTICS" );
26-
static const mission_type_id mission_MISSION_GET_BLACK_BOX( "MISSION_GET_BLACK_BOX" );
27-
static const mission_type_id
28-
mission_MISSION_GET_BLACK_BOX_TRANSCRIPT( "MISSION_GET_BLACK_BOX_TRANSCRIPT" );
29-
static const mission_type_id mission_MISSION_GET_DEPUTY_BADGE( "MISSION_GET_DEPUTY_BADGE" );
30-
static const mission_type_id mission_MISSION_GET_FLAG( "MISSION_GET_FLAG" );
31-
static const mission_type_id
32-
mission_MISSION_GET_RECORD_ACCOUNTING( "MISSION_GET_RECORD_ACCOUNTING" );
33-
static const mission_type_id mission_MISSION_GET_RECORD_PATIENT( "MISSION_GET_RECORD_PATIENT" );
34-
static const mission_type_id mission_MISSION_GET_RECORD_WEATHER( "MISSION_GET_RECORD_WEATHER" );
35-
static const mission_type_id mission_MISSION_GET_RELIC( "MISSION_GET_RELIC" );
36-
static const mission_type_id mission_MISSION_GET_SAFE_BOX( "MISSION_GET_SAFE_BOX" );
37-
static const mission_type_id mission_MISSION_GET_SOFTWARE( "MISSION_GET_SOFTWARE" );
38-
static const mission_type_id
39-
mission_MISSION_GET_ZOMBIE_BLOOD_ANAL( "MISSION_GET_ZOMBIE_BLOOD_ANAL" );
40-
static const mission_type_id mission_MISSION_INVESTIGATE_CULT( "MISSION_INVESTIGATE_CULT" );
41-
static const mission_type_id
42-
mission_MISSION_INVESTIGATE_PRISON_VISIONARY( "MISSION_INVESTIGATE_PRISON_VISIONARY" );
43-
static const mission_type_id mission_MISSION_JOIN_TRACKER( "MISSION_JOIN_TRACKER" );
44-
static const mission_type_id mission_MISSION_KILL_100_Z( "MISSION_KILL_100_Z" );
45-
static const mission_type_id mission_MISSION_KILL_HORDE_MASTER( "MISSION_KILL_HORDE_MASTER" );
46-
static const mission_type_id mission_MISSION_KILL_JABBERWOCK( "MISSION_KILL_JABBERWOCK" );
47-
static const mission_type_id mission_MISSION_KILL_NEMESIS( "MISSION_KILL_NEMESIS" );
48-
static const mission_type_id mission_MISSION_KILL_ZOMBIE_MOM( "MISSION_KILL_ZOMBIE_MOM" );
49-
static const mission_type_id mission_MISSION_NULL( "MISSION_NULL" );
50-
static const mission_type_id mission_MISSION_OLD_GUARD_NEC_1( "MISSION_OLD_GUARD_NEC_1" );
51-
static const mission_type_id mission_MISSION_OLD_GUARD_NEC_2( "MISSION_OLD_GUARD_NEC_2" );
52-
static const mission_type_id
53-
mission_MISSION_OLD_GUARD_NEC_COMMO_1( "MISSION_OLD_GUARD_NEC_COMMO_1" );
54-
static const mission_type_id
55-
mission_MISSION_OLD_GUARD_NEC_COMMO_2( "MISSION_OLD_GUARD_NEC_COMMO_2" );
56-
static const mission_type_id
57-
mission_MISSION_OLD_GUARD_NEC_COMMO_3( "MISSION_OLD_GUARD_NEC_COMMO_3" );
58-
static const mission_type_id
59-
mission_MISSION_OLD_GUARD_NEC_COMMO_4( "MISSION_OLD_GUARD_NEC_COMMO_4" );
60-
static const mission_type_id mission_MISSION_OLD_GUARD_REP_1( "MISSION_OLD_GUARD_REP_1" );
61-
static const mission_type_id mission_MISSION_OLD_GUARD_REP_2( "MISSION_OLD_GUARD_REP_2" );
62-
static const mission_type_id mission_MISSION_OLD_GUARD_REP_3( "MISSION_OLD_GUARD_REP_3" );
63-
static const mission_type_id mission_MISSION_OLD_GUARD_REP_4( "MISSION_OLD_GUARD_REP_4" );
64-
static const mission_type_id mission_MISSION_RANCH_BARTENDER_1( "MISSION_RANCH_BARTENDER_1" );
65-
static const mission_type_id mission_MISSION_RANCH_BARTENDER_2( "MISSION_RANCH_BARTENDER_2" );
66-
static const mission_type_id mission_MISSION_RANCH_BARTENDER_3( "MISSION_RANCH_BARTENDER_3" );
67-
static const mission_type_id mission_MISSION_RANCH_BARTENDER_4( "MISSION_RANCH_BARTENDER_4" );
68-
static const mission_type_id mission_MISSION_RANCH_BARTENDER_5( "MISSION_RANCH_BARTENDER_5" );
69-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_1( "MISSION_RANCH_FOREMAN_1" );
70-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_10( "MISSION_RANCH_FOREMAN_10" );
71-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_11( "MISSION_RANCH_FOREMAN_11" );
72-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_12( "MISSION_RANCH_FOREMAN_12" );
73-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_13( "MISSION_RANCH_FOREMAN_13" );
74-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_14( "MISSION_RANCH_FOREMAN_14" );
75-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_15( "MISSION_RANCH_FOREMAN_15" );
76-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_16( "MISSION_RANCH_FOREMAN_16" );
77-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_17( "MISSION_RANCH_FOREMAN_17" );
78-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_2( "MISSION_RANCH_FOREMAN_2" );
79-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_3( "MISSION_RANCH_FOREMAN_3" );
80-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_4( "MISSION_RANCH_FOREMAN_4" );
81-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_5( "MISSION_RANCH_FOREMAN_5" );
82-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_6( "MISSION_RANCH_FOREMAN_6" );
83-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_7( "MISSION_RANCH_FOREMAN_7" );
84-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_8( "MISSION_RANCH_FOREMAN_8" );
85-
static const mission_type_id mission_MISSION_RANCH_FOREMAN_9( "MISSION_RANCH_FOREMAN_9" );
86-
static const mission_type_id mission_MISSION_RANCH_NURSE_1( "MISSION_RANCH_NURSE_1" );
87-
static const mission_type_id mission_MISSION_RANCH_NURSE_10( "MISSION_RANCH_NURSE_10" );
88-
static const mission_type_id mission_MISSION_RANCH_NURSE_11( "MISSION_RANCH_NURSE_11" );
89-
static const mission_type_id mission_MISSION_RANCH_NURSE_2( "MISSION_RANCH_NURSE_2" );
90-
static const mission_type_id mission_MISSION_RANCH_NURSE_3( "MISSION_RANCH_NURSE_3" );
91-
static const mission_type_id mission_MISSION_RANCH_NURSE_4( "MISSION_RANCH_NURSE_4" );
92-
static const mission_type_id mission_MISSION_RANCH_NURSE_5( "MISSION_RANCH_NURSE_5" );
93-
static const mission_type_id mission_MISSION_RANCH_NURSE_6( "MISSION_RANCH_NURSE_6" );
94-
static const mission_type_id mission_MISSION_RANCH_NURSE_7( "MISSION_RANCH_NURSE_7" );
95-
static const mission_type_id mission_MISSION_RANCH_NURSE_8( "MISSION_RANCH_NURSE_8" );
96-
static const mission_type_id mission_MISSION_RANCH_NURSE_9( "MISSION_RANCH_NURSE_9" );
97-
static const mission_type_id mission_MISSION_RANCH_SCAVENGER_1( "MISSION_RANCH_SCAVENGER_1" );
98-
static const mission_type_id mission_MISSION_RANCH_SCAVENGER_2( "MISSION_RANCH_SCAVENGER_2" );
99-
static const mission_type_id mission_MISSION_RANCH_SCAVENGER_3( "MISSION_RANCH_SCAVENGER_3" );
100-
static const mission_type_id mission_MISSION_RANCH_SCAVENGER_4( "MISSION_RANCH_SCAVENGER_4" );
101-
static const mission_type_id mission_MISSION_REACH_FARM_HOUSE( "MISSION_REACH_FARM_HOUSE" );
102-
static const mission_type_id mission_MISSION_REACH_FEMA_CAMP( "MISSION_REACH_FEMA_CAMP" );
103-
static const mission_type_id mission_MISSION_REACH_SAFETY( "MISSION_REACH_SAFETY" );
104-
static const mission_type_id mission_MISSION_RECOVER_PRIEST_DIARY( "MISSION_RECOVER_PRIEST_DIARY" );
105-
static const mission_type_id mission_MISSION_RECRUIT_TRACKER( "MISSION_RECRUIT_TRACKER" );
106-
static const mission_type_id mission_MISSION_RESCUE_DOG( "MISSION_RESCUE_DOG" );
107-
108-
enum legacy_mission_type_id {
109-
MISSION_NULL,
110-
MISSION_GET_ANTIBIOTICS,
111-
MISSION_GET_SOFTWARE,
112-
MISSION_GET_ZOMBIE_BLOOD_ANAL,
113-
MISSION_RESCUE_DOG,
114-
MISSION_KILL_ZOMBIE_MOM,
115-
MISSION_REACH_SAFETY,
116-
MISSION_GET_FLAG, //patriot 1
117-
MISSION_GET_BLACK_BOX, //patriot 2
118-
MISSION_GET_BLACK_BOX_TRANSCRIPT, //patriot 3
119-
MISSION_EXPLORE_SARCOPHAGUS, //patriot 4
120-
MISSION_GET_RELIC, //martyr 1
121-
MISSION_RECOVER_PRIEST_DIARY, //martyr 2
122-
MISSION_INVESTIGATE_CULT, //martyr 3
123-
MISSION_INVESTIGATE_PRISON_VISIONARY, //martyr 4
124-
MISSION_GET_RECORD_WEATHER, //scientist 1
125-
MISSION_GET_RECORD_PATIENT, //humanitarian 1
126-
MISSION_REACH_FEMA_CAMP, //humanitarian 2
127-
MISSION_REACH_FARM_HOUSE, //humanitarian 3
128-
MISSION_GET_RECORD_ACCOUNTING, //vigilante 1
129-
MISSION_GET_SAFE_BOX, //vigilante 2
130-
MISSION_GET_DEPUTY_BADGE, //vigilante 3
131-
MISSION_KILL_JABBERWOCK, //demon slayer 1
132-
MISSION_KILL_100_Z, //demon slayer 2
133-
MISSION_KILL_HORDE_MASTER, //demon slayer 3
134-
MISSION_RECRUIT_TRACKER, //demon slayer 4
135-
MISSION_JOIN_TRACKER, //demon slayer 4b
136-
MISSION_FREE_MERCHANTS_EVAC_1, //Clear Back Bay
137-
MISSION_FREE_MERCHANTS_EVAC_2, //Kill Raiders
138-
MISSION_FREE_MERCHANTS_EVAC_4, //Acquire Plutonium Cells
139-
MISSION_OLD_GUARD_REP_1, //Bandit Pair
140-
MISSION_OLD_GUARD_REP_2, //Raider Informant
141-
MISSION_OLD_GUARD_REP_3, //Missing without a trace
142-
MISSION_OLD_GUARD_REP_4, //Raider Camp
143-
MISSION_OLD_GUARD_NEC_1, //Locate Commo team for Necropolis Commander
144-
MISSION_OLD_GUARD_NEC_2, //Cull Nightmares
145-
MISSION_OLD_GUARD_NEC_COMMO_1, //Build a radio repeater mod
146-
MISSION_OLD_GUARD_NEC_COMMO_2, //Disable external power connection
147-
MISSION_OLD_GUARD_NEC_COMMO_3, //Install repeater mod in local radio station
148-
MISSION_OLD_GUARD_NEC_COMMO_4, //Cyclical mission to install repeater mods
149-
MISSION_RANCH_FOREMAN_1, //Rebuild civilization one 2x4 at a time
150-
MISSION_RANCH_FOREMAN_2, //Beds need blankets to make
151-
MISSION_RANCH_FOREMAN_3, //You can never have enough nails!
152-
MISSION_RANCH_FOREMAN_4, //Need salt to trade for seed
153-
MISSION_RANCH_FOREMAN_5, //Need liquid fertilizer
154-
MISSION_RANCH_FOREMAN_6, //Need stone for well and fireplaces
155-
MISSION_RANCH_FOREMAN_7, //Need pipes to finish well and parts for lumberyard
156-
MISSION_RANCH_FOREMAN_8, //Need motors to finish sawmill
157-
MISSION_RANCH_FOREMAN_9, //Need bleach to sterilize for clinic
158-
MISSION_RANCH_FOREMAN_10, //Need first aid kits for clinic
159-
MISSION_RANCH_FOREMAN_11, //Need welders for chop-shop
160-
MISSION_RANCH_FOREMAN_12, //Need car batteries to power equipment
161-
MISSION_RANCH_FOREMAN_13, //Need pair of two-way radios for scavengers
162-
MISSION_RANCH_FOREMAN_14, //Need 5 backpacks for scavengers
163-
MISSION_RANCH_FOREMAN_15, //Need Homebrewer's Bible for Bar
164-
MISSION_RANCH_FOREMAN_16, //Need Sugar for Bar
165-
MISSION_RANCH_FOREMAN_17, //Need glass sheets for 1st greenhouse
166-
MISSION_RANCH_NURSE_1, //Need aspirin
167-
MISSION_RANCH_NURSE_2, //Need hotplates
168-
MISSION_RANCH_NURSE_3, //Need multivitamins
169-
MISSION_RANCH_NURSE_4, //Need charcoal water filters
170-
MISSION_RANCH_NURSE_5, //Need chemistry set
171-
MISSION_RANCH_NURSE_6, //Need filter masks
172-
MISSION_RANCH_NURSE_7, //Need rubber gloves
173-
MISSION_RANCH_NURSE_8, //Need X-Acto
174-
MISSION_RANCH_NURSE_9, //Need Guide to Advanced Emergency Care
175-
MISSION_RANCH_NURSE_10, //Need flu shot
176-
MISSION_RANCH_NURSE_11, //Need empty syringes
177-
MISSION_RANCH_SCAVENGER_1, //Need knife spears
178-
MISSION_RANCH_SCAVENGER_2, //Need wearable flashlights
179-
MISSION_RANCH_SCAVENGER_3, //Need leather body armor
180-
MISSION_RANCH_SCAVENGER_4, //Need Molotov cocktails
181-
MISSION_RANCH_BARTENDER_1, //Need Stills
182-
MISSION_RANCH_BARTENDER_2, //Need Yeast
183-
MISSION_RANCH_BARTENDER_3, //Need Sugar Beet Seeds
184-
MISSION_RANCH_BARTENDER_4, //Need Metal Tanks
185-
MISSION_RANCH_BARTENDER_5, //Need 55-Gallon Drums
186-
MISSION_FREE_MERCHANTS_EVAC_3, //Info from Commune
187-
NUM_MISSION_IDS
188-
};
189-
19016
static const std::map<std::string, std::function<void( mission * )>> mission_function_map = {{
19117
// Starts
19218
{ "standard", { } },
@@ -422,101 +248,6 @@ void mission_type::check_consistency()
422248
}
423249
}
424250

425-
mission_type_id mission_type::from_legacy( int old_id )
426-
{
427-
static const std::vector<mission_type_id> old_id_vec = {{
428-
mission_MISSION_NULL,
429-
mission_MISSION_GET_ANTIBIOTICS,
430-
mission_MISSION_GET_SOFTWARE,
431-
mission_MISSION_GET_ZOMBIE_BLOOD_ANAL,
432-
mission_MISSION_RESCUE_DOG,
433-
mission_MISSION_KILL_ZOMBIE_MOM,
434-
mission_MISSION_REACH_SAFETY,
435-
mission_MISSION_GET_FLAG,
436-
mission_MISSION_GET_BLACK_BOX,
437-
mission_MISSION_GET_BLACK_BOX_TRANSCRIPT,
438-
mission_MISSION_EXPLORE_SARCOPHAGUS,
439-
mission_MISSION_GET_RELIC,
440-
mission_MISSION_RECOVER_PRIEST_DIARY,
441-
mission_MISSION_INVESTIGATE_CULT,
442-
mission_MISSION_INVESTIGATE_PRISON_VISIONARY,
443-
mission_MISSION_GET_RECORD_WEATHER,
444-
mission_MISSION_GET_RECORD_PATIENT,
445-
mission_MISSION_REACH_FEMA_CAMP,
446-
mission_MISSION_REACH_FARM_HOUSE,
447-
mission_MISSION_GET_RECORD_ACCOUNTING,
448-
mission_MISSION_GET_SAFE_BOX,
449-
mission_MISSION_GET_DEPUTY_BADGE,
450-
mission_MISSION_KILL_JABBERWOCK,
451-
mission_MISSION_KILL_100_Z,
452-
mission_MISSION_KILL_HORDE_MASTER,
453-
mission_MISSION_KILL_NEMESIS,
454-
mission_MISSION_RECRUIT_TRACKER,
455-
mission_MISSION_JOIN_TRACKER,
456-
mission_MISSION_FREE_MERCHANTS_EVAC_1,
457-
mission_MISSION_FREE_MERCHANTS_EVAC_2,
458-
mission_MISSION_FREE_MERCHANTS_EVAC_4,
459-
mission_MISSION_OLD_GUARD_REP_1,
460-
mission_MISSION_OLD_GUARD_REP_2,
461-
mission_MISSION_OLD_GUARD_REP_3,
462-
mission_MISSION_OLD_GUARD_REP_4,
463-
mission_MISSION_OLD_GUARD_NEC_1,
464-
mission_MISSION_OLD_GUARD_NEC_2,
465-
mission_MISSION_OLD_GUARD_NEC_COMMO_1,
466-
mission_MISSION_OLD_GUARD_NEC_COMMO_2,
467-
mission_MISSION_OLD_GUARD_NEC_COMMO_3,
468-
mission_MISSION_OLD_GUARD_NEC_COMMO_4,
469-
mission_MISSION_RANCH_FOREMAN_1,
470-
mission_MISSION_RANCH_FOREMAN_2,
471-
mission_MISSION_RANCH_FOREMAN_3,
472-
mission_MISSION_RANCH_FOREMAN_4,
473-
mission_MISSION_RANCH_FOREMAN_5,
474-
mission_MISSION_RANCH_FOREMAN_6,
475-
mission_MISSION_RANCH_FOREMAN_7,
476-
mission_MISSION_RANCH_FOREMAN_8,
477-
mission_MISSION_RANCH_FOREMAN_9,
478-
mission_MISSION_RANCH_FOREMAN_10,
479-
mission_MISSION_RANCH_FOREMAN_11,
480-
mission_MISSION_RANCH_FOREMAN_12,
481-
mission_MISSION_RANCH_FOREMAN_13,
482-
mission_MISSION_RANCH_FOREMAN_14,
483-
mission_MISSION_RANCH_FOREMAN_15,
484-
mission_MISSION_RANCH_FOREMAN_16,
485-
mission_MISSION_RANCH_FOREMAN_17,
486-
mission_MISSION_RANCH_NURSE_1,
487-
mission_MISSION_RANCH_NURSE_2,
488-
mission_MISSION_RANCH_NURSE_3,
489-
mission_MISSION_RANCH_NURSE_4,
490-
mission_MISSION_RANCH_NURSE_5,
491-
mission_MISSION_RANCH_NURSE_6,
492-
mission_MISSION_RANCH_NURSE_7,
493-
mission_MISSION_RANCH_NURSE_8,
494-
mission_MISSION_RANCH_NURSE_9,
495-
mission_MISSION_RANCH_NURSE_10,
496-
mission_MISSION_RANCH_NURSE_11,
497-
mission_MISSION_RANCH_SCAVENGER_1,
498-
mission_MISSION_RANCH_SCAVENGER_2,
499-
mission_MISSION_RANCH_SCAVENGER_3,
500-
mission_MISSION_RANCH_SCAVENGER_4,
501-
mission_MISSION_RANCH_BARTENDER_1,
502-
mission_MISSION_RANCH_BARTENDER_2,
503-
mission_MISSION_RANCH_BARTENDER_3,
504-
mission_MISSION_RANCH_BARTENDER_4,
505-
mission_MISSION_RANCH_BARTENDER_5,
506-
mission_MISSION_FREE_MERCHANTS_EVAC_3,
507-
// This is to help with the bugged find book mission
508-
mission_MISSION_NULL
509-
}
510-
};
511-
512-
if( old_id >= 0 && old_id < static_cast<int>( old_id_vec.size() ) ) {
513-
return old_id_vec[ old_id ];
514-
}
515-
516-
debugmsg( "Invalid legacy mission id: %d", old_id );
517-
return mission_MISSION_NULL;
518-
}
519-
520251
const mission_type *mission_type::get( const mission_type_id &id )
521252
{
522253
if( id.is_null() ) {

‎src/savegame_json.cpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3655,9 +3655,7 @@ void mission::deserialize( const JsonObject &jo )
36553655
{
36563656
jo.allow_omitted_members();
36573657

3658-
if( jo.has_int( "type_id" ) ) {
3659-
type = &mission_type::from_legacy( jo.get_int( "type_id" ) ).obj();
3660-
} else if( jo.has_string( "type_id" ) ) {
3658+
if( jo.has_string( "type_id" ) ) {
36613659
type = &mission_type_id( jo.get_string( "type_id" ) ).obj();
36623660
} else {
36633661
debugmsg( "Saved mission has no type" );
@@ -3693,9 +3691,7 @@ void mission::deserialize( const JsonObject &jo )
36933691
target.y() = ja.get_int( 1 );
36943692
}
36953693

3696-
if( jo.has_int( "follow_up" ) ) {
3697-
follow_up = mission_type::from_legacy( jo.get_int( "follow_up" ) );
3698-
} else if( jo.has_string( "follow_up" ) ) {
3694+
if( jo.has_string( "follow_up" ) ) {
36993695
follow_up = mission_type_id( jo.get_string( "follow_up" ) );
37003696
}
37013697

0 commit comments

Comments
 (0)