Skip to content

Commit d344727

Browse files
committed
make qtfred use the new generalized missionsave
1 parent c33db75 commit d344727

File tree

12 files changed

+50
-6107
lines changed

12 files changed

+50
-6107
lines changed

qtfred/source_groups.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ add_file_folder("Source/Mission"
2929
src/mission/IDialogProvider.h
3030
src/mission/management.cpp
3131
src/mission/management.h
32-
src/mission/missionsave.cpp
33-
src/mission/missionsave.h
3432
src/mission/object.cpp
3533
src/mission/object.h
3634
src/mission/util.cpp

qtfred/src/mission/Editor.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#include <jumpnode/jumpnode.h>
1616
#include <util.h>
1717
#include <mission/missionmessage.h>
18+
#include <missioneditor/common.h>
19+
#include <missioneditor/missionsave.h>
1820
#include <gamesnd/eventmusic.h>
1921
#include <starfield/nebula.h>
2022
#include <object/objectdock.h>

qtfred/src/mission/Editor.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
#include <memory>
1616
#include <stdexcept>
1717

18-
#define MISSION_BACKUP_NAME "Backup"
19-
#define MISSION_BACKUP_DEPTH 9
20-
2118
namespace fso {
2219
namespace fred {
2320

qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "menuui/mainhallmenu.h"
55
#include "stats/scoring.h"
66
#include "mission/missiongoals.h"
7-
#include "mission/missionsave.h"
7+
#include "missioneditor/missionsave.h"
88

99
#include <QMessageBox>
1010
#include <QPlainTextDocumentLayout>
@@ -593,7 +593,16 @@ bool CampaignEditorDialogModel::_saveTo(QString file) const {
593593
Campaign.num_missions = i;
594594
}
595595

596-
CFred_mission_save save;
596+
Fred_mission_save save;
597+
// TODO FredView save format actions currently don't do anything
598+
// will need to wire this up when those are finalized
599+
/*if (Mission_save_format == FSO_FORMAT_RETAIL) {
600+
save.set_save_format(MissionFormat::RETAIL);
601+
} else if (Mission_save_format == FSO_FORMAT_COMPATIBILITY_MODE) {
602+
save.set_save_format(MissionFormat::COMPATIBILITY_MODE);
603+
} else {
604+
save.set_save_format(MissionFormat::STANDARD);
605+
}*/
597606
return !save.save_campaign_file(qPrintable(file.replace('/',DIR_SEPARATOR_CHAR)));
598607
}
599608

qtfred/src/mission/dialogs/WingEditorDialogModel.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "iff_defs/iff_defs.h"
55
#include "mission/missionhotkey.h"
66
#include "mission/missionparse.h"
7+
#include "missioneditor/common.h"
78
#include <QObject>
89
#include <QMessageBox>
910

@@ -348,7 +349,7 @@ std::vector<std::pair<int, std::string>> WingEditorDialogModel::getArrivalTarget
348349
char buf[NAME_LENGTH + 15];
349350
for (int restrict_to_players = 0; restrict_to_players < 2; ++restrict_to_players) {
350351
for (int iff = 0; iff < (int)::Iff_info.size(); ++iff) {
351-
stuff_special_arrival_anchor_name(buf, iff, restrict_to_players, 0);
352+
stuff_special_arrival_anchor_name(buf, iff, restrict_to_players, false);
352353
items.emplace_back(get_special_anchor(buf), buf);
353354
}
354355
}

0 commit comments

Comments
 (0)