All Projects FSSCP  wxFRED

View Issue Details

Related ChangesetsJump to NotesJump to History
IDProjectCategoryView StatusDate SubmittedLast Update
0002841FSSCPFREDpublic2013-04-10 13:502013-04-28 22:24
ReporterMjnMixael Assigned ToCommanderDJ  
PrioritynormalSeverityminorReproducibilityalways
Status resolvedResolutionfixed 
PlatformPCOSWindowsOS VersionWin7
Product Version3.6.19 
Target Version3.7.0 
Summary0002841: Campaign Editor still only accepts integers for mainhalls
DescriptionIn the Campaign Editor in FRED, where you tell it which mainhall to load for each mission, it will only accept integers. That is how the old mainhall code designated mainhalls.

Under the new code, it's all done by string, so we need to be able to enter strings into the field and make sure they are saved properly by FRED.

Bonus points for increasing the size of the input field a bit too.
Additional InformationAttached a picture to show the field I'm talking about.
TagsNo tags attached.

Activities

MjnMixael

2013-04-10 13:50

manager  

ImageBin.jpg (43,587 bytes)   
ImageBin.jpg (43,587 bytes)   

CommanderDJ

2013-04-27 05:51

developer  

2841.patch (22,311 bytes)    
Index: code/fred2/fred.rc
===================================================================
--- code/fred2/fred.rc	(revision 9649)
+++ code/fred2/fred.rc	(working copy)
@@ -18,13 +18,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -116,7 +114,7 @@
 // Toolbar
 //
 
-IDR_MAINFRAME TOOLBAR  23, 23
+IDR_MAINFRAME TOOLBAR 23, 23
 BEGIN
     BUTTON      ID_SELECT
     BUTTON      ID_SELECT_AND_MOVE
@@ -152,7 +150,7 @@
 // Menu
 //
 
-IDR_MAINMENU MENU 
+IDR_MAINMENU MENU
 BEGIN
     POPUP "&File"
     BEGIN
@@ -335,7 +333,7 @@
     END
 END
 
-IDR_MENU_SHIP_POPUP MENU 
+IDR_MENU_SHIP_POPUP MENU
 BEGIN
     POPUP "Properties"
     BEGIN
@@ -345,7 +343,7 @@
     END
 END
 
-IDR_MENU_EDIT_POPUP MENU 
+IDR_MENU_EDIT_POPUP MENU
 BEGIN
     POPUP "EDIT"
     BEGIN
@@ -370,7 +368,7 @@
     END
 END
 
-IDR_MENU_CAMPAIGN MENU 
+IDR_MENU_CAMPAIGN MENU
 BEGIN
     POPUP "&File"
     BEGIN
@@ -392,7 +390,7 @@
     END
 END
 
-IDR_MENU_EDIT_SEXP_TREE MENU 
+IDR_MENU_EDIT_SEXP_TREE MENU
 BEGIN
     POPUP "Edit sexp tree"
     BEGIN
@@ -442,7 +440,7 @@
     END
 END
 
-IDR_WING_EDIT_MENU MENU 
+IDR_WING_EDIT_MENU MENU
 BEGIN
     POPUP "&Select Wing"
     BEGIN
@@ -450,7 +448,7 @@
     END
 END
 
-IDR_SHIP_EDIT_MENU MENU 
+IDR_SHIP_EDIT_MENU MENU
 BEGIN
     POPUP "&Select Ship"
     BEGIN
@@ -458,7 +456,7 @@
     END
 END
 
-IDR_PLAYER_EDIT_MENU MENU 
+IDR_PLAYER_EDIT_MENU MENU
 BEGIN
     POPUP "Select Team"
     BEGIN
@@ -471,7 +469,7 @@
     END
 END
 
-IDR_WAYPOINT_PATH_EDIT_MENU MENU 
+IDR_WAYPOINT_PATH_EDIT_MENU MENU
 BEGIN
     POPUP "&Select Waypoint Path"
     BEGIN
@@ -479,7 +477,7 @@
     END
 END
 
-IDR_ASTEROID_FIELD_MENU MENU 
+IDR_ASTEROID_FIELD_MENU MENU
 BEGIN
     POPUP "Select Field"
     BEGIN
@@ -487,7 +485,7 @@
     END
 END
 
-IDR_CPGN_VIEW_OFF MENU 
+IDR_CPGN_VIEW_OFF MENU
 BEGIN
     POPUP "Blah"
     BEGIN
