mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

add global macro: gGrassSceneryTileLoopPosition

Browse Source
This commit is contained in:
Ted John
2016-04-24 14:33:43 +01:00
parent d18ea8570d
commit 15031b9511
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/world/map.c
View File

@@ -326,7 +326,7 @@ void map_init(int size)
map_element_set_terrain_edge(map_element, TERRAIN_EDGE_ROCK);
}
RCT2_GLOBAL(RCT2_ADDRESS_GRASS_SCENERY_TILEPOS, sint16) = 0;
gGrassSceneryTileLoopPosition = 0;
gWidePathTileLoopX = 0;
gWidePathTileLoopY = 0;
gMapSizeUnits = size * 32 - 32;
@@ -4232,7 +4232,7 @@ void map_update_tiles()
int x = 0;
int y = 0;
uint16 interleaved_xy = RCT2_GLOBAL(RCT2_ADDRESS_GRASS_SCENERY_TILEPOS, sint16);
uint16 interleaved_xy = gGrassSceneryTileLoopPosition;
for (int i = 0; i < 8; i++) {
x = (x << 1) | (interleaved_xy & 1);
interleaved_xy >>= 1;
@@ -4246,8 +4246,8 @@ void map_update_tiles()
scenery_update_tile(x * 32, y * 32);
}
RCT2_GLOBAL(RCT2_ADDRESS_GRASS_SCENERY_TILEPOS, sint16)++;
RCT2_GLOBAL(RCT2_ADDRESS_GRASS_SCENERY_TILEPOS, sint16) &= 0xFFFF;
gGrassSceneryTileLoopPosition++;
gGrassSceneryTileLoopPosition &= 0xFFFF;
}
}

5
src/world/map.h
View File

@@ -267,8 +267,9 @@ typedef struct {
extern const rct_xy16 TileDirectionDelta[];
#define gWidePathTileLoopX RCT2_GLOBAL(0x013CE774, uint16)
#define gWidePathTileLoopY RCT2_GLOBAL(0x013CE776, uint16)
#define gWidePathTileLoopX RCT2_GLOBAL(0x013CE774, uint16)
#define gWidePathTileLoopY RCT2_GLOBAL(0x013CE776, uint16)
#define gGrassSceneryTileLoopPosition RCT2_GLOBAL(RCT2_ADDRESS_GRASS_SCENERY_TILEPOS, uint16)
#define gMapSizeUnits RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE_UNITS, sint16)
#define gMapSizeMinus2 RCT2_GLOBAL(RCT2_ADDRESS_MAP_SIZE_MINUS_2, sint16)