Mercurial > hg > openttd

changeset 14491:ce48b302a141 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r19062) -Codechange: Move smallmap related functions to their own header.
author terkhen <terkhen@openttd.org>
date Mon, 08 Feb 2010 21:19:41 +0000
parents a315be157e61
children aaf7de90045e
files projects/openttd_vs80.vcproj projects/openttd_vs90.vcproj source.list src/gui.h src/industry.h src/newgrf.cpp src/smallmap_gui.h src/toolbar_gui.cpp
diffstat 8 files changed, 29 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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>
--- 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>
--- a/source.list
+++ b/source.list
@@ -239,6 +239,7 @@
 roadveh.h
 screenshot.h
 sdl.h
+smallmap_gui.h
 sound/sdl_s.h
 video/sdl_v.h
 settings_func.h
--- a/src/gui.h
+++ b/src/gui.h
@@ -64,7 +64,6 @@
 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();
--- a/src/industry.h
+++ b/src/industry.h
@@ -84,8 +84,6 @@
 
 void ReleaseDisastersTargetingIndustry(IndustryID);
 
-/* smallmap_gui.cpp */
-void BuildIndustriesLegend();
 /* industry_cmd.cpp */
 void SetIndustryDailyChanges();
 
--- 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"
new file mode 100644
--- /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 */
--- 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"