@@ -496,7 +494,7 @@
     END
 END
 
-IDR_CPGN_VIEW_ON MENU 
+IDR_CPGN_VIEW_ON MENU
 BEGIN
     POPUP "Blah"
     BEGIN
@@ -512,7 +510,7 @@
 // Accelerator
 //
 
-IDR_MAINFRAME ACCELERATORS 
+IDR_MAINFRAME ACCELERATORS
 BEGIN
     "1",            ID_SPEED1,              VIRTKEY, NOINVERT
     "1",            ID_GROUP1,              VIRTKEY, CONTROL, NOINVERT
@@ -603,7 +601,7 @@
     "Z",            ID_ZOOM_EXTENTS,        VIRTKEY, SHIFT, NOINVERT
 END
 
-IDR_ACC_CAMPAIGN ACCELERATORS 
+IDR_ACC_CAMPAIGN ACCELERATORS
 BEGIN
     "H",            ID_ERROR_CHECKER,       VIRTKEY, ALT, NOINVERT
     "N",            ID_CPGN_FILE_NEW,       VIRTKEY, CONTROL, NOINVERT
@@ -618,7 +616,7 @@
 // Dialog
 //
 
-IDD_ABOUTBOX DIALOG  0, 0, 284, 89
+IDD_ABOUTBOX DIALOG 0, 0, 284, 89
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About FRED2"
 FONT 8, "MS Sans Serif"
@@ -699,7 +697,7 @@
     GROUPBOX        "Message Properties",IDC_STATIC,7,184,184,60
 END
 
-IDD_SHIP_GOALS_EDITOR DIALOG  0, 0, 412, 221
+IDD_SHIP_GOALS_EDITOR DIALOG 0, 0, 412, 221
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Initial Orders"
 FONT 8, "MS Sans Serif"
@@ -784,7 +782,7 @@
     LTEXT           "Warning : Orders with a priority above 89 may be higher priority than those given by the player.",IDC_STATIC,60,183,307,11
 END
 
-IDD_MISSION_NOTES DIALOG  0, 0, 479, 349
+IDD_MISSION_NOTES DIALOG 0, 0, 479, 349
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Mission Specs"
 FONT 8, "MS Sans Serif"
@@ -880,7 +878,7 @@
     PUSHBUTTON      "Sound Environment",IDC_SOUND_ENVIRONMENT_BUTTON,158,244,140,15
 END
 
-IDD_PREFERENCES DIALOG  0, 0, 333, 81
+IDD_PREFERENCES DIALOG 0, 0, 333, 81
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Preferences"
 FONT 8, "MS Sans Serif"
@@ -1015,7 +1013,7 @@
     LTEXT           "Missile bank 4",IDC_STATIC,232,64,46,8
 END
 
-IDD_SHIP_MARKINGS DIALOG  0, 0, 252, 140
+IDD_SHIP_MARKINGS DIALOG 0, 0, 252, 140
 STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION
 CAPTION "Ship Markings"
 FONT 8, "MS Sans Serif"
@@ -1148,7 +1146,7 @@
     PUSHBUTTON      "Restrict Departure Paths",IDC_RESTRICT_DEPARTURE,160,223,121,14,0,WS_EX_STATICEDGE
 END
 
-IDD_OPERATOR_ARGUMENT_TYPES DIALOG  0, 0, 235, 50
+IDD_OPERATOR_ARGUMENT_TYPES DIALOG 0, 0, 235, 50
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Select Argument Types"
 FONT 8, "MS Sans Serif"
@@ -1197,7 +1195,7 @@
     LTEXT           "Set Amount From Variable",IDC_STATIC,179,234,93,10
 END
 
-IDD_ORIENT_EDITOR DIALOG  0, 0, 229, 119
+IDD_ORIENT_EDITOR DIALOG 0, 0, 229, 119
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Object Orientation Editor"
 FONT 8, "MS Sans Serif"
@@ -1419,7 +1417,7 @@
     LTEXT           "Delay After Arrival",IDC_STATIC,7,99,57,8
 END
 
-IDD_REINFORCEMENT_SELECT DIALOG  0, 0, 156, 132
+IDD_REINFORCEMENT_SELECT DIALOG 0, 0, 156, 132
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Select Reinforcement Unit"
 FONT 8, "MS Sans Serif"
@@ -1429,7 +1427,7 @@
     PUSHBUTTON      "Cancel",IDCANCEL,99,111,50,14
 END
 
