Merge pull request #6140 from Goober5000/small_fixes

several small fixes, mostly for FRED/qtFRED
scp-fs2open · May 13, 2024 · 393a9d4 · 393a9d4
2 parents 9b94655 + 499a5f4
commit 393a9d4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/code/ship/ship.cpp b/code/ship/ship.cpp
@@ -3778,7 +3778,7 @@ static void parse_ship_values(ship_info* sip, const bool is_template, const bool
 	parse_game_sound("$Shockwave Sound:", &sci->blast_sound_id);
 
 	if(optional_string("$Explosion Animations:")){
-		stuff_fireball_index_list(sip->explosion_bitmap_anims, sci->name);
+		stuff_fireball_index_list(sip->explosion_bitmap_anims, sip->name);
 	}
 
 	if (optional_string("$Weapon Model Draw Distance:")) {

diff --git a/fred2/fred.rc b/fred2/fred.rc
@@ -885,6 +885,9 @@ BEGIN
     LTEXT           "Max Respawns",IDC_STATIC,8,97,52,8
     EDITTEXT        IDC_RESPAWNS,86,94,50,14,ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Spin1",IDC_RESPAWN_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,136,94,11,14
+    LTEXT           "Max Respawn Delay",IDC_STATIC,7,113,78,12
+    EDITTEXT        IDC_MAX_RESPAWN_DELAY,86,112,50,14,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "",IDC_MAX_RESPAWN_DELAY_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,136,112,11,14
     PUSHBUTTON      "Custom Wing Names",IDC_CUSTOM_WING_NAMES,9,143,128,14
     GROUPBOX        "Squadron Reassign",IDC_STATIC,1,164,148,44
     LTEXT           "Name",IDC_STATIC,13,175,28,8
@@ -917,11 +920,14 @@ BEGIN
     COMBOBOX        IDC_COMMAND_SENDER,209,139,99,140,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Persona",IDC_STATIC,165,156,40,8
     COMBOBOX        IDC_COMMAND_PERSONA,209,155,99,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Override #Command in event messages",IDC_OVERRIDE_HASHCOMMAND,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,166,172,142,10
     GROUPBOX        "Mission Music",IDC_STATIC,157,192,154,47
     LTEXT           "Default",IDC_STATIC,161,204,40,8
     COMBOBOX        IDC_EVENT_MUSIC,207,203,99,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "If music pack is present",IDC_STATIC,161,217,43,16
     COMBOBOX        IDC_SUBSTITUTE_EVENT_MUSIC,207,219,99,140,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Sound Environment",IDC_SOUND_ENVIRONMENT_BUTTON,156,244,140,15
     GROUPBOX        "Flags",IDC_STATIC,321,20,158,198
     CONTROL         "All Teams at War",IDC_FULL_WAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,31,72,10
     CONTROL         "Red Alert Mission",IDC_RED_ALERT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,41,78,10
@@ -945,26 +951,20 @@ BEGIN
     CONTROL         "Toggle Starting in Chase View",IDC_TOGGLE_START_CHASE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,161,146,10
     CONTROL         "2D Mission",IDC_2D_MISSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,171,123,10
+    CONTROL         "Toggle Showing Goals In Briefing",IDC_TOGGLE_SHOWING_GOALS,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,181,142,10
+    CONTROL         "Mission End to Mainhall",IDC_END_TO_MAINHALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,191,142,10
+    CONTROL         "Preload Subspace Tunnel",IDC_PRELOAD_SUBSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,201,142,10
     LTEXT           "AI Profile",IDC_STATIC,320,229,32,8
     COMBOBOX        IDC_AI_PROFILE,378,226,93,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Custom Data",IDC_OPEN_CUSTOM_DATA,318,244,71,15
+    PUSHBUTTON      "Custom Strings",IDC_OPEN_CUSTOM_STRINGS,400,244,71,15
     LTEXT           "Mission Description",IDC_STATIC,4,260,62,8
     EDITTEXT        IDC_MISSION_DESC,4,272,471,29,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN
     RTEXT           "Designer Notes",IDC_STATIC,2,306,50,8
     EDITTEXT        IDC_MISSION_NOTES,3,316,472,29,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN
     DEFPUSHBUTTON   "OK",IDOK,368,0,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,424,0,50,14
-    LTEXT           "Max Respawn Delay",IDC_STATIC,7,113,78,12
-    EDITTEXT        IDC_MAX_RESPAWN_DELAY,86,112,50,14,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "",IDC_MAX_RESPAWN_DELAY_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,136,112,11,14
-    PUSHBUTTON      "Sound Environment",IDC_SOUND_ENVIRONMENT_BUTTON,156,244,140,15
-    PUSHBUTTON      "Custom Data",IDC_OPEN_CUSTOM_DATA,318,244,71,15
-    CONTROL         "Toggle Showing Goals In Briefing",IDC_TOGGLE_SHOWING_GOALS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,181,142,10
-    CONTROL         "Mission End to Mainhall",IDC_END_TO_MAINHALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,191,142,10
-    CONTROL         "Preload Subspace Tunnel",IDC_PRELOAD_SUBSPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,326,201,142,10
-    CONTROL         "Override #Command in event messages",IDC_OVERRIDE_HASHCOMMAND,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,166,172,142,10
-    PUSHBUTTON      "Custom Strings",IDC_OPEN_CUSTOM_STRINGS,400,244,71,15
 END
 
 IDD_PREFERENCES DIALOG 0, 0, 333, 81

diff --git a/qtfred/src/ui/dialogs/MissionSpecDialog.cpp b/qtfred/src/ui/dialogs/MissionSpecDialog.cpp
@@ -82,6 +82,7 @@ MissionSpecDialog::MissionSpecDialog(FredView* parent, EditorViewport* viewport)
 	connect(ui->toggle2DMission, &QCheckBox::toggled, this, [this](bool param) {flagToggled(param, Mission::Mission_Flags::Mission_2d); });
 	connect(ui->toggleGoalsInBriefing, &QCheckBox::toggled, this, [this](bool param) {flagToggled(param, Mission::Mission_Flags::Toggle_showing_goals); });
 	connect(ui->toggleMissionEndToMainhall, &QCheckBox::toggled, this, [this](bool param) {flagToggled(param, Mission::Mission_Flags::End_to_mainhall); });
+	connect(ui->toggleOverrideHashCommand, &QCheckBox::toggled, this, [this](bool param) {flagToggled(param, Mission::Mission_Flags::Override_hashcommand); });
 	connect(ui->togglePreloadSubspace, &QCheckBox::toggled, this, [this](bool param) {flagToggled(param, Mission::Mission_Flags::Preload_subspace); });
 
 	// AI Profiles
@@ -247,6 +248,7 @@ void MissionSpecDialog::updateFlags() {
 	ui->toggleGoalsInBriefing->setChecked(flags[Mission::Mission_Flags::Toggle_showing_goals]);
 	ui->toggleHardcodedAutopilot->setChecked(flags[Mission::Mission_Flags::Deactivate_ap]);
 	ui->toggleMissionEndToMainhall->setChecked(flags[Mission::Mission_Flags::End_to_mainhall]);
+	ui->toggleOverrideHashCommand->setChecked(flags[Mission::Mission_Flags::Override_hashcommand]);
 	ui->toggleNoBriefing->setChecked(flags[Mission::Mission_Flags::No_briefing]);
 	ui->toggleNoTraitor->setChecked(flags[Mission::Mission_Flags::No_traitor]);
 	ui->togglePromotion->setChecked(flags[Mission::Mission_Flags::No_promotion]);

diff --git a/qtfred/ui/MissionSpecDialog.ui b/qtfred/ui/MissionSpecDialog.ui
@@ -650,6 +650,13 @@
         <item row="1" column="1">
          <widget class="QComboBox" name="personaComboBox"/>
         </item>
+        <item row="2" column="0" colspan="2">
+         <widget class="QCheckBox" name="toggleOverrideHashCommand">
+          <property name="text">
+           <string>Override #Command in event messages</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -949,6 +956,9 @@
           <property name="text">
            <string>Preload Subspace Tunnel</string>
           </property>
+          <attribute name="buttonGroup">
+           <string notr="true">m_flagGroup</string>
+          </attribute>
          </widget>
         </item>
        </layout>