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

Park Window Toggling

Browse Source
This commit is contained in:
Robert Jordan
2015-05-15 11:53:28 -04:00
parent 09cc46c1e6
commit f18524151c
2 changed files with 276 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
src/windows/land_rights.c
View File

@@ -26,6 +26,7 @@
#include "../localisation/localisation.h"
#include "../sprites.h"
#include "../world/map.h"
#include "../game.h"
const int MAX_LAND_RIGHTS_SIZE = 7;
@@ -62,6 +63,10 @@ static void window_land_rights_invalidate();
static void window_land_rights_paint();
static void window_land_rights_textinput();
static void window_land_rights_inputsize(rct_window *w);
static void window_land_rights_toolupdate();
static void window_land_rights_tooldown();
static void window_land_rights_tooldrag();
static void window_land_rights_toolabort();
static void* window_land_rights_events[] = {
window_land_rights_close,
@@ -73,11 +78,11 @@ static void* window_land_rights_events[] = {
window_land_rights_update,
window_land_rights_emptysub,
window_land_rights_emptysub,
window_land_rights_toolupdate,
window_land_rights_tooldown,
window_land_rights_tooldrag,
window_land_rights_emptysub,
window_land_rights_emptysub,
window_land_rights_emptysub,
window_land_rights_emptysub,
window_land_rights_emptysub,
window_land_rights_toolabort,
window_land_rights_emptysub,
window_land_rights_emptysub,
window_land_rights_emptysub,
@@ -119,15 +124,15 @@ void window_land_rights_open()
window->colours[2] = 19;
show_land_rights();
show_gridlines();
//show_gridlines();
}
static void window_land_rights_close()
{
if (LandRightsMode)
hide_land_rights();
else
hide_construction_rights();
//if (LandRightsMode)
// hide_land_rights();
//else
// hide_construction_rights();
// If the tool wasn't changed, turn tool off
if (!window_land_rights_should_close())
tool_cancel();
@@ -277,17 +282,162 @@ static void window_land_rights_paint()
gfx_draw_string_centred(dpi, 986, x, y, 0, (void*)0x00F1AD62);
}
/**
*
* rct2: 0x0066D125
*/
static int window_land_rights_should_close()
{
if (!(RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_TOOL_ACTIVE))
return 1;
if (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, rct_windowclass) != WC_TOP_TOOLBAR)
if (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, rct_windowclass) != WC_PARK_INFORMATION)
return 1;
if (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) != 14)
if (RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) != 14)
return 1;
return 0;
}
static void window_land_rights_toolupdate()
{
short widgetIndex;
rct_window *w;
short x, y;
window_tool_get_registers(w, widgetIndex, x, y);
switch (widgetIndex){
case WIDX_BUY_LAND_RIGHTS:
RCT2_CALLPROC_X(0x0068E213, x, y, 0, widgetIndex, (int)w, 0, 0);
RCT2_GLOBAL(0x00F1AD62, uint32) = game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
0,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
LandRightsMode ? 0x00E : 0x20F,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
break;
case WIDX_BUY_CONSTRUCTION_RIGHTS:
RCT2_CALLPROC_X(0x0068E213, x, y, 0, widgetIndex, (int)w, 0, 0);
RCT2_GLOBAL(0x00F1AD62, uint32) = game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
0,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
LandRightsMode ? 0x00E : 0x20F,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
break;
}
}
static void window_land_rights_tooldown(){
short widgetIndex;
rct_window* w;
short x, y;
window_tool_get_registers(w, widgetIndex, x, y);
switch (widgetIndex){
case WIDX_BUY_LAND_RIGHTS:
//if (LandRightsMode) {
//screen_pos_to_map_pos(&x, &y, NULL);
if (x != (sint16)0x8000) {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = 0x6BD; // Can't buy land...
//game_do_command(x, 1, y, 0x00E, 35, 0, 0);
game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
1,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
0x00E,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
}
//}
break;
case WIDX_BUY_CONSTRUCTION_RIGHTS:
//else {
//screen_pos_to_map_pos(&x, &y, NULL);
if (x != (sint16)0x8000) {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = 0x6C0; // Can't buy construction rights here...
//game_do_command(x, 1, y, 0x20F, 35, 0, 0);
game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
1,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
0x20F,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
}
//}
break;
}
}
static void window_land_rights_tooldrag()
{
short widgetIndex;
rct_window* w;
short x, y;
window_tool_get_registers(w, widgetIndex, x, y);
switch (widgetIndex){
case WIDX_BUY_LAND_RIGHTS:
//if (LandRightsMode) {
//screen_pos_to_map_pos(&x, &y, NULL);
if (x != (sint16)0x8000) {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = 0x6BD; // Can't buy land...
//game_do_command(x, 1, y, 0x00E, 35, 0, 0);
game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
1,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
0x00E,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
}
//}
break;
case WIDX_BUY_CONSTRUCTION_RIGHTS:
//else {
//screen_pos_to_map_pos(&x, &y, NULL);
if (x != (sint16)0x8000) {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = 0x6C0; // Can't buy construction rights here...
//game_do_command(x, 1, y, 0x20F, 35, 0, 0);
game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
1,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
0x20F,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
}
//}
break;
}
}
static void window_land_rights_toolabort()
{
short widgetIndex;
rct_window *w;
window_widget_get_registers(w, widgetIndex);
if (widgetIndex == WIDX_BUY_LAND_RIGHTS) {
hide_gridlines();
hide_land_rights();
}
else if (widgetIndex == WIDX_BUY_CONSTRUCTION_RIGHTS) {
hide_gridlines();
hide_construction_rights();
}
}