-IDD_WAYPOINT_PATH_EDITOR DIALOG  0, 0, 145, 29
+IDD_WAYPOINT_PATH_EDITOR DIALOG 0, 0, 145, 29
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Waypoint Path/Jump Node Editor"
 MENU IDR_WAYPOINT_PATH_EDIT_MENU
@@ -1439,7 +1437,7 @@
     EDITTEXT        IDC_NAME,32,7,106,14,ES_AUTOHSCROLL
 END
 
-IDD_WING_CREATE DIALOG  0, 0, 119, 68
+IDD_WING_CREATE DIALOG 0, 0, 119, 68
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Create Wing"
 FONT 8, "MS Sans Serif"
@@ -1490,7 +1488,7 @@
     LTEXT           "Team Color Setting:",IDC_STATIC,16,308,66,8
 END
 
-IDD_ASTEROID_EDITOR DIALOG  0, 0, 376, 210
+IDD_ASTEROID_EDITOR DIALOG 0, 0, 376, 210
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Debris Field Editor"
 FONT 8, "MS Sans Serif"
@@ -1556,9 +1554,9 @@
     CONTROL         "Reset tech db at start of campaign",IDC_CUSTOM_TECH_DB,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,106,151,122,9
     EDITTEXT        IDC_BRIEFING_CUTSCENE,73,175,66,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_MAIN_HALL,200,175,21,12,ES_NUMBER,WS_EX_RIGHT
+    EDITTEXT        IDC_MAIN_HALL,64,192,49,12,ES_AUTOHSCROLL
     EDITTEXT        IDC_DEBRIEFING_PERSONA,200,190,21,12,ES_NUMBER,WS_EX_RIGHT
-    CONTROL         "Tree1",IDC_SEXP_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,224,157,111,WS_EX_CLIENTEDGE
+    CONTROL         "Tree1",IDC_SEXP_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,224,157,111,WS_EX_CLIENTEDGE
     PUSHBUTTON      "Move Up",IDC_MOVE_UP,171,225,53,14,BS_CENTER,WS_EX_STATICEDGE
     PUSHBUTTON      "Move Down",IDC_MOVE_DOWN,171,242,53,14,0,WS_EX_STATICEDGE
     PUSHBUTTON      "Toggle Loop",IDC_TOGGLE_LOOP,171,259,53,14,0,WS_EX_STATICEDGE
@@ -1583,12 +1581,12 @@
     LTEXT           "Mission loop description",IDC_STATIC,7,367,76,8
     LTEXT           "Loop brief anim",IDC_STATIC,13,408,49,8
     LTEXT           "Loop brief voice",IDC_STATIC,13,423,52,8
-    LTEXT           "Main hall index",IDC_MAINHALL_LABEL,149,177,48,8
+    LTEXT           "Main hall name",IDC_MAINHALL_LABEL,14,194,48,8
     GROUPBOX        "Mission options",IDC_MISSION_OPTIONS,7,165,221,43
     LTEXT           "Debriefing persona index",IDC_STATIC,118,193,79,8
 END
 
-IDD_TEXT_VIEW DIALOG  0, 0, 324, 285
+IDD_TEXT_VIEW DIALOG 0, 0, 324, 285
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ship TBL Data"
 FONT 8, "MS Sans Serif"
@@ -1651,7 +1649,7 @@
     GROUPBOX        "Briefing Music",IDC_STATIC,7,132,150,44
 END
 
-IDD_IGNORE_ORDERS DIALOG  0, 0, 120, 217
+IDD_IGNORE_ORDERS DIALOG 0, 0, 120, 217
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ignore Orders"
 FONT 8, "MS Sans Serif"
@@ -1701,7 +1699,7 @@
     COMBOBOX        IDC_FAILED_MISSION_TRACK,182,195,80,180,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_ADJUST_GRID DIALOG  0, 0, 153, 94
+IDD_ADJUST_GRID DIALOG 0, 0, 153, 94
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Adjust Grid"
 FONT 8, "MS Sans Serif"
@@ -1723,7 +1721,7 @@
     LTEXT           "X Level",IDC_STATIC,69,50,25,8
 END
 
-IDD_SHIELD_SYS DIALOG  0, 0, 192, 106
+IDD_SHIELD_SYS DIALOG 0, 0, 192, 106
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Shield System Editor"
 FONT 8, "MS Sans Serif"
@@ -1740,7 +1738,7 @@
     PUSHBUTTON      "Cancel",IDCANCEL,134,86,50,14
 END
 
