mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r1415) Move TILE_FROM_XY and TILE_XY to map.h and push TILE_[XY] bits from map.h into map.c. 

Now the whole source except map.c is independent of TILE_[XY]_BITS!
release/0.4.5
tron 2005-01-07 17:40:23 +00:00
parent 7ca6b2b8b0
commit 35972e68e1
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
landscape.c
View File

@ -454,8 +454,8 @@ uint GetMapExtraBits(uint tile)
#define TILELOOP_BITS 4 #define TILELOOP_BITS 4
#define TILELOOP_SIZE (1 << TILELOOP_BITS) #define TILELOOP_SIZE (1 << TILELOOP_BITS)
#define TILELOOP_ASSERTMASK ((TILELOOP_SIZE-1) + ((TILELOOP_SIZE-1) << TILE_X_BITS)) #define TILELOOP_ASSERTMASK ((TILELOOP_SIZE-1) + ((TILELOOP_SIZE-1) << MapLogX()))
#define TILELOOP_CHKMASK (((1 << (TILE_X_BITS - TILELOOP_BITS))-1) << TILELOOP_BITS) #define TILELOOP_CHKMASK (((1 << (MapLogX() - TILELOOP_BITS))-1) << TILELOOP_BITS)
void RunTileLoop() void RunTileLoop()
{ {
@ -538,7 +538,7 @@ static void GenerateTerrain(int type, int flag)
p = GetSpritePtr((((r >> 24) * _genterrain_tbl_1[type]) >> 8) + _genterrain_tbl_2[type] + 4845); p = GetSpritePtr((((r >> 24) * _genterrain_tbl_1[type]) >> 8) + _genterrain_tbl_2[type] + 4845);
x = r & MapMaxX(); x = r & MapMaxX();
y = (r >> TILE_X_BITS) & MapMaxY(); y = (r >> MapLogX()) & MapMaxY();
if (x < 2 || y < 2) if (x < 2 || y < 2)

5
macros.h
View File

@ -70,9 +70,6 @@ static inline int64 BIGMULS(int32 a, int32 b) {
#define LANDSCAPE_SIZE_FACTOR 1 #define LANDSCAPE_SIZE_FACTOR 1
#define TILE_FROM_XY(x,y) (int)((((y) >> 4) << TILE_X_BITS) + ((x) >> 4))
#define TILE_XY(x,y) (int)(((y) << TILE_X_BITS) + (x))
#define IS_TILETYPE(_t_, _s_) (_map_type_and_height[(_t_)] >> 4 == (_s_)) #define IS_TILETYPE(_t_, _s_) (_map_type_and_height[(_t_)] >> 4 == (_s_))
#define GET_TILETYPE(_t_) (_map_type_and_height[(_t_)] >> 4) #define GET_TILETYPE(_t_) (_map_type_and_height[(_t_)] >> 4)
#define GET_TILEHEIGHT(_t_) ((_map_type_and_height[_t_] & 0xF) * 8) #define GET_TILEHEIGHT(_t_) ((_map_type_and_height[_t_] & 0xF) * 8)
@ -86,7 +83,7 @@ enum {
extern uint SafeTileAdd(uint x, int add, const char *exp, const char *file, int line); extern uint SafeTileAdd(uint x, int add, const char *exp, const char *file, int line);
#if !defined(_DEBUG) || TILE_X_BITS != 8 #if !defined(_DEBUG)
# define TILE_ADD(x,y) ((x)+(y)) # define TILE_ADD(x,y) ((x)+(y))
#else #else
# if defined(__GNUC__) # if defined(__GNUC__)

3
map.c
View File

@ -2,6 +2,9 @@
#include "ttd.h" #include "ttd.h"
#include "map.h" #include "map.h"
#define TILE_X_BITS 8
#define TILE_Y_BITS 8
uint _map_log_x = TILE_X_BITS; uint _map_log_x = TILE_X_BITS;
uint _map_log_y = TILE_Y_BITS; uint _map_log_y = TILE_Y_BITS;

4
map.h
View File

@ -1,8 +1,8 @@
#ifndef MAP_H #ifndef MAP_H
#define MAP_H #define MAP_H
#define TILE_X_BITS 8 #define TILE_FROM_XY(x,y) (int)((((y) >> 4) << MapLogX()) + ((x) >> 4))
#define TILE_Y_BITS 8 #define TILE_XY(x,y) (int)(((y) << MapLogX()) + (x))
#define TILE_MASK(x) (int)((x) & ((1 << (MapLogX() + MapLogY())) - 1)) #define TILE_MASK(x) (int)((x) & ((1 << (MapLogX() + MapLogY())) - 1))