(svn r1117) Move map arrays and some related macros into their own files map.c and map.h

2025-03-06 06:15:04 +00:00 · 2004-12-15 22:18:54 +00:00 · 2004-12-15 22:18:54 +00:00 · 765ecfed84
commit 765ecfed84
parent 736718ef53
53 changed files with 81 additions and 23 deletions
--- a/1
+++ b/1
@ -575,6 +575,7 @@ C_SOURCES += industry_gui.c
 C_SOURCES += intro_gui.c
 C_SOURCES += landscape.c
 C_SOURCES += main_gui.c
+C_SOURCES += map.c
 C_SOURCES += md5.c
 C_SOURCES += minilzo.c
 C_SOURCES += misc.c
--- a/ai.c
+++ b/ai.c
@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "map.h"
 #include "player.h"
 #include "vehicle.h"
 #include "engine.h"
--- a/ai_build.c
+++ b/ai_build.c
@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "map.h"
 #include "command.h"
 #include "ai.h"
 #include "engine.h"
--- a/ai_new.c
+++ b/ai_new.c
@ -16,6 +16,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "command.h"
 #include "ai.h"
 #include "town.h"
--- a/ai_pathfinder.c
+++ b/ai_pathfinder.c
@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "map.h"
 #include "command.h"
 #include "ai.h"

--- a/ai_shared.c
+++ b/ai_shared.c
@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "map.h"
 #include "ai.h"
 #include "vehicle.h"

--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "engine.h"
 #include "command.h"
--- a/aircraft_gui.c
+++ b/aircraft_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "vehicle.h"
--- a/airport.c
+++ b/airport.c
@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "map.h"
 #include "airport.h"

 AirportFTAClass *CountryAirport;
--- a/airport_gui.c
+++ b/airport_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
--- a/bridge_gui.c
+++ b/bridge_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
--- a/clear_cmd.c
+++ b/clear_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "viewport.h"
 #include "command.h"

--- a/command.c
+++ b/command.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "gui.h"
 #include "command.h"
 #include "player.h"
--- a/disaster_cmd.c
+++ b/disaster_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "command.h"
 #include "news.h"
--- a/dock_gui.c
+++ b/dock_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "station.h"
 #include "gui.h"
--- a/economy.c
+++ b/economy.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "news.h"
 #include "player.h"
 #include "station.h"
--- a/industry_cmd.c
+++ b/industry_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "viewport.h"
 #include "command.h"
 #include "industry.h"
--- a/industry_gui.c
+++ b/industry_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 //#include "gui.h"
 #include "window.h"
 #include "gfx.h"
--- a/landscape.c
+++ b/landscape.c
@ -1,19 +1,12 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "map.h"
 #include <stdarg.h>
 #include "gfx.h"
 #include "viewport.h"
 #include "command.h"
 #include "vehicle.h"

-byte _map_type_and_height[TILES_X * TILES_Y];
-byte _map5[TILES_X * TILES_Y];
-byte _map3_lo[TILES_X * TILES_Y];
-byte _map3_hi[TILES_X * TILES_Y];
-byte _map_owner[TILES_X * TILES_Y];
-byte _map2[TILES_X * TILES_Y];
-byte _map_extra_bits[TILES_X * TILES_Y/4];
-
 extern const TileTypeProcs
 	_tile_type_clear_procs,
 	_tile_type_rail_procs,
