mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Name more addresses

This commit is contained in:
medsouz 2015-08-18 23:53:24 -04:00
parent 958f2fb296
commit 4207b41855
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/addresses.h
View File

@ -350,10 +350,11 @@
#define RCT2_ADDRESS_TRACK_LIST 0x00F441EC
#define RCT2_ADDRESS_SCENERY_COST 0x00F64EB4
#define RCT2_ADDRESS_SCENERY_MAP_ELEMENT 0x00F64EBC
#define RCT2_ADDRESS_GHOST_SCENERY_X 0x00F64EC4
#define RCT2_ADDRESS_GHOST_SCENERY_Y 0x00F64EC6
#define RCT2_ADDRESS_GHOST_SCENERY_Z 0x00F64F09
#define RCT2_ADDRESS_SCENERY_MAP_ELEMENT_TYPE 0x00F64F0C
#define RCT2_ADDRESS_GHOST_SCENERY_TYPE 0x00F64F0D
#define RCT2_ADDRESS_CTRL_PRESS_Z_COORDINATE 0x00F64ECC
@ -361,6 +362,7 @@
#define RCT2_ADDRESS_SHIFT_PRESS_Y_COORDINATE 0x00F64ED0
#define RCT2_ADDRESS_SHIFT_PRESS_Z_VECTOR 0x00F64ED2
#define RCT2_ADDRESS_SCENERY_Z_COORDINATE 0x00F64ED4
#define RCT2_ADDRESS_SCENERY_SELECTED_OBJECT 0x00F64EDA
#define RCT2_ADDRESS_SCENERY_TOOL_CTRL_PRESSED 0x00F64F12
#define RCT2_ADDRESS_SCENERY_TOOL_SHIFT_PRESSED 0x00F64F13

18
src/windows/top_toolbar.c
View File

@ -2091,11 +2091,11 @@ money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 pa
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_X, sint16) = map_tile.x;
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) = map_tile.y;
RCT2_GLOBAL(0x00F64EC0, uint16) = (uint16)(parameter_3 & 0xFFFF);
RCT2_GLOBAL(0x00F64EDA, sint16) = selected_tab;
mapElement = RCT2_GLOBAL(0x00F64EBC, rct_map_element*);
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_SELECTED_OBJECT, sint16) = selected_tab;
mapElement = RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT, rct_map_element*);
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Z, uint8) = mapElement->base_height;
RCT2_GLOBAL(0x00F64F0C, uint8) = mapElement->type;
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT_TYPE, uint8) = mapElement->type;
if (RCT2_GLOBAL(0x00F64F14, uint8) & (1 << 1)){
viewport_set_visibility(4);
}
@ -2148,7 +2148,7 @@ money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 pa
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) = map_tile.y;
RCT2_GLOBAL(0x00F64F11, uint8) = (parameter_2 & 0xFF);
mapElement = RCT2_GLOBAL(0x00F64EBC, rct_map_element*);
mapElement = RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT, rct_map_element*);
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Z, uint8) = mapElement->base_height;
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_TYPE, uint8) |= (1 << 2);
@ -2172,7 +2172,7 @@ money32 try_place_ghost_scenery(rct_xy16 map_tile, uint32 parameter_1, uint32 pa
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) = map_tile.y;
RCT2_GLOBAL(0x00F64EC0, uint8) = ((parameter_1 >> 8) & 0xFF);
mapElement = RCT2_GLOBAL(0x00F64EBC, rct_map_element*);
mapElement = RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT, rct_map_element*);
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Z, uint8) = mapElement->base_height;
if (RCT2_GLOBAL(0x00F64F14, uint8) & (1 << 1)){
@ -2269,7 +2269,7 @@ void top_toolbar_tool_update_scenery(sint16 x, sint16 y){
mapTile.y == RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) &&
(parameter2 & 0xFF) == RCT2_GLOBAL(0x00F64F0E, uint8)&&
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_Z_COORDINATE, sint16) == RCT2_GLOBAL(0x00F64F0A, sint16) &&
RCT2_GLOBAL(0x00F64EDA, uint16) == selected_tab){
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_SELECTED_OBJECT, uint16) == selected_tab){
return;
}
@ -2404,13 +2404,13 @@ void top_toolbar_tool_update_scenery(sint16 x, sint16 y){
mapTile.x == RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_X, sint16) &&
mapTile.y == RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_Y, sint16) &&
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_Z_COORDINATE, sint16) == RCT2_GLOBAL(0x00F64F0A, sint16) &&
(parameter3 & 0xFFFF) == RCT2_GLOBAL(0x00F64EDA, uint16)){
(parameter3 & 0xFFFF) == RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_SELECTED_OBJECT, uint16)){
return;
}
scenery_remove_ghost_tool_placement();
RCT2_GLOBAL(0x00F64EDA, uint16) = (parameter3 & 0xFFFF);
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_SELECTED_OBJECT, uint16) = (parameter3 & 0xFFFF);
RCT2_GLOBAL(0x00F64F0A, sint16) = RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_Z_COORDINATE, sint16);
bl = 1;

