Update comments

FreeRCT · Sep 23, 2021 · 77201f2 · 77201f2
1 parent fb9f07e
commit 77201f2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/docs/manual.html b/docs/manual.html
@@ -714,14 +714,13 @@ <h1>Game Manual</h1>
 							<td><emp>9</emp></td>
 							<td>Open the finances window.</td>
 						</tr>
-						<tr>
-							<td><emp>U</emp></td>
-							<td>Toggle underground view mode.</td>
-						</tr>
 						<tr>
 							<td><emp>M</emp></td>
 							<td>Open the minimap.</td>
 						</tr>
+						<tr>
+							<td><emp>U</emp></td>
+							<td>Toggle underground view mode.</td>
 						</tr>
 					</table> </p> <p>
 						In the main menu, the following shortcuts are available:

diff --git a/src/minimap.cpp b/src/minimap.cpp
@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with FreeRCT. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file minimap.cpp %Park overview minimap Gui. */
+/** @file minimap.cpp Park overview %Minimap Gui. */
 
 #include "stdafx.h"
 #include "map.h"
@@ -43,9 +43,9 @@ static const int MAX_ZOOM = 16;  ///< Maximum size of a voxel in pixels on the m
  * @ingroup gui_group
  */
 enum MinimapWidgets {
-	MM_MAIN,      ///< Main view
-	MM_ZOOM_IN,   ///< Zoom in button.
-	MM_ZOOM_OUT,  ///< Zoom out button.
+	MM_MAIN,         ///< Main minimap view.
+	MM_ZOOM_IN,      ///< Zoom in button.
+	MM_ZOOM_OUT,     ///< Zoom out button.
 	MM_SCROLL_HORZ,  ///< Horizontal scrollbar.
 	MM_SCROLL_VERT,  ///< Vertical scrollbar.
 };

diff --git a/src/palette.cpp b/src/palette.cpp
@@ -244,7 +244,7 @@ ColourRange Recolouring::GetReplacementRange(ColourRange src) const
 
 /** 8 bpp colours mapped to 32 bpp. */
 const uint32 _palette[256] = {
-	MakeRGBA(  0,   0,   0, OPAQUE), //  0 COL_BACKGROUND (background behind world display)
+	MakeRGBA(  0,   0,   0, OPAQUE), //  0 COL_BACKGROUND (background behind world display), also used for black text.
 	MakeRGBA(255, 255, 255, OPAQUE), //  1 COL_HIGHLIGHT (full white to highlight window edge)
 	MakeRGBA(255, 255, 255, OPACITY_SEMI_TRANSPARENT), //  2 COL_SEMI_TRANSPARENT (semi-transparent white buy-ride colour)
 	MakeRGBA(220, 200, 100, OPAQUE), //  3 Background for tooltips.

diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
@@ -76,8 +76,8 @@ enum DropdownMain {
  * @ingroup gui_group
  */
 enum DropdownView {
-	DDV_UNDERGROUND,  ///< Toggle underground view.
 	DDV_MINIMAP,      ///< Open the minimap.
+	DDV_UNDERGROUND,  ///< Toggle underground view.
 };
 
 /**
@@ -162,11 +162,11 @@ void ToolbarWindow::OnClick(WidgetNumber number, const Point16 &pos)
 		case TB_DROPDOWN_VIEW: {
 			DropdownList itemlist;
 			/* Keep the order consistent with the DropdownView ordering! */
+			/* DDV_MINIMAP */
+			itemlist.push_back(DropdownItem(GUI_TOOLBAR_GUI_DROPDOWN_VIEW_MINIMAP));
 			/* DDV_UNDERGROUND */
 			_str_params.SetStrID(1, GUI_TOOLBAR_GUI_DROPDOWN_VIEW_UNDERGROUND);
 			itemlist.push_back(DropdownItem(_window_manager.GetViewport()->underground_mode ? GUI_DROPDOWN_CHECKED : GUI_DROPDOWN_UNCHECKED));
-			/* DDV_MINIMAP */
-			itemlist.push_back(DropdownItem(GUI_TOOLBAR_GUI_DROPDOWN_VIEW_MINIMAP));
 
 			this->ShowDropdownMenu(number, itemlist, -1);
 			break;
@@ -241,12 +241,12 @@ void ToolbarWindow::OnChange(ChangeCode code, uint32 parameter)
 					break;
 				case TB_DROPDOWN_VIEW:
 					switch (entry) {
-						case DDV_UNDERGROUND:
-							_window_manager.GetViewport()->ToggleUndergroundMode();
-							break;
 						case DDV_MINIMAP:
 							ShowMinimap();
 							break;
+						case DDV_UNDERGROUND:
+							_window_manager.GetViewport()->ToggleUndergroundMode();
+							break;
 						default: NOT_REACHED();
 					}
 					break;