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

Merge pull request #1771 from Gymnasiast/minimum-maximum-size-to-define 

Turn minimum and maximum tool sizes into defines
This commit is contained in:
Ted John 2015-08-12 13:43:25 +01:00
parent 16653b6f9f 7db2008472
commit c6ba48f53e
4 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/windows/clear_scenery.c
View File

@ -27,6 +27,9 @@
#include "../interface/window.h"
#include "../interface/themes.h"
#define MINIMUM_TOOL_SIZE 1
#define MAXIMUM_TOOL_SIZE 64
enum WINDOW_CLEAR_SCENERY_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
@ -52,7 +55,6 @@ rct_widget window_clear_scenery_widgets[] = {
{ WIDGETS_END },
};
static int window_clear_scenery_should_close();
static void window_clear_scenery_close(rct_window *w);
@ -63,9 +65,6 @@ static void window_clear_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_clear_scenery_textinput(rct_window *w, int widgetIndex, char *text);
static void window_clear_scenery_inputsize(rct_window *w);
static int _minimumSize = 1;
static int _maximumSize = 64;
static rct_window_event_list window_clear_scenery_events = {
window_clear_scenery_close,
window_clear_scenery_mouseup,
@ -148,14 +147,14 @@ static void window_clear_scenery_mouseup(rct_window *w, int widgetIndex)
break;
case WIDX_DECREMENT:
// Decrement land tool size, if it stays within the limit
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = max(_minimumSize,RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)-1);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = max(MINIMUM_TOOL_SIZE,RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)-1);
// Invalidate the window
window_invalidate(w);
break;
case WIDX_INCREMENT:
// Increment land tool size, if it stays within the limit
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = min(_maximumSize,RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)+1);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = min(MAXIMUM_TOOL_SIZE,RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)+1);
// Invalidate the window
window_invalidate(w);
@ -188,8 +187,8 @@ static void window_clear_scenery_textinput(rct_window *w, int widgetIndex, char
size = strtol(text, &end, 10);
if (*end == '\0') {
size=max(_minimumSize,size);
size=min(_maximumSize,size);
size=max(MINIMUM_TOOL_SIZE,size);
size=min(MAXIMUM_TOOL_SIZE,size);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = size;
window_invalidate(w);
}
@ -197,8 +196,8 @@ static void window_clear_scenery_textinput(rct_window *w, int widgetIndex, char
static void window_clear_scenery_inputsize(rct_window *w)
{
((uint16*)TextInputDescriptionArgs)[0] = _minimumSize;
((uint16*)TextInputDescriptionArgs)[1] = _maximumSize;
((uint16*)TextInputDescriptionArgs)[0] = MINIMUM_TOOL_SIZE;
((uint16*)TextInputDescriptionArgs)[1] = MAXIMUM_TOOL_SIZE;
window_text_input_open(w, WIDX_PREVIEW, 5128, 5129, STR_NONE, STR_NONE, 3);
}

18
src/windows/land.c
View File

@ -28,6 +28,9 @@
#include "dropdown.h"
#include "../interface/themes.h"
#define MINIMUM_TOOL_SIZE 0
#define MAXIMUM_TOOL_SIZE 64
enum WINDOW_LAND_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
@ -63,9 +66,6 @@ static void window_land_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_land_textinput(rct_window *w, int widgetIndex, char *text);
static void window_land_inputsize(rct_window *w);
static int _minimumSize = 0;
static int _maximumSize = 64;
static rct_window_event_list window_land_events = {
window_land_close,
window_land_mouseup,
@ -173,14 +173,14 @@ static void window_land_mouseup(rct_window *w, int widgetIndex)
break;
case WIDX_DECREMENT:
// Decrement land tool size
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = max(_minimumSize, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)-1);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = max(MINIMUM_TOOL_SIZE, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)-1);
// Invalidate the window
window_invalidate(w);
break;
case WIDX_INCREMENT:
// Increment land tool size
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = min(_maximumSize, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)+1);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = min(MAXIMUM_TOOL_SIZE, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)+1);
// Invalidate the window
window_invalidate(w);
@ -298,8 +298,8 @@ static void window_land_textinput(rct_window *w, int widgetIndex, char *text)
size = strtol(text, &end, 10);
if (*end == '\0') {
size = max(_minimumSize,size);
size = min(_maximumSize,size);
size = max(MINIMUM_TOOL_SIZE,size);
size = min(MAXIMUM_TOOL_SIZE,size);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = size;
window_invalidate(w);
@ -308,8 +308,8 @@ static void window_land_textinput(rct_window *w, int widgetIndex, char *text)
static void window_land_inputsize(rct_window *w)
{
((uint16*)TextInputDescriptionArgs)[0] = _minimumSize;
((uint16*)TextInputDescriptionArgs)[1] = _maximumSize;
((uint16*)TextInputDescriptionArgs)[0] = MINIMUM_TOOL_SIZE;
((uint16*)TextInputDescriptionArgs)[1] = MAXIMUM_TOOL_SIZE;
window_text_input_open(w, WIDX_PREVIEW, 5128, 5129, STR_NONE, STR_NONE, 3);
}

16
src/windows/land_rights.c
View File

@ -29,8 +29,8 @@
#include "../game.h"
#include "../interface/themes.h"
static int _minimumSize = 1;
static int _maximumSize = 64;
#define MINIMUM_TOOL_SIZE 1
#define MAXIMUM_TOOL_SIZE 64
enum WINDOW_WATER_WIDGET_IDX {
WIDX_BACKGROUND,
@ -135,14 +135,14 @@ static void window_land_rights_mouseup(rct_window *w, int widgetIndex)
break;
case WIDX_DECREMENT:
// Decrement land rights tool size
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = max(_minimumSize, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)-1);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = max(MINIMUM_TOOL_SIZE, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)-1);
// Invalidate the window
window_invalidate(w);
break;
case WIDX_INCREMENT:
// Decrement land rights tool size
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = min(_maximumSize, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)+1);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = min(MAXIMUM_TOOL_SIZE, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)+1);
// Invalidate the window
window_invalidate(w);
@ -179,8 +179,8 @@ static void window_land_rights_textinput(rct_window *w, int widgetIndex, char *t
size = strtol(text, &end, 10);
if (*end == '\0') {
size = max(_minimumSize,size);
size = min(_maximumSize,size);
size = max(MINIMUM_TOOL_SIZE,size);
size = min(MAXIMUM_TOOL_SIZE,size);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = size;
window_invalidate(w);
}
@ -188,8 +188,8 @@ static void window_land_rights_textinput(rct_window *w, int widgetIndex, char *t
static void window_land_rights_inputsize(rct_window *w)
{
((uint16*)TextInputDescriptionArgs)[0] = _minimumSize;
((uint16*)TextInputDescriptionArgs)[1] = _maximumSize;
((uint16*)TextInputDescriptionArgs)[0] = MINIMUM_TOOL_SIZE;
((uint16*)TextInputDescriptionArgs)[1] = MAXIMUM_TOOL_SIZE;
window_text_input_open(w, WIDX_PREVIEW, 5128, 5129, STR_NONE, STR_NONE, 3);
}

18
src/windows/water.c
View File

@ -27,6 +27,9 @@
#include "../world/map.h"
#include "../interface/themes.h"
#define MINIMUM_TOOL_SIZE 1
#define MAXIMUM_TOOL_SIZE 64
enum WINDOW_WATER_WIDGET_IDX {
WIDX_BACKGROUND,
WIDX_TITLE,
@ -56,9 +59,6 @@ static void window_water_paint(rct_window *w, rct_drawpixelinfo *dpi);
static void window_water_textinput(rct_window *w, int widgetIndex, char *text);
static void window_water_inputsize(rct_window *w);
static int _minimumSize = 1;
static int _maximumSize = 64;
static rct_window_event_list window_water_events = {
window_water_close,
window_water_mouseup,
@ -143,14 +143,14 @@ static void window_water_mouseup(rct_window *w, int widgetIndex)
break;
case WIDX_DECREMENT:
// Decrement land tool size
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = max(_minimumSize, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)-1);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = max(MINIMUM_TOOL_SIZE, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)-1);
// Invalidate the window
window_invalidate(w);
break;
case WIDX_INCREMENT:
// Increment land tool size
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = min(_maximumSize, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)+1);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = min(MAXIMUM_TOOL_SIZE, RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16)+1);
// Invalidate the window
window_invalidate(w);
@ -171,8 +171,8 @@ static void window_water_textinput(rct_window *w, int widgetIndex, char *text)
size = strtol(text, &end, 10);
if (*end == '\0') {
size = max(_minimumSize,size);
size = min(_maximumSize,size);
size = max(MINIMUM_TOOL_SIZE,size);
size = min(MAXIMUM_TOOL_SIZE,size);
RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) = size;
window_invalidate(w);
@ -181,8 +181,8 @@ static void window_water_textinput(rct_window *w, int widgetIndex, char *text)
static void window_water_inputsize(rct_window *w)
{
((uint16*)TextInputDescriptionArgs)[0] = _minimumSize;
((uint16*)TextInputDescriptionArgs)[1] = _maximumSize;
((uint16*)TextInputDescriptionArgs)[0] = MINIMUM_TOOL_SIZE;
((uint16*)TextInputDescriptionArgs)[1] = MAXIMUM_TOOL_SIZE;
window_text_input_open(w, WIDX_PREVIEW, 5128, 5129, STR_NONE, STR_NONE, 3);
}