hotfix 4.1.1

OTAcademy · Feb 22, 2023 · 957e977 · 957e977
1 parent d0dcc29
commit 957e977
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/data/menubar.xml b/data/menubar.xml
@@ -21,12 +21,12 @@
 		r - raw palette
 		s - show spawns
 		t - terrain palette
-		u
+		u - show locked doors
 		v - highlight items
 		w - waypoint palette
-		x - show locked doors
+		x - RESERVED FOR ROTATE HOTKEY
 		y - show tooltips
-		z
+		z - RESERVED FOR ROTATE HOTKEY
 	-->
 
 	<menu name="File">
@@ -40,7 +40,9 @@
 		<menu name="Import">
 			<item name="Import Map..." action="IMPORT_MAP" help="Import map data from another map file."/>
 			<item name="Import Monsters/NPC..." action="IMPORT_MONSTERS" help="Import either a monsters.xml file or a specific monster/NPC."/>
+			<!-- this was never implemented
 			<item name="Import Minimap..." action="IMPORT_MINIMAP" help="Import map data from a .bmp file."/>
+			-->
 		</menu>
 		<menu name="Export">
 			<item name="Export Minimap..." action="EXPORT_MINIMAP" help="Export minimap to an image file."/>
@@ -170,7 +172,7 @@
 		<item name="Show waypoints" hotkey="Shift+W" action="SHOW_WAYPOINTS" help="Show waypoints."/>
 		<separator/>
 		<item name="Highlight Items" hotkey="V" action="HIGHLIGHT_ITEMS" help="Highlight tiles with items on them."/>
-		<item name="Highlight Locked Doors" hotkey="X" action="HIGHLIGHT_LOCKED_DOORS" help="Highlight doors that require key to open."/>
+		<item name="Highlight Locked Doors" hotkey="U" action="HIGHLIGHT_LOCKED_DOORS" help="Highlight doors that require key to open."/>
 		<item name="Show Wall Hooks" hotkey="K" action="SHOW_WALL_HOOKS" help="Show indicators for wall hooks."/>
 	</menu>
 	<menu name="Navigate">

diff --git a/source/definitions.h b/source/definitions.h
@@ -25,7 +25,7 @@
 // xxyyzzt (major, minor, subversion)
 #define __RME_VERSION_MAJOR__      4
 #define __RME_VERSION_MINOR__      1
-#define __RME_SUBVERSION__         0
+#define __RME_SUBVERSION__         1
 
 #define __LIVE_NET_VERSION__       5
 

diff --git a/source/wall_brush.cpp b/source/wall_brush.cpp
@@ -213,18 +213,19 @@ bool WallBrush::load(pugi::xml_node node, wxArrayString& warnings)
 					}
 
 					dt.id = id;
-					if(all_windows) {
-						dt.type = WALL_WINDOW;       door_items[alignment].push_back(dt);
-						dt.type = WALL_HATCH_WINDOW; door_items[alignment].push_back(dt);
-					}
 
 					if(all_doors) {
-						dt.type = WALL_ARCHWAY;         door_items[alignment].push_back(dt);
 						dt.type = WALL_DOOR_NORMAL;     door_items[alignment].push_back(dt);
 						dt.type = WALL_DOOR_NORMAL_ALT; door_items[alignment].push_back(dt);
 						dt.type = WALL_DOOR_LOCKED;     door_items[alignment].push_back(dt);
 						dt.type = WALL_DOOR_QUEST;      door_items[alignment].push_back(dt);
 						dt.type = WALL_DOOR_MAGIC;      door_items[alignment].push_back(dt);
+						dt.type = WALL_ARCHWAY;         door_items[alignment].push_back(dt);
+					}
+
+					if (all_windows) {
+						dt.type = WALL_WINDOW;       door_items[alignment].push_back(dt);
+						dt.type = WALL_HATCH_WINDOW; door_items[alignment].push_back(dt);
 					}
 
 					if(!all_doors && !all_windows) {