diff options
| -rw-r--r-- | projects/openttd_vs80.vcproj | 24 | ||||
| -rw-r--r-- | projects/openttd_vs90.vcproj | 24 | ||||
| -rw-r--r-- | source.list | 6 | ||||
| -rw-r--r-- | src/saveload/oldloader_sl.cpp | 2 | ||||
| -rw-r--r-- | src/strings.cpp | 2 | ||||
| -rw-r--r-- | src/table/townname.h (renamed from src/table/namegen.h) | 2 | ||||
| -rw-r--r-- | src/townname.cpp (renamed from src/namegen.cpp) | 6 | ||||
| -rw-r--r-- | src/townname_func.h (renamed from src/namegen_func.h) | 2 |
8 files changed, 34 insertions, 34 deletions
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 4acb0236b..af0c8d057 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -612,10 +612,6 @@ > </File> <File - RelativePath=".\..\src\namegen.cpp" - > - </File> - <File RelativePath=".\..\src\network\network.cpp" > </File> @@ -740,6 +736,10 @@ > </File> <File + RelativePath=".\..\src\townname.cpp" + > + </File> + <File RelativePath=".\..\src\vehicle.cpp" > </File> @@ -1120,10 +1120,6 @@ > </File> <File - RelativePath=".\..\src\namegen_func.h" - > - </File> - <File RelativePath=".\..\src\network\network.h" > </File> @@ -1528,6 +1524,10 @@ > </File> <File + RelativePath=".\..\src\townname_func.h" + > + </File> + <File RelativePath=".\..\src\town_type.h" > </File> @@ -2240,10 +2240,6 @@ > </File> <File - RelativePath=".\..\src\table\namegen.h" - > - </File> - <File RelativePath=".\..\src\table\palette_convert.h" > </File> @@ -2288,6 +2284,10 @@ > </File> <File + RelativePath=".\..\src\table\townname.h" + > + </File> + <File RelativePath=".\..\src\table\town_land.h" > </File> diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index 93c592a75..6003f3fce 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -609,10 +609,6 @@ > </File> <File - RelativePath=".\..\src\namegen.cpp" - > - </File> - <File RelativePath=".\..\src\network\network.cpp" > </File> @@ -737,6 +733,10 @@ > </File> <File + RelativePath=".\..\src\townname.cpp" + > + </File> + <File RelativePath=".\..\src\vehicle.cpp" > </File> @@ -1117,10 +1117,6 @@ > </File> <File - RelativePath=".\..\src\namegen_func.h" - > - </File> - <File RelativePath=".\..\src\network\network.h" > </File> @@ -1525,6 +1521,10 @@ > </File> <File + RelativePath=".\..\src\townname_func.h" + > + </File> + <File RelativePath=".\..\src\town_type.h" > </File> @@ -2237,10 +2237,6 @@ > </File> <File - RelativePath=".\..\src\table\namegen.h" - > - </File> - <File RelativePath=".\..\src\table\palette_convert.h" > </File> @@ -2285,6 +2281,10 @@ > </File> <File + RelativePath=".\..\src\table\townname.h" + > + </File> + <File RelativePath=".\..\src\table\town_land.h" > </File> diff --git a/source.list b/source.list index c1ca1b352..0fb15096e 100644 --- a/source.list +++ b/source.list @@ -38,7 +38,6 @@ map.cpp misc.cpp mixer.cpp music.cpp -namegen.cpp network/network.cpp network/network_client.cpp network/network_command.cpp @@ -72,6 +71,7 @@ subsidy.cpp texteff.cpp tgp.cpp tile_map.cpp +townname.cpp #if WIN32 #else #if WINCE @@ -185,7 +185,6 @@ map_func.h map_type.h mixer.h music.h -namegen_func.h network/network.h network/network_base.h network/network_client.h @@ -287,6 +286,7 @@ tilehighlight_type.h timetable.h toolbar_gui.h town.h +townname_func.h town_type.h track_func.h track_type.h @@ -485,7 +485,6 @@ table/engines.h table/genland.h table/industry_land.h table/landscape_sprite.h -table/namegen.h table/palette_convert.h table/palettes.h table/pricebase.h @@ -497,6 +496,7 @@ table/sprites.h table/station_land.h table/strgen_tables.h ../objs/langs/table/strings.h +table/townname.h table/town_land.h table/track_land.h table/train_cmd.h diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index ee9216cdc..9b5303c0e 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -35,7 +35,7 @@ #include "table/strings.h" #include "../table/engines.h" -#include "../table/namegen.h" +#include "../table/townname.h" static bool _read_ttdpatch_flags; diff --git a/src/strings.cpp b/src/strings.cpp index 29fbfb41b..437619480 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -13,7 +13,7 @@ #include "openttd.h" #include "currency.h" #include "spritecache.h" -#include "namegen_func.h" +#include "townname_func.h" #include "station_base.h" #include "town.h" #include "screenshot.h" diff --git a/src/table/namegen.h b/src/table/townname.h index 47c9ff05f..389530081 100644 --- a/src/table/namegen.h +++ b/src/table/townname.h @@ -7,7 +7,7 @@ * 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 table/namegen.h Namepart tables for the town name generator */ +/** @file table/townname.h Namepart tables for the town name generator */ #include "../core/enum_type.hpp" diff --git a/src/namegen.cpp b/src/townname.cpp index 211e21d9b..ec63267b8 100644 --- a/src/namegen.cpp +++ b/src/townname.cpp @@ -7,14 +7,14 @@ * 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 namegen.cpp Town name generators. */ +/** @file townname.cpp Town name generators. */ #include "stdafx.h" -#include "namegen_func.h" +#include "townname_func.h" #include "string_func.h" #include "core/alloc_func.hpp" -#include "table/namegen.h" +#include "table/townname.h" /** diff --git a/src/namegen_func.h b/src/townname_func.h index 7ce83fc41..d0e2da77c 100644 --- a/src/namegen_func.h +++ b/src/townname_func.h @@ -7,7 +7,7 @@ * 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 namegen_func.h Town name generator stuff. */ +/** @file townname_func.h Town name generator stuff. */ #ifndef NAMEGEN_FUNC_H #define NAMEGEN_FUNC_H |