137
src/windows/park.c
View File

@@ -679,6 +679,21 @@ static void window_park_entrance_close()
tool_cancel();
}
void toggle_land_rights_window2(rct_window *topToolbar, int widgetIndex)
{
if ((RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) & INPUT_FLAG_TOOL_ACTIVE) && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WINDOWCLASS, uint8) == 1 && RCT2_GLOBAL(RCT2_ADDRESS_TOOL_WIDGETINDEX, uint16) == 14) {
tool_cancel();
}
else {
show_gridlines();
tool_set(topToolbar, widgetIndex, 19);
RCT2_GLOBAL(RCT2_ADDRESS_INPUT_FLAGS, uint32) |= INPUT_FLAG_6;
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = 1;
window_land_rights_open();
}
}
/**
*
* rct2: 0x0066817C
@@ -705,6 +720,7 @@ static void window_park_entrance_mouseup()
break;
case WIDX_BUY_LAND_RIGHTS:
//RCT2_CALLPROC_X(0x006682F7, 0, 0, 0, widgetIndex, (int)w, 0, 0);
toggle_land_rights_window2(w, WIDX_BUY_LAND_RIGHTS);
break;
case WIDX_BUY_CONSTRUCTION_RIGHTS:
//RCT2_CALLPROC_X(0x00668393, 0, 0, 0, widgetIndex, (int)w, 0, 0);
@@ -810,7 +826,7 @@ static void window_park_entrance_toolupdate()
window_tool_get_registers(w, widgetIndex, x, y);
if (widgetIndex == WIDX_BUY_LAND_RIGHTS || widgetIndex == WIDX_BUY_CONSTRUCTION_RIGHTS) {
/*if (widgetIndex == WIDX_BUY_LAND_RIGHTS || widgetIndex == WIDX_BUY_CONSTRUCTION_RIGHTS) {
map_invalidate_selection_rect();
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16) &= 0xFFFE;
screen_pos_to_map_pos(&x, &y, NULL);
@@ -823,6 +839,20 @@ static void window_park_entrance_toolupdate()
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16) = y;
map_invalidate_selection_rect();
}
}*/
switch (widgetIndex){
case WIDX_BUY_LAND_RIGHTS:
RCT2_CALLPROC_X(0x0068E213, x, y, 0, widgetIndex, (int)w, 0, 0);
RCT2_GLOBAL(0x00F1AD62, uint32) = game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
0,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
LandRightsMode ? 0x00E : 0x20F,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
break;
}
}
@@ -837,36 +867,53 @@ static void window_park_entrance_tooldown()
window_tool_get_registers(w, widgetIndex, x, y);
switch (widgetIndex){
case WIDX_BUY_LAND_RIGHTS:
if (LandRightsMode) {
//screen_pos_to_map_pos(&x, &y, NULL);
if (x != (sint16)0x8000) {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = 0x6BD; // Can't buy land...
//game_do_command(x, 1, y, 0x00E, 35, 0, 0);
game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
1,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
0x00E,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
}
}
else {
//screen_pos_to_map_pos(&x, &y, NULL);
if (x != (sint16)0x8000) {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = 0x6C0; // Can't buy construction rights here...
//game_do_command(x, 1, y, 0x20F, 35, 0, 0);
game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
1,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
0x20F,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
}
}
break;
}
//RCT2_CALLPROC_X(0x006681E6, x, y, 0, widgetIndex, (int)w, 0, 0);
switch (widgetIndex) {
/*switch (widgetIndex) {
case WIDX_BUY_LAND_RIGHTS:
screen_pos_to_map_pos(&x, &y, NULL);
if (x != (sint16)0x8000) {
RCT2_GLOBAL(0x00141E9AE, rct_string_id) = 0x6BD;
// I doubt the low byte of dx is required but its not cleared from earlier so copy in the widgetIndex
game_do_command(x, 1, y, 0x00E, 35, 0, 0);
/*int eax = x;
int ebx = 1;
int ecx = y;
int edx = 0x00E;
RCT2_GLOBAL(0x009E32DC, uint32) = ebx;
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT, rct_string_id) = 0xFFFF;
if (RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16)) {
uint16 x1 = RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16);
while (x1 < RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16)) {
uint16 y1 = RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16);
while (y1 < RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)) {
map_invalidate_tile_full(x1, y1);
y1 += 0x20;
}
x1 += 0x20;
}
}*/
}
break;
case WIDX_BUY_CONSTRUCTION_RIGHTS:
@@ -875,7 +922,7 @@ static void window_park_entrance_tooldown()
RCT2_GLOBAL(0x00141E9AE, rct_string_id) = 0x6C0;
game_do_command(x, 1, y, 0x20F, 35, 0, 0);
}
}
}*/
}
/*enum {
@@ -1309,7 +1356,7 @@ static void window_park_entrance_tooldrag()
rct_window* w2 = window_find_by_number(0xB, 0);
if (!w2) {
/*if (!w2) {
switch (widgetIndex) {
case WIDX_BUY_LAND_RIGHTS:
screen_pos_to_map_pos(&x, &y, NULL);
@@ -1326,6 +1373,44 @@ static void window_park_entrance_tooldrag()
game_do_command(x, 1, y, 0x20F, 35, 0, 0);
}
}
}*/
switch (widgetIndex){
case WIDX_BUY_LAND_RIGHTS:
if (LandRightsMode) {
//screen_pos_to_map_pos(&x, &y, NULL);
if (x != (sint16)0x8000) {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = 0x6BD; // Can't buy land...
//game_do_command(x, 1, y, 0x00E, 35, 0, 0);
game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
1,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
0x00E,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
}
}
else {
//screen_pos_to_map_pos(&x, &y, NULL);
if (x != (sint16)0x8000) {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = 0x6C0; // Can't buy construction rights here...
//game_do_command(x, 1, y, 0x20F, 35, 0, 0);
game_do_command(
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_X, uint16),
1,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_A_Y, uint16),
0x20F,
35,
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_X, uint16),
RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_B_Y, uint16)
);
}
}
break;
}
}