Fix industry/station/house tooltips

citymania-org · Feb 19, 2024 · 941bbdd · 941bbdd
1 parent a853d1a
commit 941bbdd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/citymania/cm_tooltips.cpp b/src/citymania/cm_tooltips.cpp
@@ -90,7 +90,7 @@ struct LandTooltipsWindow : public Window
                 size->width = std::max(GetStringBoundingBox(CM_STR_LAND_TOOLTIPS_INDUSTRY_NAME).width, size->width);
 
                 for (auto &p : ind->produced) {
-                    if (p.cargo == CT_INVALID) continue;
+                    if (!IsValidCargoID(p.cargo)) continue;
                     const CargoSpec *cs = CargoSpec::Get(p.cargo);
                     if(cs == NULL) continue;
                     size->height += line_height;
@@ -165,7 +165,7 @@ struct LandTooltipsWindow : public Window
                 ir.top += text_height;
 
                 for (auto &p : ind->produced) {
-                    if (p.cargo == CT_INVALID) continue;
+                    if (!IsValidCargoID(p.cargo)) continue;
                     const CargoSpec *cs = CargoSpec::Get(p.cargo);
                     if(cs == NULL) continue;
                     SetDParam(0, cs->name);

diff --git a/src/main_gui.cpp b/src/main_gui.cpp
@@ -466,6 +466,13 @@ struct MainWindow : Window
 		return this->viewport->overlay->ShowTooltip(pt, close_cond);
 	}
 
+	void OnMouseOver(Point pt, [[maybe_unused]] int widget) override
+	{
+		extern void GuiPrepareTooltipsExtra(Window *parent);
+		if (_game_mode != GM_MENU && pt.x != -1) GuiPrepareTooltipsExtra(this);
+	}
+
+
 	/**
 	 * Some data on this window has become invalid.
 	 * @param data Information about the changed data.