--- a/macros.h
+++ b/macros.h
@ -66,8 +66,6 @@ static inline int64 BIGMULS(int32 a, int32 b) {
 //#define IS_INSIDE_1D(x, base, size) ((x) >= (base) && (x) < (base) + (size))
 #define IS_INSIDE_1D(x, base, size) ( (uint)((x) - (base)) < ((uint)(size)) )

-#define TILE_X_BITS 8
-#define TILE_Y_BITS 8
 #define LANDSCAPE_SIZE_FACTOR 1

 #define TILE_FROM_XY(x,y) (int)((((y) >> 4) << TILE_X_BITS) + ((x) >> 4))
@ -82,12 +80,6 @@ enum {
 };
 #define CORRECT_Z(tileh) (CORRECT_Z_BITS & (1 << tileh))

-#define TILES_X (1 << TILE_X_BITS)
-#define TILES_Y (1 << TILE_Y_BITS)
-
-#define TILE_X_MAX (TILES_X-1)
-#define TILE_Y_MAX (TILES_Y-1)
-
 #define TILE_ASSERT(x) assert( TILE_MASK(x) == (x) );

 extern uint SafeTileAdd(uint x, int add, const char *exp, const char *file, int line);
--- a/main_gui.c
+++ b/main_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
--- a/map.c
+++ b/map.c
@ -0,0 +1,11 @@
+#include "stdafx.h"
+#include "ttd.h"
+#include "map.h"
+
+byte _map_type_and_height[TILES_X * TILES_Y];
+byte _map5[TILES_X * TILES_Y];
+byte _map3_lo[TILES_X * TILES_Y];
+byte _map3_hi[TILES_X * TILES_Y];
+byte _map_owner[TILES_X * TILES_Y];
+byte _map2[TILES_X * TILES_Y];
+byte _map_extra_bits[TILES_X * TILES_Y / 4];
--- a/map.h
+++ b/map.h
@ -0,0 +1,21 @@
+#ifndef MAP_H
+#define MAP_H
+
+#define TILE_X_BITS 8
+#define TILE_Y_BITS 8
+
+#define TILES_X (1 << TILE_X_BITS)
+#define TILES_Y (1 << TILE_Y_BITS)
+
+#define TILE_X_MAX (TILES_X - 1)
+#define TILE_Y_MAX (TILES_Y - 1)
+
+extern byte _map_type_and_height[TILES_X * TILES_Y];
+extern byte _map5[TILES_X * TILES_Y];
+extern byte _map3_lo[TILES_X * TILES_Y];
+extern byte _map3_hi[TILES_X * TILES_Y];
+extern byte _map_owner[TILES_X * TILES_Y];
+extern byte _map2[TILES_X * TILES_Y];
+extern byte _map_extra_bits[TILES_X * TILES_Y / 4];
+
+#endif
--- a/misc.c
+++ b/misc.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "gfx.h"
 #include "assert.h"
--- a/misc_gui.c
+++ b/misc_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
--- a/network.c
+++ b/network.c
@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include "map.h"
 #include "network_data.h"

 #if defined(WITH_REV)
--- a/oldloader.c
+++ b/oldloader.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "town.h"
 #include "industry.h"
 #include "station.h"
--- a/order_gui.c
+++ b/order_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
--- a/pathfind.c
+++ b/pathfind.c
@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "map.h"
 #include "pathfind.h"

 // remember which tiles we have already visited so we don't visit them again.
--- a/players.c
+++ b/players.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "player.h"
 #include "town.h"
 #include "vehicle.h"
--- a/rail_cmd.c
+++ b/rail_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
--- a/rail_gui.c
+++ b/rail_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
--- a/road_cmd.c
+++ b/road_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
--- a/road_gui.c
+++ b/road_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "viewport.h"
--- a/roadveh_cmd.c
+++ b/roadveh_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "engine.h"
 #include "command.h"
--- a/roadveh_gui.c
+++ b/roadveh_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
--- a/ship_cmd.c
+++ b/ship_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "command.h"
 #include "pathfind.h"
--- a/ship_gui.c
+++ b/ship_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
--- a/smallmap_gui.c
+++ b/smallmap_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "gui.h"
 #include "window.h"
 #include "gfx.h"
--- a/sound.c
+++ b/sound.c
@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "map.h"
 #include "sound.h"
 #include "vehicle.h"
 #include "window.h"
--- a/station_cmd.c
+++ b/station_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "station.h"
 #include "gfx.h"
 #include "window.h"
--- a/town_cmd.c
+++ b/town_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "viewport.h"
 #include "town.h"
 #include "command.h"
--- a/train_cmd.c
+++ b/train_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "command.h"
 #include "pathfind.h"
--- a/train_gui.c
+++ b/train_gui.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "window.h"
 #include "gui.h"
 #include "gfx.h"
--- a/tree_cmd.c
+++ b/tree_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "viewport.h"
 #include "command.h"
 #include "town.h"
--- a/ttd.c
+++ b/ttd.c
@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "table/strings.h"
+#include "map.h"

 #define VARDEF
 #include "ttd.h"
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
--- a/unmovable_cmd.c
+++ b/unmovable_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "command.h"
 #include "viewport.h"
 #include "player.h"
--- a/variables.h
+++ b/variables.h
@ -384,13 +384,6 @@ static inline uint32 GetDParam(uint n)

 /* landscape.c */
 extern const byte _tileh_to_sprite[32];
-extern byte _map_type_and_height[TILES_X * TILES_Y];
-extern byte _map5[TILES_X * TILES_Y];
-extern byte _map3_lo[TILES_X * TILES_Y];
-extern byte _map3_hi[TILES_X * TILES_Y];
-extern byte _map_owner[TILES_X * TILES_Y];
-extern byte _map2[TILES_X * TILES_Y];
-extern byte _map_extra_bits[TILES_X * TILES_Y/4];

 static const byte _inclined_tileh[] = {
 	3,9,3,6,12,6,12,9,
--- a/vehicle.c
+++ b/vehicle.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "gfx.h"
 //#include "station.h"
--- a/viewport.c
+++ b/viewport.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "viewport.h"
 #include "window.h"
 #include "vehicle.h"
--- a/water_cmd.c
+++ b/water_cmd.c
@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "ttd.h"
 #include "table/strings.h"
+#include "map.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "command.h"
--- a/window.c
+++ b/window.c
@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "ttd.h"
+#include "map.h"
 #include "window.h"
 #include "gfx.h"
 #include "viewport.h"