diff options
| -rw-r--r-- | projects/openttd_vs80.vcproj | 4 | ||||
| -rw-r--r-- | projects/openttd_vs90.vcproj | 4 | ||||
| -rw-r--r-- | source.list | 1 | ||||
| -rw-r--r-- | src/gui.h | 1 | ||||
| -rw-r--r-- | src/industry.h | 2 | ||||
| -rw-r--r-- | src/newgrf.cpp | 1 | ||||
| -rw-r--r-- | src/smallmap_gui.h | 18 | ||||
| -rw-r--r-- | src/toolbar_gui.cpp | 1 |
8 files changed, 29 insertions, 3 deletions
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 0b377f06e..f840b5c05 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -1320,6 +1320,10 @@ > </File> <File + RelativePath=".\..\src\smallmap_gui.h" + > + </File> + <File RelativePath=".\..\src\sound\sdl_s.h" > </File> diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index da5a92293..4545bfdbc 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -1317,6 +1317,10 @@ > </File> <File + RelativePath=".\..\src\smallmap_gui.h" + > + </File> + <File RelativePath=".\..\src\sound\sdl_s.h" > </File> diff --git a/source.list b/source.list index 19af99706..26339cbf5 100644 --- a/source.list +++ b/source.list @@ -239,6 +239,7 @@ roadstop_base.h roadveh.h screenshot.h sdl.h +smallmap_gui.h sound/sdl_s.h video/sdl_v.h settings_func.h @@ -64,7 +64,6 @@ void ShowSubsidiesList(); void ShowEstimatedCostOrIncome(Money cost, int x, int y); void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, int x, int y, bool no_timeout = false); -void ShowSmallMap(); void ShowExtraViewPortWindow(TileIndex tile = INVALID_TILE); void BuildFileList(); diff --git a/src/industry.h b/src/industry.h index 27d56af5b..99ba24924 100644 --- a/src/industry.h +++ b/src/industry.h @@ -84,8 +84,6 @@ void PlantRandomFarmField(const Industry *i); void ReleaseDisastersTargetingIndustry(IndustryID); -/* smallmap_gui.cpp */ -void BuildIndustriesLegend(); /* industry_cmd.cpp */ void SetIndustryDailyChanges(); diff --git a/src/newgrf.cpp b/src/newgrf.cpp index d6db4c6f3..d0ae2d77d 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -45,6 +45,7 @@ #include <map> #include "core/alloc_type.hpp" #include "core/mem_func.hpp" +#include "smallmap_gui.h" #include "table/strings.h" #include "table/build_industry.h" diff --git a/src/smallmap_gui.h b/src/smallmap_gui.h new file mode 100644 index 000000000..62ace3280 --- /dev/null +++ b/src/smallmap_gui.h @@ -0,0 +1,18 @@ +/* $Id$ */ + +/* + * This file is part of OpenTTD. + * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. + * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. + */ + +/** @file smallmap_gui.h Smallmap GUI functions, used at newgrf.cpp and toolbar_gui.cpp. */ + +#ifndef SMALLMAP_GUI_H +#define SMALLMAP_GUI_H + +void BuildIndustriesLegend(); +void ShowSmallMap(); + +#endif /* SMALLMAP_GUI_H */ diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 33deeca78..6979df681 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -41,6 +41,7 @@ #include "rail.h" #include "widgets/dropdown_type.h" #include "company_base.h" +#include "smallmap_gui.h" #include "network/network.h" #include "network/network_gui.h" |