Utils/MapEdit/MapEdit.rc

@@ -132,7 +132,7 @@ BEGIN
         MENUITEM "View Left Brush",             ID_ACTIVEBRUSH_LEFT
         MENUITEM "View Right Brush",            ID_ACTIVEBRUSH_RIGHT
         MENUITEM SEPARATOR
-        MENUITEM "&Toggle SubView",				ID_TOGGLE_SUBVIEW
+        MENUITEM "&Toggle SubView",             ID_TOGGLE_SUBVIEW
     END
     POPUP "Misc"
     BEGIN
@@ -176,7 +176,7 @@ BEGIN
     VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT, NOINVERT
     VK_INSERT,      ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
     VK_INSERT,      ID_EDIT_PASTE,          VIRTKEY, SHIFT, NOINVERT
-    VK_SPACE,       ID_TOGGLE_SUBVIEW,		VIRTKEY, NOINVERT
+    VK_SPACE,       ID_TOGGLE_SUBVIEW,      VIRTKEY, NOINVERT
     VK_SUBTRACT,    ID_ZOOM_OUT,            VIRTKEY, NOINVERT
     VK_TAB,         ID_NEXT_PANE,           VIRTKEY, CONTROL, NOINVERT
     VK_TAB,         ID_PREV_PANE,           VIRTKEY, SHIFT, CONTROL, 
@@ -425,7 +425,7 @@ END
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    ID_TOGGLE_SUBVIEW		"Toggle SubView"
+    ID_TOGGLE_SUBVIEW       "Toggle SubView"
     ID_MAP_TOGGLEGRID       "Toggle Grid On and Off"
 END
 
@@ -457,18 +457,18 @@ IDI_SELECT              ICON    DISCARDABLE     "res\\select.ico"
 // Dialog
 //
 
-IDD_LAYER_LIST_DIALOG DIALOG DISCARDABLE  0, 0, 156, 115
+IDD_LAYER_LIST DIALOG DISCARDABLE  0, 0, 156, 115
 STYLE WS_CHILD | WS_BORDER
 FONT 8, "MS Sans Serif"
 BEGIN
-    LISTBOX         IDC_LAYER_LIST,5,5,145,85,LBS_OWNERDRAWFIXED | 
+    LISTBOX         IDC_LAYERLIST_LIST,5,5,145,85,LBS_OWNERDRAWFIXED | 
                     LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
                     WS_TABSTOP
     PUSHBUTTON      "Add",IDC_LAYERLIST_ADD,5,95,70,15
     PUSHBUTTON      "Delete",IDC_LAYERLIST_DELETE,80,95,70,15
 END
 
-IDD_MAPSIZE DIALOG DISCARDABLE  0, 0, 127, 61
+IDD_RESIZE DIALOG DISCARDABLE  0, 0, 127, 61
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Enter New Size"
 FONT 8, "MS Sans Serif"
@@ -511,18 +511,16 @@ BEGIN
                     WS_VSCROLL | WS_TABSTOP,WS_EX_DLGMODALFRAME
 END
 
-IDD_LAYERTILE_GUI DIALOG DISCARDABLE  0, 0, 156, 47
+IDD_TILEBANK DIALOG DISCARDABLE  0, 0, 156, 26
 STYLE WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
-    COMBOBOX        IDD_LAYERTILE_LIST,7,7,138,322,CBS_DROPDOWNLIST | 
-                    WS_TABSTOP
-    PUSHBUTTON      "Update",IDD_LAYERTILE_BTN_UPDATE,95,25,50,15
-    PUSHBUTTON      "Load",IDD_LAYERTILE_BTN_LOAD,5,25,45,15
-    PUSHBUTTON      "Delete",IDD_LAYERTILE_BTN_DELETE,50,25,45,15
+    PUSHBUTTON      "Update",IDD_TILEBANK_UPDATE,95,5,50,15
+    PUSHBUTTON      "Load",IDD_TILEBANK_LOAD,5,5,45,15
+    PUSHBUTTON      "Delete",IDD_TILEBANK_DELETE,50,5,45,15
 END
 
-IDD_LAYERTILE_TOOLBAR DIALOG DISCARDABLE  0, 0, 156, 16
+IDD_LAYER_TOOLBAR DIALOG DISCARDABLE  0, 0, 156, 16
 STYLE WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -532,7 +530,7 @@ BEGIN
                     WS_TABSTOP
 END
 
-IDD_LAYERSHADE_GUI DIALOG DISCARDABLE  0, 0, 156, 76
+IDD_LAYER_SHADE DIALOG DISCARDABLE  0, 0, 156, 76
 STYLE WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -564,7 +562,7 @@ BEGIN
                     UDS_ALIGNRIGHT | UDS_AUTOBUDDY,31,10,11,20
 END
 
-IDD_LAYERCOLLISION_GUI DIALOG DISCARDABLE  0, 0, 156, 36
+IDD_LAYER_COLLISION DIALOG DISCARDABLE  0, 0, 156, 41
 STYLE WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -574,6 +572,15 @@ BEGIN
     PUSHBUTTON      "Electric",IDC_LAYERCOLLISION_ELECTRIC,0,15,50,10
     PUSHBUTTON      "Sticky",IDC_LAYERCOLLISION_STICKY,50,15,50,10
     PUSHBUTTON      "Water",IDC_LAYERCOLLISION_WATER,100,15,50,10
+    PUSHBUTTON      "Solid",IDC_LAYERCOLLISION_SOLID,0,25,50,10
+    PUSHBUTTON      "Death",IDC_LAYERCOLLISION_DEATH,50,25,50,10
+END
+
+IDD_ELEMLIST DIALOG DISCARDABLE  0, 0, 156, 26
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    COMBOBOX        IDD_ELEM_LIST,7,7,138,322,CBS_DROPDOWNLIST | WS_TABSTOP
 END
 
 
@@ -585,7 +592,7 @@ END
 #ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO DISCARDABLE 
 BEGIN
-    IDD_LAYER_LIST_DIALOG, DIALOG
+    IDD_LAYER_LIST, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 149
@@ -593,7 +600,7 @@ BEGIN
         BOTTOMMARGIN, 108
     END
 
-    IDD_MAPSIZE, DIALOG
+    IDD_RESIZE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 120
@@ -617,15 +624,15 @@ BEGIN
         BOTTOMMARGIN, 83
     END
 
-    IDD_LAYERTILE_GUI, DIALOG
+    IDD_TILEBANK, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 149
         TOPMARGIN, 7
-        BOTTOMMARGIN, 40
+        BOTTOMMARGIN, 19
     END
 
-    IDD_LAYERTILE_TOOLBAR, DIALOG
+    IDD_LAYER_TOOLBAR, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 149
@@ -633,7 +640,7 @@ BEGIN
         BOTTOMMARGIN, 9
     END
 
-    IDD_LAYERSHADE_GUI, DIALOG
+    IDD_LAYER_SHADE, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 149
@@ -641,12 +648,20 @@ BEGIN
         BOTTOMMARGIN, 69
     END
 
-    IDD_LAYERCOLLISION_GUI, DIALOG
+    IDD_LAYER_COLLISION, DIALOG
     BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 149
         TOPMARGIN, 7
-        BOTTOMMARGIN, 29
+        BOTTOMMARGIN, 34
+    END
+
+    IDD_ELEMLIST, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 149
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 19
     END
 END
 #endif    // APSTUDIO_INVOKED