-IDD_INITIAL_SHIPS DIALOG  0, 0, 127, 210
+IDD_INITIAL_SHIPS DIALOG 0, 0, 127, 210
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Initial Ships Allowed"
 FONT 8, "MS Sans Serif"
@@ -1834,7 +1832,7 @@
     CONTROL         "Cloaked",IDC_CLOAKED,"Button",BS_3STATE | WS_TABSTOP,165,167,42,10
 END
 
-IDD_ADD_VARIABLE DIALOG  0, 0, 422, 102
+IDD_ADD_VARIABLE DIALOG 0, 0, 422, 102
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Add Variable"
 FONT 8, "MS Sans Serif"
@@ -1854,7 +1852,7 @@
     CONTROL         "Network-Variable",IDC_TYPE_NETWORK_VARIABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,71,84,11
 END
 
-IDD_MODIFY_VARIABLE DIALOG  0, 0, 422, 102
+IDD_MODIFY_VARIABLE DIALOG 0, 0, 422, 102
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Modify Variable"
 FONT 8, "MS Sans Serif"
@@ -1876,7 +1874,7 @@
     CONTROL         "Network-Variable",IDC_TYPE_NETWORK_VARIABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,138,72,84,11
 END
 
-IDD_SPECIAL_DAMAGE DIALOG  0, 0, 234, 129
+IDD_SPECIAL_DAMAGE DIALOG 0, 0, 234, 129
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Special Explosion"
 FONT 8, "MS Sans Serif"
@@ -1902,7 +1900,7 @@
     LTEXT           "Duration (msecs):",IDC_STATIC,30,111,56,8
 END
 
-IDD_DUMP_STATS DIALOG  0, 0, 577, 375
+IDD_DUMP_STATS DIALOG 0, 0, 577, 375
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Mission Stats"
 FONT 8, "MS Sans Serif"
@@ -1912,7 +1910,7 @@
     EDITTEXT        IDC_STATS_TEXT,7,7,563,333,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | ES_NUMBER | WS_VSCROLL
 END
 
-IDD_SHIP_TEXTURES DIALOG  0, 0, 296, 56
+IDD_SHIP_TEXTURES DIALOG 0, 0, 296, 56
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ship Texture Replace"
 FONT 8, "MS Sans Serif"
@@ -1925,7 +1923,7 @@
     COMBOBOX        IDC_OLD_TEXTURE_LIST,7,16,137,85,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_SPECIAL_HITPOINTS DIALOG  0, 0, 234, 85
+IDD_SPECIAL_HITPOINTS DIALOG 0, 0, 234, 85
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Special Hitpoints"
 FONT 8, "MS Sans Serif"
@@ -1942,7 +1940,7 @@
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,106,10
 END
 
-IDD_SET_GLOBAL_SHIP_FLAGS DIALOG  0, 0, 114, 79
+IDD_SET_GLOBAL_SHIP_FLAGS DIALOG 0, 0, 114, 79
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Set Global Ship Flags"
 FONT 8, "MS Sans Serif"
@@ -1953,7 +1951,7 @@
     PUSHBUTTON      "Global Affected-By-Gravity",IDC_AFFECTED_BY_GRAVITY,7,58,100,14
 END
 
-IDD_VOICE_MANAGER DIALOG  0, 0, 407, 218
+IDD_VOICE_MANAGER DIALOG 0, 0, 407, 218
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Voice Acting Manager"
 FONT 8, "MS Sans Serif"
@@ -1998,7 +1996,7 @@
                     "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,166,159,100,19
 END
 
-IDD_BRIEFING_PERSONAS DIALOG  0, 0, 320, 201
+IDD_BRIEFING_PERSONAS DIALOG 0, 0, 320, 201
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Dialog"
 FONT 8, "MS Sans Serif"
@@ -2007,7 +2005,7 @@
     PUSHBUTTON      "Cancel",IDCANCEL,263,24,50,14
 END
 
-IDD_CUSTOM_WING_NAMES DIALOG  0, 0, 390, 54
+IDD_CUSTOM_WING_NAMES DIALOG 0, 0, 390, 54
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Custom Wing Names"
 FONT 8, "MS Sans Serif"
@@ -2029,7 +2027,7 @@
     PUSHBUTTON      "Cancel",IDCANCEL,333,24,50,14
 END
 