6
src/world/map.c
View File

@ -2383,7 +2383,7 @@ void game_command_place_scenery(int* eax, int* ebx, int* ecx, int* edx, int* esi
if(*ebx & GAME_COMMAND_FLAG_APPLY){
int flags = (bl & 0xf);
rct_map_element* new_map_element = map_element_insert(x / 32, y / 32, zLow, flags);
RCT2_GLOBAL(0x00F64EBC, rct_map_element*) = new_map_element;
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT, rct_map_element*) = new_map_element;
uint8 type = quadrant << 6;
type |= MAP_ELEMENT_TYPE_SCENERY;
type |= rotation;
@ -2681,7 +2681,7 @@ void game_command_place_fence(int* eax, int* ebx, int* ecx, int* edx, int* esi,
map_element->flags |= MAP_ELEMENT_FLAG_GHOST;
}
RCT2_GLOBAL(0x00F64EBC, rct_map_element*) = map_element;
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT, rct_map_element*) = map_element;
map_invalidate_tile_zoom1(position.x, position.y, map_element->base_height * 8, map_element->base_height * 8 + 72);
}
@ -2897,7 +2897,7 @@ void game_command_place_large_scenery(int* eax, int* ebx, int* ecx, int* edx, in
new_map_element->flags |= MAP_ELEMENT_FLAG_GHOST;
}
if(tile_num == 0){
RCT2_GLOBAL(0x00F64EBC, rct_map_element*) = new_map_element;
RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT, rct_map_element*) = new_map_element;
}
map_invalidate_tile_full(x2, y2);
}

8
src/world/scenery.c
View File

@ -126,9 +126,9 @@ void scenery_remove_ghost_tool_placement(){
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_TYPE, uint8) &= ~(1 << 0);
game_do_command(
x,
105 | (RCT2_GLOBAL(0x00F64F0C, uint8) << 8),
105 | (RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT_TYPE, uint8) << 8),
y,
z | (RCT2_GLOBAL(0x00F64EDA, uint8) << 8),
z | (RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_SELECTED_OBJECT, uint8) << 8),
GAME_COMMAND_REMOVE_SCENERY,
0,
0);
@ -161,7 +161,7 @@ void scenery_remove_ghost_tool_placement(){
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_TYPE, uint8) &= ~(1 << 2);
game_do_command(
x,
105 | (RCT2_GLOBAL(0x00F64F0C, uint8) << 8),
105 | (RCT2_GLOBAL(RCT2_ADDRESS_SCENERY_MAP_ELEMENT_TYPE, uint8) << 8),
y,
RCT2_GLOBAL(0x00F64F11, uint8) |(z << 8),
GAME_COMMAND_REMOVE_FENCE,
@ -173,7 +173,7 @@ void scenery_remove_ghost_tool_placement(){
RCT2_GLOBAL(RCT2_ADDRESS_GHOST_SCENERY_TYPE, uint8) &= ~(1 << 3);
game_do_command(
x,
105 | (RCT2_GLOBAL(0x00F64EC0, uint8) << 8),
105 | (RCT2_GLOBAL(0x00F64EC0 /* rotation? */, uint8) << 8),
y,
z,
GAME_COMMAND_REMOVE_LARGE_SCENERY,