Skip to content

QtFRED Trim The Fat #7457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MjnMixael wants to merge 1 commit into
base: master
Choose a base branch
from
Open

QtFRED Trim The Fat #7457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/object/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#define OBJ_DEBRIS 6 //a flying piece of ship debris
//#define OBJ_CMEASURE 7 //a countermeasure, such as chaff
#define OBJ_GHOST 8 //so far, just a placeholder for when a player dies.
#define OBJ_POINT 9 //generic object type to display a point in Fred.
#define OBJ_POINT 9 // FRED2 briefing icons only; not used by QtFRED. Deprecate with FRED2.
#define OBJ_SHOCKWAVE 10 // a shockwave
#define OBJ_WING 11 // not really a type used anywhere, but I need it for Fred.
#define OBJ_OBSERVER 12 // used for multiplayer observers (possibly single player later)
Expand Down
174 changes: 3 additions & 171 deletions qtfred/src/mission/Editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@

#include <SDL.h>
#include <ai/ai.h>
#include <sound/audiostr.h>
#include <parse/parselo.h>
#include <missionui/fictionviewer.h>
#include <mission/missiongoals.h>
#include <mission/missionparse.h>
#include <asteroid/asteroid.h>
Expand Down Expand Up @@ -490,11 +488,6 @@ bool Editor::loadMission(const std::string& mission_name, int flags) {
return true;
}
void Editor::clean_up_selections() {
#if 0
if (Briefing_dialog)
Briefing_dialog->icon_select(-1);
#endif

unmark_all();
}
void Editor::unmark_all() {
Expand Down Expand Up @@ -556,11 +549,6 @@ void Editor::unmarkObject(int obj) {
void Editor::clearMission(bool fast_reload) {
// clean up everything we need to before we reset back to defaults.
clean_up_selections();
#if 0
if (Briefing_dialog){
Briefing_dialog->reset_editor();
}
#endif

allocate_parse_text(PARSE_TEXT_SIZE);

Expand Down Expand Up @@ -671,14 +659,6 @@ void Editor::setupCurrentObjectIndices(int selectedObj) {
if ((Objects[selectedObj].type == OBJ_SHIP) || (Objects[selectedObj].type == OBJ_START)) {
cur_ship = Objects[selectedObj].instance;
cur_wing = Ships[cur_ship].wingnum;
if (cur_wing >= 0) {
for (auto i = 0; i < Wings[cur_wing].wave_count; i++) {
if (wing_objects[cur_wing][i] == currentObject) {
cur_wing_index = i;
break;
}
}
}
} else if (Objects[selectedObj].type == OBJ_WAYPOINT) {
cur_waypoint = find_waypoint_with_instance(Objects[selectedObj].instance);
Assert(cur_waypoint != nullptr);
Expand Down Expand Up @@ -720,12 +700,6 @@ void Editor::setupCurrentObjectIndices(int selectedObj) {
if (ptr->type == OBJ_SHIP) {
cur_ship = ptr->instance;
cur_wing = Ships[cur_ship].wingnum;
for (auto i = 0; i < Wings[cur_wing].wave_count; i++) {
if (wing_objects[cur_wing][i] == currentObject) {
cur_wing_index = i;
break;
}
}
} else if (ptr->type == OBJ_WAYPOINT) {
cur_waypoint = find_waypoint_with_instance(ptr->instance);
Assert(cur_waypoint != nullptr);
Expand Down Expand Up @@ -1185,16 +1159,6 @@ int Editor::common_object_delete(int obj) {
ai_do_objects_undocked_stuff(&Objects[obj], dock_get_first_docked_object(&Objects[obj]));
}

} else if (type == OBJ_POINT) {
/*
TODO: Implement briefing dialog

Assert(Briefing_dialog);
Briefing_dialog->delete_icon(Objects[obj].instance);
Update_window = 1;
*/
return 0;

} else if (type == OBJ_JUMP_NODE) {
for (jnp = Jump_nodes.begin(); jnp != Jump_nodes.end(); ++jnp) {
if (jnp->GetSCPObject() == &Objects[obj]) {
Expand Down Expand Up @@ -1320,7 +1284,6 @@ int Editor::reference_handler(const char* name, sexp_ref_type type, int obj) {
Warning(LOCATION, "\"%s\" referenced by an unknown sexp source! "
"Run for the hills and let Hoffoss know right now!", name);

delete_flag = 1;
return 2;
}

Expand All @@ -1338,7 +1301,6 @@ int Editor::reference_handler(const char* name, sexp_ref_type type, int obj) {
}

if (r == 2) {
delete_flag = 1;
return 2;
}
}
Expand Down Expand Up @@ -1376,7 +1338,6 @@ int Editor::reference_handler(const char* name, sexp_ref_type type, int obj) {
}

if (r == 2) {
delete_flag = 1;
return 2;
}
}
Expand Down Expand Up @@ -1424,40 +1385,6 @@ int Editor::orders_reference_handler(sexp_src /*source*/, int /*source_index*/,
return 0;
}

// TODO: add a generic dialog system for showing these dialogs
/*
ShipGoalsDlg dlg_goals;

switch (source) {
case sexp_src::SHIP_ORDER:
unmark_all();
mark_object(Ships[source_index].objnum);

dlg_goals.self_ship = source_index;
dlg_goals.DoModal();
if (!query_initial_orders_empty(Ai_info[Ships[source_index].ai_index].goals))
if ((Ships[source_index].wingnum >= 0) && (query_initial_orders_conflict(Ships[source_index].wingnum)))
Fred_main_wnd->MessageBox("This ship's wing also has initial orders", "Possible conflict");

break;

case sexp_src::WING_ORDER:
unmark_all();
mark_wing(source_index);

dlg_goals.self_wing = source_index;
dlg_goals.DoModal();
if (query_initial_orders_conflict(source_index))
Fred_main_wnd->MessageBox("One or more ships of this wing also has initial orders", "Possible conflict");

break;

default: // very bad. Someone added an sexp somewhere and didn't change this.
Error(LOCATION, "Unknown initial order reference source");
}
*/

delete_flag = 1;
return 2;
}
int Editor::sexp_reference_handler(int /*node*/, sexp_src /*source*/, int /*source_index*/, const char* msg) {
Expand All @@ -1475,89 +1402,6 @@ int Editor::sexp_reference_handler(int /*node*/, sexp_src /*source*/, int /*sou
return 0;
}

// TODO: add a generic dialog system for showing these dialogs
/*
int n = source_index;
switch (source) {
case sexp_src::SHIP_ARRIVAL:
case sexp_src::SHIP_DEPARTURE:
if (!Ship_editor_dialog.GetSafeHwnd())
Ship_editor_dialog.Create();

Ship_editor_dialog.SetWindowPos(&Fred_main_wnd->wndTop, 0, 0, 0, 0,
SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
Ship_editor_dialog.ShowWindow(SW_RESTORE);

Ship_editor_dialog.select_sexp_node = node;
unmark_all();
mark_object(Ships[n].objnum);
break;

case sexp_src::WING_ARRIVAL:
case sexp_src::WING_DEPARTURE:
if (!Wing_editor_dialog.GetSafeHwnd())
Wing_editor_dialog.Create();

Wing_editor_dialog.SetWindowPos(&Fred_main_wnd->wndTop, 0, 0, 0, 0,
SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
Wing_editor_dialog.ShowWindow(SW_RESTORE);

Wing_editor_dialog.select_sexp_node = node;
unmark_all();
mark_wing(n);
break;

case sexp_src::EVENT:
if (Message_editor_dlg) {
Fred_main_wnd->MessageBox("You must close the message editor before the event editor can be opened");
break;
}

if (!Event_editor_dlg) {
Event_editor_dlg = new event_editor;
Event_editor_dlg->select_sexp_node = node;
Event_editor_dlg->Create(event_editor::IDD);
}

Event_editor_dlg->SetWindowPos(&CWnd::wndTop, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
Event_editor_dlg->ShowWindow(SW_RESTORE);
break;

case sexp_src::MISSION_GOAL: {
CMissionGoalsDlg dlg;

dlg.select_sexp_node = node;
dlg.DoModal();
break;
}

case sexp_src::DEBRIEFING: {
debriefing_editor_dlg dlg;

dlg.select_sexp_node = node;
dlg.DoModal();
break;
}

case sexp_src::BRIEFING: {
if (!Briefing_dialog) {
Briefing_dialog = new briefing_editor_dlg;
Briefing_dialog->create();
}

Briefing_dialog->SetWindowPos(&Briefing_dialog->wndTop, 0, 0, 0, 0,
SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE);
Briefing_dialog->ShowWindow(SW_RESTORE);
Briefing_dialog->focus_sexp(node);
break;
}

default: // very bad. Someone added an sexp somewhere and didn't change this.
Error(LOCATION, "Unknown sexp reference source");
}
*/

delete_flag = 1;
return 2;
}
int Editor::delete_ship_from_wing(int ship) {
Expand All @@ -1570,10 +1414,6 @@ int Editor::delete_ship_from_wing(int ship) {
cur_wing = -1;
r = delete_wing(wing, 1);
if (r) {
if (r == 2) {
delete_flag = 1;
}

return r;
}

Expand Down Expand Up @@ -1892,21 +1732,22 @@ void Editor::updateStartingWingLoadoutUseCounts() {
}
void Editor::delete_marked() {
object* ptr, * next;
bool navigated_to_reference = false;

delete_flag = 0;
ptr = GET_FIRST(&obj_used_list);
while (ptr != END_OF_LIST(&obj_used_list)) {
next = GET_NEXT(ptr);
if (ptr->flags[Object::Object_Flags::Marked]) {
if (delete_object(OBJ_INDEX(ptr)) == 2) { // user went to a reference, so don't get in the way.
navigated_to_reference = true;
break;
}
}

ptr = next;
}

if (!delete_flag) {
if (!navigated_to_reference) {
setupCurrentObjectIndices(-1);
}

Expand Down Expand Up @@ -2217,15 +2058,6 @@ void Editor::pad_with_newline(SCP_string& str, size_t max_size) {
}
}

void Editor::lcl_fred_replace_stuff(QString& text)
{
// this should be kept in sync with the function in localize.cpp
text.replace("\"", "$quote");
text.replace(";", "$semicolon");
text.replace("/", "$slash");
text.replace("\\", "$backslash");
}

SCP_string Editor::get_display_name_for_text_box(const SCP_string &orig_name)
{
auto index = get_index_of_first_hash_symbol(orig_name);
Expand Down
5 changes: 0 additions & 5 deletions qtfred/src/mission/Editor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@ class Editor : public QObject {
int cur_wing = -1;
int cur_ship = -1;

int cur_wing_index = -1;

waypoint* cur_waypoint = nullptr;
waypoint_list* cur_waypoint_list = nullptr;

Expand Down Expand Up @@ -273,7 +271,6 @@ class Editor : public QObject {

static void strip_quotation_marks(SCP_string& str);
static void pad_with_newline(SCP_string& str, size_t max_size);
static void lcl_fred_replace_stuff(QString& text);
static SCP_string get_display_name_for_text_box(const SCP_string &orig_name);

SCP_vector<int> getStartingWingLoadoutUseCounts();
Expand Down Expand Up @@ -303,8 +300,6 @@ class Editor : public QObject {
SCP_vector<GlobalShieldStatus> Shield_sys_teams;
SCP_vector<GlobalShieldStatus> Shield_sys_types;

int delete_flag;

bool already_deleting_wing = false;

// ship and weapon usage pools
Expand Down
19 changes: 2 additions & 17 deletions qtfred/src/mission/EditorViewport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ bool EditorViewport::incMissionTime() {
return true;
}
void EditorViewport::select_objects(const Marking_box& box) {
int x, y, valid, icon_mode = 0;
int x, y, valid;
vertex v;
object* ptr;

Expand Down Expand Up @@ -335,28 +335,13 @@ void EditorViewport::select_objects(const Marking_box& box) {
} else {
editor->markObject(OBJ_INDEX(ptr));
}

if (ptr->type == OBJ_POINT) {
icon_mode = 1;
}
}
}
}

ptr = GET_NEXT(ptr);
}

if (icon_mode) {
ptr = GET_FIRST(&obj_used_list);
while (ptr != END_OF_LIST(&obj_used_list)) {
if ((ptr->flags[Object::Object_Flags::Marked]) && (ptr->type != OBJ_POINT)) {
editor->unmarkObject(OBJ_INDEX(ptr));
}

ptr = GET_NEXT(ptr);
}
}

needsUpdate();
}

Expand Down Expand Up @@ -660,7 +645,7 @@ void EditorViewport::level_object(matrix* orient) {
int EditorViewport::object_check_collision(object* objp, vec3d* p0, vec3d* p1, vec3d* hitpos) {
mc_info mc;

if ((objp->type == OBJ_NONE) || (objp->type == OBJ_POINT)) {
if (objp->type == OBJ_NONE) {
return 0;
}

Expand Down
Loading
Loading