-IDD_RESTRICT_PATHS DIALOG  0, 0, 141, 87
+IDD_RESTRICT_PATHS DIALOG 0, 0, 141, 87
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Restrict Paths"
 FONT 8, "MS Sans Serif"
@@ -2040,7 +2038,7 @@
     LTEXT           "Restrict departure paths to the following:",IDC_RESTRICT_PATHS_LABEL,7,7,127,11
 END
 
-IDD_BACKGROUND_CHOOSER DIALOG  0, 0, 152, 45
+IDD_BACKGROUND_CHOOSER DIALOG 0, 0, 152, 45
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Choose a background"
 FONT 8, "MS Sans Serif"
@@ -2050,7 +2048,7 @@
     COMBOBOX        IDC_BACKGROUND,7,16,83,265,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_FICTION_VIEWER DIALOG  0, 0, 205, 66
+IDD_FICTION_VIEWER DIALOG 0, 0, 205, 66
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Fiction Viewer Editor"
 FONT 8, "MS Sans Serif"
@@ -2134,7 +2132,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_ABOUTBOX, DIALOG
     BEGIN
@@ -2687,19 +2685,19 @@
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDR_MAINFRAME           "FRED2_OPEN 3.6.19 - FreeSpace2 Mission Editor\nUntitled\nFRED2\nFreeSpace2 Missions (*.fs2)\n.fs2\nFreeSpace2Mission\nFreeSpace2 Mission"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_APP_TITLE       "FRED2"
     AFX_IDS_IDLEMESSAGE     "For Help, press F1"
     AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FILE_NEW             "Create a new campaign\nNew"
     ID_FILE_OPEN            "Open an existing campaign\nOpen"
@@ -2712,7 +2710,7 @@
     ID_FILE_PRINT_PREVIEW   "Display full pages\nPrint Preview"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
     ID_APP_EXIT             "Exit the campaign editor\nExit"
@@ -2723,7 +2721,7 @@
     ID_HELP                 "Display help for current task or command\nHelp"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FILE_MRU_FILE1       "Open this document"
     ID_FILE_MRU_FILE2       "Open this document"
@@ -2743,18 +2741,18 @@
     ID_FILE_MRU_FILE16      "Open this document"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
     ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_EDIT_CLEAR           "Erase the selection\nErase"
     ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"
@@ -2769,13 +2767,13 @@
     ID_EDIT_REDO            "Redo the previously undone action\nRedo"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_VIEW_TOOLBAR         "Show or hide the toolbar\nToggle ToolBar"
     ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Change the window size"
     AFX_IDS_SCMOVE          "Change the window position"
@@ -2786,24 +2784,24 @@
     AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_SCRESTORE       "Restore the window to normal size"
     AFX_IDS_SCTASKLIST      "Activate Task List"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FILE_MISSIONNOTES    "Displays designer notes and mission properties\nMission Specs"
     ID_SELECT               "Select objects mode\nSelect (S)"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_VIEW_FIGHTERS        "Show/Hide Fighter objects"
     ID_VIEW_CAPITALSHIPS    "Show/Hide Capital Ship objects"
@@ -2821,7 +2819,7 @@
     ID_EDITORS_SHIPS        "Open ship editor dialog window to edit ship"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_EDITORS_GOALS        "Activates Mission Goal Editor\nMission Goal Editor"
     ID_EDITORS_WAYPOINTS    "Activates Waypoint Editor\nWaypoint Editor"
@@ -2832,7 +2830,7 @@
     ID_PROPERTIES_ONE       "This is Mike's prompt!"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_INDICATOR_EXT        "EXT"
     ID_INDICATOR_CAPS       "CAP"
@@ -2846,7 +2844,7 @@
     ID_INDICATOR_MODIFIED   "MODIFIED"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_MISCSTUFF_SHOWSHIPSASICONS "This is the (help?) prompt!"
     ID_EDIT_POPUP_SHOW_SHIP_MODELS 
@@ -2855,7 +2853,7 @@
                             "Display ship names and ship types for visible ships"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_ADD_MISSION_TIME     "Evaluates to elapsed time into mission in seconds"
     ID_ADD_EQUALS           "Evaluates to true if numbers or objects are the same"
@@ -2870,7 +2868,7 @@
     ID_ADD_FALSE            "Evaluates to a boolean value of false"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_EDIT_POPUP_SHOW_COMPASS 
                             "Display a 3 dimentional compass in the upper right corner of window"
