mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00
Code Issues Releases Wiki Activity

implement more viewport input functions

Browse Source
This commit is contained in:
IntelOrca
2014-11-05 14:38:19 +00:00
parent ad84e6d076
commit 2f4fd67170
5 changed files with 174 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

237
src/input.c
View File

@@ -28,6 +28,7 @@
#include "interface/viewport.h"
#include "interface/widget.h"
#include "interface/window.h"
#include "localisation/localisation.h"
#include "platform/osinterface.h"
#include "tutorial.h"
#include "windows/tooltip.h"
@@ -53,6 +54,8 @@ void process_mouse_over(int x, int y);
void process_mouse_tool(int x, int y);
void invalidate_scroll();
static rct_mouse_data* get_mouse_input();
void map_element_right_click(int type, rct_map_element *mapElement, int x, int y);
int sub_6EDE88(int x, int y, rct_map_element **mapElement, int *outX, int *outY);
#pragma region Scroll bar input
@@ -815,80 +818,17 @@ static void game_handle_input_mouse(int x, int y, int state)
if (RCT2_GLOBAL(0x009DE540, sint16) < 500) {
// Right click
{
int eax, ebx, ecx, esi, edi, ebp;
rct_map_element* map_element;
rct_scenery_entry* scenery_entry;
eax = RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_LAST_X, sint16);
ebx = RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_LAST_Y, sint16);
RCT2_CALLFUNC_X(0x006EDE88, &eax, &ebx, &ecx, (int*)&map_element, &esi, &edi, &ebp);
switch (ebx & 0xFF) {
case 2:
if (map_element->type == 0)
RCT2_CALLPROC_X(0x006B4857, eax, 0, ecx, (int)map_element, 0, 0, 0);
break;
case 3:
ride_modify(map_element, eax, ecx);
break;
case 5:
RCT2_CALLPROC_X(0x006E08D2, eax, 0, ecx, (int)map_element, 0, 0, 0);
break;
case 6:
RCT2_CALLPROC_X(0x006A614A, eax, 0, ecx, (int)map_element, 0, 0, 0);
break;
case 7:
RCT2_CALLPROC_X(0x006A61AB, eax, 0, ecx, (int)map_element, 0, 0, 0);
break;
case 8:
RCT2_CALLPROC_X(0x00666C0E, eax, 0, ecx, (int)map_element, 0, 0, 0);
break;
case 9:
//0x006e57a9
scenery_entry = g_wallSceneryEntries[map_element->properties.fence.slope];
if (scenery_entry->wall.var_0D != 0xFF){
window_sign_small_open(map_element->properties.fence.item[0]);
}
else{
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_STRING_ID, rct_string_id) = 1158;
game_do_command(
eax,
1,
ecx,
(map_element->type & 0x3) | (map_element->base_height << 8),
GAME_COMMAND_REMOVE_FENCE,
0,
0);
}
break;
case 10:
//0x006B88DC
ebx = map_element->properties.scenerymultiple.type;
ebx |= (map_element->properties.scenerymultiple.index & 0x3) << 8;
scenery_entry = g_largeSceneryEntries[ebx];
int x, y, type;
rct_map_element* mapElement;
if (scenery_entry->large_scenery.var_11 != 0xFF){
int id = (map_element->type & 0xC0) |
((map_element->properties.scenerymultiple.colour[0] & 0xE0) >> 2) |
((map_element->properties.scenerymultiple.colour[1] & 0xE0) >> 5);
window_sign_open(id);
}
else{
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_STRING_ID, rct_string_id) = 1158;
game_do_command(
eax,
1 | ((map_element->type & 0x3) << 8),
ecx,
map_element->base_height | ((map_element->properties.scenerymultiple.index >> 2) << 8),
GAME_COMMAND_44,
0,
0);
}
break;
case 12:
window_banner_open(map_element->properties.banner.index);
break;
default:
break;
}
type = sub_6EDE88(
RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_LAST_X, sint16),
RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_DRAG_LAST_Y, sint16),
&mapElement,
&x,
&y
);
map_element_right_click(type, mapElement, x, y);
}
}
}
@@ -2012,3 +1952,154 @@ static rct_mouse_data* get_mouse_input()
RCT2_GLOBAL(RCT2_ADDRESS_MOUSE_READ_INDEX, uint32) = (read_index + 1) % 64;
return &mouse_buffer[read_index];
}
static void sub_6E57A9(rct_map_element *mapElement, int x, int y)
{
rct_scenery_entry* sceneryEntry;
sceneryEntry = g_wallSceneryEntries[mapElement->properties.fence.slope];
if (sceneryEntry->wall.var_0D != 0xFF){
window_sign_small_open(mapElement->properties.fence.item[0]);
} else {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_STRING_ID, rct_string_id) = 1158;
game_do_command(
x,
1,
y,
(mapElement->type & 0x3) | (mapElement->base_height << 8),
GAME_COMMAND_REMOVE_FENCE,
0,
0
);
}
}
static void sub_6B88DC(rct_map_element *mapElement, int x, int y)
{
int ebx;
rct_scenery_entry* sceneryEntry;
ebx = mapElement->properties.scenerymultiple.type;
ebx |= (mapElement->properties.scenerymultiple.index & 0x3) << 8;
sceneryEntry = g_largeSceneryEntries[ebx];
if (sceneryEntry->large_scenery.var_11 != 0xFF){
int id = (mapElement->type & 0xC0) |
((mapElement->properties.scenerymultiple.colour[0] & 0xE0) >> 2) |
((mapElement->properties.scenerymultiple.colour[1] & 0xE0) >> 5);
window_sign_open(id);
} else {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_STRING_ID, rct_string_id) = 1158;
game_do_command(
x,
1 | ((mapElement->type & 0x3) << 8),
y,
mapElement->base_height | ((mapElement->properties.scenerymultiple.index >> 2) << 8),
GAME_COMMAND_44,
0,
0
);
}
}
static void sub_6A614A(rct_map_element *mapElement, int x, int y)
{
int z;
rct_window *w;
rct_map_element *mapElement2;
z = mapElement->base_height;
w = window_find_by_class(WC_FOOTPATH);
if (w != NULL)
RCT2_CALLPROC_EBPSAFE(0x006A7831);
mapElement2 = TILE_MAP_ELEMENT_POINTER((y / 32) * 256 + (x / 32));
do {
if ((mapElement2->type & MAP_ELEMENT_TYPE_MASK) == MAP_ELEMENT_TYPE_PATH && mapElement2->base_height == z) {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = STR_CANT_REMOVE_FOOTPATH_FROM_HERE;
game_do_command(x, 1, y, z, GAME_COMMAND_REMOVE_PATH, 0, 0);
}
} while (!((mapElement2++)->flags & MAP_ELEMENT_FLAG_LAST_TILE));
}
static void sub_6E08D2(rct_map_element *mapElement, int x, int y)
{
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = STR_CANT_REMOVE_THIS;
game_do_command(
x,
(mapElement->type << 8) | 1,
y,
(mapElement->properties.scenery.type << 8) | mapElement->base_height,
GAME_COMMAND_REMOVE_SCENERY,
0,
0
);
}
static void sub_6A61AB(rct_map_element *mapElement, int x, int y)
{
int type;
type = mapElement->properties.scenery.type >> 4;
if (mapElement->type & 0x80)
type |= 0x80;
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, uint16) = STR_CANT_REMOVE_THIS;
game_do_command(
x,
((mapElement->properties.scenery.type & 7) << 8) | 1,
y,
(type << 8) | mapElement->base_height,
GAME_COMMAND_PLACE_PATH,
0,
0
);
}
int sub_6EDE88(int x, int y, rct_map_element **outMapElement, int *outX, int *outY)
{
int eax, ebx, ecx, edx, esi, edi, ebp;
eax = x;
ebx = y;
RCT2_CALLFUNC_X(0x006EDE88, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
*outMapElement = (rct_map_element*)edx;
*outX = eax & 0xFFFF;
*outY = ecx & 0xFFFF;
return ebx & 0xFF;
}
void map_element_right_click(int type, rct_map_element *mapElement, int x, int y)
{
switch (type) {
case 2:
if (mapElement->type == 0)
RCT2_CALLPROC_X(0x006B4857, x, 0, y, (int)mapElement, 0, 0, 0);
break;
case 3:
ride_modify(mapElement, x, y);
break;
case 5:
sub_6E08D2(mapElement, x, y);
break;
case 6:
sub_6A614A(mapElement, x, y);
break;
case 7:
sub_6A61AB(mapElement, x, y);
break;
case 8:
RCT2_CALLPROC_X(0x00666C0E, x, 0, y, (int)mapElement, 0, 0, 0);
break;
case 9:
sub_6E57A9(mapElement, x, y);
break;
case 10:
sub_6B88DC(mapElement, x, y);
break;
case 12:
window_banner_open(mapElement->properties.banner.index);
break;
}
}

1
src/localisation/string_ids.h
View File

@@ -271,6 +271,7 @@ enum {
STR_FULL_LOAD = 1151,
STR_ANY_LOAD = 1152,
STR_CANT_REMOVE_THIS = 1158,
STR_PLACE_SCENERY_TIP = 1159,
STR_ADJUST_WATER_TIP = 1160,

14
src/ride/ride.c
View File

@@ -706,12 +706,6 @@ void sub_6C683D(int x, int y, int z, int direction, int type, int esi, int edi,
RCT2_CALLPROC_X(0x006C683D, x, (direction << 8) | type, y, z, esi, edi, ebp);
}
void sub_6CE254()
{
RCT2_CALLPROC_X(0x006CE254, 0, 0, 0, 0, 0, 0, 0);
}
void sub_6C96C0()
{
RCT2_CALLPROC_X(0x006C96C0, 0, 0, 0, 0, 0, 0, 0);
@@ -735,7 +729,13 @@ static void sub_6C9627()
case 6:
case 7:
case 8:
sub_6CE254();
if (RCT2_GLOBAL(0x00F440B0, uint8) & 1) {
map_invalidate_tile_full(
RCT2_GLOBAL(0x00F440A8, uint16) & 0xFFE0,
RCT2_GLOBAL(0x00F440AA, uint16) & 0xFFE0
);
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16) &= ~4;
}
break;
default:
if (RCT2_GLOBAL(0x00F440B0, uint8) & 1) {

2
src/world/map.c
View File

@@ -525,7 +525,7 @@ money32 map_try_clear_scenery(int x, int y, rct_map_element *mapElement, int fla
// Check if the land is owned
if (!(RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_SCENARIO_EDITOR))
if (sub_664F72(x, y, RCT2_GLOBAL(0x009DEA62, uint32)))
if (!sub_664F72(x, y, RCT2_GLOBAL(0x009DEA62, uint32)))
return MONEY32_UNDEFINED;
}

2
src/world/scenery.h
View File

@@ -28,7 +28,7 @@ typedef struct {
uint8 height; // 0x0A
uint8 tool_id; // 0x0B
uint16 price; // 0x0C
uint16 removal_price; // 0x0E
sint16 removal_price; // 0x0E
uint8 pad_10[0x0A];
uint8 scenery_tab_id; // 0x1A
} rct_small_scenery_entry;