summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-08-02 21:35:59 +0000
committerrubidium <rubidium@openttd.org>2010-08-02 21:35:59 +0000
commit55129f1fbb6451b27ac45224dcad2cb2ed911f92 (patch)
treec01c26faf0366f75d6ff2e24e8c42963382467a2
parent5ae4e27446c6d20855f58a3845e8b3c52fb74aa4 (diff)
downloadopenttd-55129f1fbb6451b27ac45224dcad2cb2ed911f92.tar.xz
(svn r20326) -Codechange: move UnmovableType to its own file
-rw-r--r--projects/openttd_vs100.vcxproj1
-rw-r--r--projects/openttd_vs100.vcxproj.filters3
-rw-r--r--projects/openttd_vs80.vcproj4
-rw-r--r--projects/openttd_vs90.vcproj4
-rw-r--r--source.list1
-rw-r--r--src/unmovable.h3
-rw-r--r--src/unmovable_cmd.cpp2
-rw-r--r--src/unmovable_map.h11
-rw-r--r--src/unmovable_type.h27
9 files changed, 44 insertions, 12 deletions
diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index 93efda894..84ac70efa 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -578,6 +578,7 @@
<ClInclude Include="..\src\transport_type.h" />
<ClInclude Include="..\src\tunnelbridge.h" />
<ClInclude Include="..\src\unmovable.h" />
+ <ClInclude Include="..\src\unmovable_type.h" />
<ClInclude Include="..\src\vehicle_base.h" />
<ClInclude Include="..\src\vehicle_func.h" />
<ClInclude Include="..\src\vehicle_gui.h" />
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index 4aa8f2819..c9e5e5295 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -937,6 +937,9 @@
<ClInclude Include="..\src\unmovable.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\src\unmovable_type.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="..\src\vehicle_base.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index b6697d750..86dc93a5e 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1580,6 +1580,10 @@
>
</File>
<File
+ RelativePath=".\..\src\unmovable_type.h"
+ >
+ </File>
+ <File
RelativePath=".\..\src\vehicle_base.h"
>
</File>
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index a0c31ce14..6fd56503b 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1577,6 +1577,10 @@
>
</File>
<File
+ RelativePath=".\..\src\unmovable_type.h"
+ >
+ </File>
+ <File
RelativePath=".\..\src\vehicle_base.h"
>
</File>
diff --git a/source.list b/source.list
index 30b6a8aae..00878b29b 100644
--- a/source.list
+++ b/source.list
@@ -304,6 +304,7 @@ transparency_gui.h
transport_type.h
tunnelbridge.h
unmovable.h
+unmovable_type.h
vehicle_base.h
vehicle_func.h
vehicle_gui.h
diff --git a/src/unmovable.h b/src/unmovable.h
index 2838d1879..330373cb8 100644
--- a/src/unmovable.h
+++ b/src/unmovable.h
@@ -14,6 +14,7 @@
#include "economy_func.h"
#include "strings_type.h"
+#include "unmovable_type.h"
void UpdateCompanyHQ(Company *c, uint score);
@@ -40,7 +41,7 @@ struct UnmovableSpec {
* @param index The unmovable type to fetch.
* @return The specification.
*/
- static const UnmovableSpec *Get(int index);
+ static const UnmovableSpec *Get(UnmovableType index);
/**
* Get the specification associated with a tile.
diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp
index ce9bfb161..c3983424e 100644
--- a/src/unmovable_cmd.cpp
+++ b/src/unmovable_cmd.cpp
@@ -35,7 +35,7 @@
#include "table/sprites.h"
#include "table/unmovable_land.h"
-/* static */ const UnmovableSpec *UnmovableSpec::Get(int index)
+/* static */ const UnmovableSpec *UnmovableSpec::Get(UnmovableType index)
{
assert(index < UNMOVABLE_MAX);
return &_original_unmovable[index];
diff --git a/src/unmovable_map.h b/src/unmovable_map.h
index 1b01c5637..7725ac5cb 100644
--- a/src/unmovable_map.h
+++ b/src/unmovable_map.h
@@ -13,16 +13,7 @@
#define UNMOVABLE_MAP_H
#include "tile_map.h"
-
-/** Types of unmovable structure */
-enum UnmovableType {
- UNMOVABLE_TRANSMITTER = 0, ///< The large antenna
- UNMOVABLE_LIGHTHOUSE = 1, ///< The nice lighthouse
- UNMOVABLE_STATUE = 2, ///< Statue in towns
- UNMOVABLE_OWNED_LAND = 3, ///< Owned land 'flag'
- UNMOVABLE_HQ = 4, ///< HeadQuarter of a player
- UNMOVABLE_MAX,
-};
+#include "unmovable_type.h"
/**
* Gets the UnmovableType of the given unmovable tile
diff --git a/src/unmovable_type.h b/src/unmovable_type.h
new file mode 100644
index 000000000..92f11c31b
--- /dev/null
+++ b/src/unmovable_type.h
@@ -0,0 +1,27 @@
+/* $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 unmovable_map.h Types related to unmovable tiles. */
+
+#ifndef UNMOVABLE_TYPE_H
+#define UNMOVABLE_TYPE_H
+
+/** Types of unmovable structure */
+enum UnmovableType {
+ UNMOVABLE_TRANSMITTER = 0, ///< The large antenna
+ UNMOVABLE_LIGHTHOUSE = 1, ///< The nice lighthouse
+ UNMOVABLE_STATUE = 2, ///< Statue in towns
+ UNMOVABLE_OWNED_LAND = 3, ///< Owned land 'flag'
+ UNMOVABLE_HQ = 4, ///< HeadQuarter of a player
+ UNMOVABLE_MAX,
+};
+
+struct UnmovableSpec;
+
+#endif /* UNMOVABLE_MAP_H */