@@ -2884,7 +2882,7 @@
     ID_ADD_MINUS            "Evaluates to difference between first subexpression and remaining subexpressions"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_SHOW_GRID_POSITIONS  "Show position on grid for all visible objects"
     ID_SHOW_COORDINATES     "Display the coordinates of objects/waypoints."
@@ -2899,7 +2897,7 @@
     ID_DISSOLVE_WING        "Remove selected ships from Wing(s)\nRemove from Wing"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_SELECT_AND_MOVE      "Select and Move objects\nSelect and Move (M)"
     ID_SELECT_AND_ROTATE    "Select and Rotate objects\nSelect and Rotate (R)"
@@ -2914,7 +2912,7 @@
     ID_FIND_DISTANCE        "Find Distance between two objects\nFind Distance"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_BUTTON32944          "Constrain to YZ axis\nYZ Constraint"
     ID_BUTTON32945          "Constrain to XY axis\nXY Constraint"
@@ -2929,27 +2927,27 @@
     ID_SHOW_HORIZON         "Show the horizon line"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_EDITORS_PLAYER       "Edit loadout information for all teams"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_REVERT               "Revert changes by reloading mission from last save\nRevert"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_ERROR_CHECKER        "Checks campaign for errors"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_LOOKAT_OBJ           "Rotate camera around selected object\nRotate around object (Ctrl+V)"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_EDITORS_ADJUST_GRID  "Adjust the orientation and level of the grid."
     ID_EDITORS_SHIELD_SYS   "Editor for availability of shield system for ships."
@@ -2957,7 +2955,7 @@
     ID_MARK_WING            "Mark entire wing selected object is a member of."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_CONTROL_OBJ          "Movement keys control marked objects instead of camera."
     ID_CHECKOUT             "Checks out the mission from Source Safe"
@@ -2965,37 +2963,35 @@
     ID_AA_GRIDLINES         "Toggle Gridlines being drawn anti-aliased or not."
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FORMAT_FS2_OPEN      "Save missions with SCP features"
     ID_FORMAT_FS2_RETAIL    "Save missions compatible with FS2 retail"
     ID_FORMAT_FS1           "Save missions compatible with FS1 retail"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FORMAT_FS1_RETAIL    "Save missions compatible with FS1 retail"
 END
 
-#endif    // English (U.S.) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
+// English (United Kingdom) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
-IDD_ALT_SHIP_CLASS DIALOG  0, 0, 312, 212
+IDD_ALT_SHIP_CLASS DIALOG 0, 0, 312, 212
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Alternate Ship Class Editor"
 FONT 8, "MS Sans Serif"
@@ -3022,7 +3018,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_ALT_SHIP_CLASS, DIALOG
     BEGIN
@@ -3034,7 +3030,7 @@
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // English (U.K.) resources
+#endif    // English (United Kingdom) resources
 /////////////////////////////////////////////////////////////////////////////
2841.patch (22,311 bytes)   

CommanderDJ

2013-04-27 05:52

developer   ~0014963

Sorry this took me so long! Patch attached. I only changed about three things, but it seems MSVC decided to add some whitespace cleanup to the patch; not much I can do about that. Anyway, please test!

MjnMixael

2013-04-27 17:47

manager   ~0014965

Works as expected!

Zacam

2013-04-28 22:24

administrator   ~0014971

Fix committed to trunk@9656.

Related Changesets

fs2open: trunk r9656

2013-04-28 19:16

Zacam


Ported: N/A

Details Diff		 Fix for Mantis 2841: From CommanderDJ, Allows FRED to select/set Main Hall by string input, not just integers. Affected Issues
0002841
mod - /trunk/fs2_open/code/fred2/fred.rc Diff File

Issue History

Date Modified Username Field Change
2013-04-10 13:50 MjnMixael New Issue
2013-04-10 13:50 MjnMixael Status new => assigned
2013-04-10 13:50 MjnMixael Assigned To => CommanderDJ
2013-04-10 13:50 MjnMixael File Added: ImageBin.jpg
2013-04-27 05:51 CommanderDJ File Added: 2841.patch
2013-04-27 05:52 CommanderDJ Note Added: 0014963
2013-04-27 05:52 CommanderDJ Status assigned => code review
2013-04-27 17:47 MjnMixael Note Added: 0014965
2013-04-28 22:24 Zacam Changeset attached => fs2open trunk r9656
2013-04-28 22:24 Zacam Note Added: 0014971
2013-04-28 22:24 Zacam Status code review => resolved
2013-04-28 22:24 Zacam Resolution open => fixed