mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge branch 'master' into gfx_unstable
This commit is contained in:
IntelOrca
commit
ccc9843633
|
|
@ -17,9 +17,9 @@ else()
|
|||
endif (APPLE)
|
||||
|
||||
# potential flags to make code more similar to MSVC:
|
||||
# -fshort-wchar -fshort-enums -mms-bitfields -fpack-struct=1
|
||||
# -fshort-wchar -fshort-enums -mms-bitfields
|
||||
#
|
||||
set(CMAKE_C_FLAGS "-masm=intel -std=gnu99" CACHE STRING "" FORCE)
|
||||
set(CMAKE_C_FLAGS "-masm=intel -std=gnu99 -fpack-struct=2" CACHE STRING "" FORCE)
|
||||
set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc" CACHE STRING "" FORCE)
|
||||
|
||||
include_directories("/usr/include/wine/windows/")
|
||||
|
|
|
|||
|
|
@ -84,6 +84,8 @@
|
|||
#define RCT2_ADDRESS_DIRTY_BLOCK_COLUMNS 0x009ABDE8
|
||||
#define RCT2_ADDRESS_DIRTY_BLOCK_ROWS 0x009ABDEC
|
||||
|
||||
#define RCT2_ADDRESS_LIGHTNING_ACTIVE 0x009AC068
|
||||
|
||||
#define RCT2_ADDRESS_RUN_INTRO_TICK_PART 0x009AC319
|
||||
|
||||
#define RCT2_ADDRESS_INSTALLED_OBJECT_LIST 0x009ADAE8
|
||||
|
|
@ -111,6 +113,10 @@
|
|||
#define RCT2_ADDRESS_CURRENT_TOOL 0x009DE545
|
||||
#define RCT2_ADDRESS_TOOL_WIDGETINDEX 0x009DE546
|
||||
|
||||
#define RCT2_ADDRESS_PICKEDUP_PEEP_SPRITE 0x009DE550
|
||||
#define RCT2_ADDRESS_PICKEDUP_PEEP_X 0x009DE554
|
||||
#define RCT2_ADDRESS_PICKEDUP_PEEP_Y 0x009DE556
|
||||
|
||||
#define RCT2_ADDRESS_CURSOR_OVER_WINDOWCLASS 0x009DE55C
|
||||
#define RCT2_ADDRESS_CURSOR_OVER_WINDOWNUMBER 0x009DE55E
|
||||
#define RCT2_ADDRESS_CURSOR_OVER_WIDGETINDEX 0x009DE560
|
||||
|
|
|
|||
|
|
@ -568,6 +568,13 @@ static int award_is_deserved(int awardType, int activeAwardTypes)
|
|||
|
||||
#pragma endregion
|
||||
|
||||
void award_reset()
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < MAX_AWARDS; i++)
|
||||
RCT2_ADDRESS(RCT2_ADDRESS_AWARD_LIST, rct_award)[i].time = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x0066A86C
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ enum {
|
|||
#define MAX_AWARDS 4
|
||||
|
||||
int award_is_positive(int type);
|
||||
void award_reset();
|
||||
void award_update_all();
|
||||
|
||||
#endif
|
||||
149
src/climate.c
149
src/climate.c
|
|
@ -19,10 +19,19 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include "addresses.h"
|
||||
#include "audio.h"
|
||||
#include "climate.h"
|
||||
#include "date.h"
|
||||
#include "gfx.h"
|
||||
#include "rct2.h"
|
||||
#include "scenario.h"
|
||||
|
||||
enum {
|
||||
THUNDER_STATUS_NULL = 0,
|
||||
THUNDER_STATUS_PLAYING = 1,
|
||||
|
||||
MAX_THUNDER_INSTANCES = 2
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
sint8 base_temperature;
|
||||
|
|
@ -32,6 +41,8 @@ typedef struct {
|
|||
|
||||
int gClimateNextWeather;
|
||||
|
||||
static int _climateCurrentWeatherEffect;
|
||||
|
||||
static int _climateNextTemperature;
|
||||
static int _climateNextWeatherEffect;
|
||||
static int _climateNextWeatherGloom;
|
||||
|
|
@ -39,8 +50,24 @@ static int _climateNextRainLevel;
|
|||
|
||||
static const rct_weather_transition* climate_transitions[4];
|
||||
|
||||
// Sound data
|
||||
static int _rainVolume = 1;
|
||||
static rct_sound _rainSoundInstance;
|
||||
static unsigned int _lightningTimer, _thunderTimer;
|
||||
static rct_sound _thunderSoundInstance[MAX_THUNDER_INSTANCES];
|
||||
static int _thunderStatus[MAX_THUNDER_INSTANCES] = { THUNDER_STATUS_NULL, THUNDER_STATUS_NULL };
|
||||
static unsigned int _thunderSoundId;
|
||||
static int _thunderVolume;
|
||||
static int _thunderStereoEcho = 0;
|
||||
|
||||
static void climate_determine_future_weather();
|
||||
|
||||
static void climate_update_rain_sound();
|
||||
static void climate_update_thunder_sound();
|
||||
static void climate_update_lightning();
|
||||
static void climate_update_thunder();
|
||||
static int climate_play_thunder(int instanceIndex, int soundId, int volume, int pan);
|
||||
|
||||
int climate_celsius_to_fahrenheit(int celsius)
|
||||
{
|
||||
return (celsius * 29) / 16 + 32;
|
||||
|
|
@ -88,7 +115,7 @@ void climate_update()
|
|||
|
||||
if (temperature == target_temperature) {
|
||||
if (cur_gloom == next_gloom) {
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_WEATHER_EFFECT, sint8) = _climateNextWeatherEffect;
|
||||
_climateCurrentWeatherEffect = _climateNextWeatherEffect;
|
||||
|
||||
if (cur_rain == next_rain) {
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_WEATHER, sint8) = gClimateNextWeather;
|
||||
|
|
@ -152,7 +179,127 @@ static void climate_determine_future_weather()
|
|||
RCT2_GLOBAL(RCT2_ADDRESS_CLIMATE_UPDATE_TIMER, sint16) = 1920;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x006BCB91
|
||||
*/
|
||||
void climate_update_sound()
|
||||
{
|
||||
if (RCT2_GLOBAL(0x009AF280, uint32) == 0xFFFFFFFF)
|
||||
return;
|
||||
if (RCT2_GLOBAL(0x009AF59C, uint8) != 0)
|
||||
return;
|
||||
if (!(RCT2_GLOBAL(0x009AF59D, uint8) & 1))
|
||||
return;
|
||||
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & 1)
|
||||
return;
|
||||
|
||||
climate_update_rain_sound();
|
||||
climate_update_thunder_sound();
|
||||
}
|
||||
|
||||
static void climate_update_rain_sound()
|
||||
{
|
||||
if (_climateCurrentWeatherEffect == 1 || _climateCurrentWeatherEffect == 2) {
|
||||
if (_rainVolume == 1) {
|
||||
// Start playing the rain sound
|
||||
if (sound_prepare(SOUND_RAIN_1, &_rainSoundInstance, 1, RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_SOUND_SW_BUFFER, uint32)))
|
||||
sound_play(&_rainSoundInstance, 1, -4000, 0, 0);
|
||||
_rainVolume = -4000;
|
||||
} else {
|
||||
// Increase rain sound
|
||||
_rainVolume = min(-1400, _rainVolume + 80);
|
||||
RCT2_CALLPROC_2(0x00404F0D, rct_sound*, int, &_rainSoundInstance, _rainVolume);
|
||||
}
|
||||
} else if (_rainVolume != 1) {
|
||||
// Decrease rain sound
|
||||
_rainVolume -= 80;
|
||||
if (_rainVolume > -4000) {
|
||||
RCT2_CALLPROC_2(0x00404F0D, rct_sound*, int, &_rainSoundInstance, _rainVolume);
|
||||
} else {
|
||||
sound_stop(&_rainSoundInstance);
|
||||
_rainVolume = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void climate_update_thunder_sound()
|
||||
{
|
||||
if (_thunderStereoEcho) {
|
||||
// Play thunder on right side
|
||||
_thunderStereoEcho = 0;
|
||||
climate_play_thunder(1, _thunderSoundId, _thunderVolume, 10000);
|
||||
} else if (_thunderTimer != 0) {
|
||||
climate_update_lightning();
|
||||
climate_update_thunder();
|
||||
} else if (_climateCurrentWeatherEffect == 2) {
|
||||
// Create new thunder and lightning
|
||||
unsigned int randomNumber = scenario_rand();
|
||||
if ((randomNumber & 0xFFFF) <= 0x1B4) {
|
||||
randomNumber >>= 16;
|
||||
_thunderTimer = 43 + (randomNumber % 64);
|
||||
_lightningTimer = randomNumber % 32;
|
||||
}
|
||||
}
|
||||
|
||||
// Stop thunder sounds if they have finished
|
||||
for (int i = 0; i < MAX_THUNDER_INSTANCES; i++) {
|
||||
if (_thunderStatus[i] == THUNDER_STATUS_NULL)
|
||||
continue;
|
||||
|
||||
if (!RCT2_CALLFUNC_1(0x00404E53, int, rct_sound*, &_thunderSoundInstance[i])) {
|
||||
sound_stop(&_thunderSoundInstance[i]);
|
||||
_thunderStatus[i] = THUNDER_STATUS_NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void climate_update_lightning()
|
||||
{
|
||||
if (_lightningTimer == 0)
|
||||
return;
|
||||
|
||||
_lightningTimer--;
|
||||
if (RCT2_GLOBAL(RCT2_ADDRESS_LIGHTNING_ACTIVE, uint16) == 0)
|
||||
if ((scenario_rand() & 0xFFFF) <= 0x2000)
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_LIGHTNING_ACTIVE, uint16) = 1;
|
||||
}
|
||||
|
||||
static void climate_update_thunder()
|
||||
{
|
||||
_thunderTimer--;
|
||||
if (_thunderTimer != 0)
|
||||
return;
|
||||
|
||||
unsigned int randomNumber = scenario_rand();
|
||||
if (randomNumber & 0x10000) {
|
||||
if (_thunderStatus[0] == THUNDER_STATUS_NULL && _thunderStatus[1] == THUNDER_STATUS_NULL) {
|
||||
// Play thunder on left side
|
||||
_thunderSoundId = (randomNumber & 0x20000) ? SOUND_THUNDER_1 : SOUND_THUNDER_2;
|
||||
_thunderVolume = (-((int)((randomNumber >> 18) & 0xFF))) << 3;
|
||||
climate_play_thunder(0, _thunderSoundId, _thunderVolume, -10000);
|
||||
|
||||
// Let thunder play on right side
|
||||
_thunderStereoEcho = 1;
|
||||
}
|
||||
} else {
|
||||
_thunderSoundId = (randomNumber & 0x20000) ? SOUND_THUNDER_1 : SOUND_THUNDER_2;
|
||||
int pan = (((randomNumber >> 18) & 0xFF) - 128) * 16;
|
||||
climate_play_thunder(0, _thunderSoundId, 0, pan);
|
||||
}
|
||||
}
|
||||
|
||||
static int climate_play_thunder(int instanceIndex, int soundId, int volume, int pan)
|
||||
{
|
||||
if (sound_prepare(soundId, &_thunderSoundInstance[instanceIndex], 1, RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_SOUND_SW_BUFFER, uint32))) {
|
||||
sound_play(&_thunderSoundInstance[instanceIndex], 0, volume, pan, 0);
|
||||
|
||||
_thunderStatus[instanceIndex] = THUNDER_STATUS_PLAYING;
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#pragma region Climate / Weather data tables
|
||||
|
||||
|
|
|
|||
|
|
@ -44,5 +44,6 @@ extern const rct_weather climate_weather_data[6];
|
|||
int climate_celsius_to_fahrenheit(int celsius);
|
||||
void climate_reset(int climate);
|
||||
void climate_update();
|
||||
void climate_update_sound();
|
||||
|
||||
#endif
|
||||
|
|
|
|||
258
src/config.c
258
src/config.c
|
|
@ -76,15 +76,19 @@ static const uint16 _defaultShortcutKeys[SHORTCUT_COUNT] = {
|
|||
|
||||
general_configuration_t gGeneral_config;
|
||||
general_configuration_t gGeneral_config_default = {
|
||||
1,
|
||||
1,
|
||||
SCREENSHOT_FORMAT_PNG,
|
||||
"",
|
||||
MEASUREMENT_FORMAT_IMPERIAL,
|
||||
TEMPERATURE_FORMAT_F,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
0, // play_intro
|
||||
1, // confirmation_prompt
|
||||
SCREENSHOT_FORMAT_PNG, // screenshot_format
|
||||
"", // game_path
|
||||
MEASUREMENT_FORMAT_IMPERIAL, // measurement_format
|
||||
TEMPERATURE_FORMAT_F, // temperature_format
|
||||
CURRENCY_POUNDS, // currency_format
|
||||
0, // construction_marker_colour
|
||||
1, // edge_scrolling
|
||||
0, // always_show_gridlines
|
||||
1, // landscape_smoothing
|
||||
0, // show_height_as_units
|
||||
1, // save_plugin_data
|
||||
};
|
||||
sound_configuration_t gSound_config;
|
||||
|
||||
|
|
@ -100,6 +104,10 @@ static void config_create_default(char *path);
|
|||
static int config_parse_currency(char* currency);
|
||||
static void config_error(char *msg);
|
||||
|
||||
void config_save_ini(char *path);
|
||||
void config_write_ini_general(FILE *fp);
|
||||
void config_write_ini_sound(FILE *fp);
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x006E3604
|
||||
|
|
@ -136,6 +144,37 @@ void config_load()
|
|||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) = gGeneral_config.measurement_format;
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, sint8) = gGeneral_config.temperature_format;
|
||||
|
||||
// always show gridlines
|
||||
if (gGeneral_config.always_show_gridlines){
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) |= CONFIG_FLAG_ALWAYS_SHOW_GRIDLINES;
|
||||
}
|
||||
else {
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) &= !CONFIG_FLAG_ALWAYS_SHOW_GRIDLINES;
|
||||
}
|
||||
|
||||
// landscape smoothing
|
||||
if (!gGeneral_config.landscape_smoothing){
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) |= CONFIG_FLAG_DISABLE_SMOOTH_LANDSCAPE;
|
||||
}
|
||||
else {
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) &= !CONFIG_FLAG_DISABLE_SMOOTH_LANDSCAPE;
|
||||
}
|
||||
|
||||
// show height as units
|
||||
if (gGeneral_config.show_height_as_units){
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) |= CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS;
|
||||
}
|
||||
else {
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) &= !CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS;
|
||||
}
|
||||
|
||||
// save plugin data
|
||||
if (gGeneral_config.save_plugin_data){
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) |= CONFIG_FLAG_SAVE_PLUGIN_DATA;
|
||||
}
|
||||
else {
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) &= !CONFIG_FLAG_SAVE_PLUGIN_DATA;
|
||||
}
|
||||
|
||||
//sound configuration
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_SOUND_QUALITY, sint8) = gSound_config.sound_quality;
|
||||
|
|
@ -189,6 +228,7 @@ void config_load()
|
|||
RCT2_GLOBAL(0x009AA00D, sint8) = 1;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Save configuration to the data/config.cfg file
|
||||
* rct2: 0x00675487
|
||||
|
|
@ -196,14 +236,144 @@ void config_load()
|
|||
void config_save()
|
||||
{
|
||||
FILE *fp=NULL;
|
||||
char *configIniPath = osinterface_get_orct2_homefolder();;
|
||||
|
||||
fp = fopen(get_file_path(PATH_ID_GAMECFG), "wb");
|
||||
if (fp != NULL){
|
||||
fwrite(&MagicNumber, 4, 1, fp);
|
||||
fwrite((void*)0x009AAC5C, 2155, 1, fp);
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
sprintf(configIniPath, "%s%c%s", configIniPath, osinterface_get_path_separator(), "config.ini");
|
||||
config_save_ini(configIniPath);
|
||||
}
|
||||
|
||||
void config_save_ini(char *path)
|
||||
{
|
||||
FILE *fp = NULL;
|
||||
|
||||
|
||||
fp = fopen(path, "wt+");
|
||||
|
||||
config_write_ini_general(fp);
|
||||
config_write_ini_sound(fp);
|
||||
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
void config_write_ini_sound(FILE *fp)
|
||||
{
|
||||
fprintf(fp, "[sound]\n");
|
||||
if (gSound_config.sound_quality == SOUND_QUALITY_LOW) {
|
||||
fprintf(fp, "sound_quality = low\n");
|
||||
}
|
||||
else if (gSound_config.sound_quality == SOUND_QUALITY_MEDIUM) {
|
||||
fprintf(fp, "sound_quality = medium\n");
|
||||
}
|
||||
else{
|
||||
fprintf(fp, "sound_quality = high\n");
|
||||
}
|
||||
|
||||
if (gSound_config.forced_software_buffering){
|
||||
fprintf(fp, "forced_software_buffering = true\n");
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "forced_software_buffering = false\n");
|
||||
}
|
||||
}
|
||||
|
||||
void config_write_ini_general(FILE *fp)
|
||||
{
|
||||
int currencyIterator = 0;
|
||||
|
||||
fprintf(fp, "[general]\n");
|
||||
fprintf(fp, "game_path = %s\n", gGeneral_config.game_path);
|
||||
|
||||
switch (gGeneral_config.screenshot_format)
|
||||
{
|
||||
case SCREENSHOT_FORMAT_BMP:
|
||||
fprintf(fp, "screenshot_format = BMP\n");
|
||||
break;
|
||||
case SCREENSHOT_FORMAT_PNG:
|
||||
fprintf(fp, "screenshot_format = PNG\n");
|
||||
break;
|
||||
default:
|
||||
config_error("error saving config.ini: wrong screenshot_format");
|
||||
break;
|
||||
}
|
||||
|
||||
if (gGeneral_config.play_intro){
|
||||
fprintf(fp, "play_intro = true\n");
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "play_intro = false\n");
|
||||
}
|
||||
|
||||
if (gGeneral_config.confirmation_prompt){
|
||||
fprintf(fp, "confirmation_prompt = true\n");
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "confirmation_prompt = false\n");
|
||||
}
|
||||
|
||||
if (gGeneral_config.edge_scrolling){
|
||||
fprintf(fp, "edge_scrolling = true\n");
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "edge_scrolling = false\n");
|
||||
}
|
||||
|
||||
for (currencyIterator = 0; currencyIterator < countof(_currencyLookupTable); currencyIterator++) {
|
||||
if (_currencyLookupTable[currencyIterator].value == gGeneral_config.currency_format) {
|
||||
gGeneral_config.currency_format = _currencyLookupTable[currencyIterator].value;
|
||||
fprintf(fp, "currency = %s\n", _currencyLookupTable[currencyIterator].key);
|
||||
break; // There are more than one valid item for Pound, Euro and Dollar ...
|
||||
}
|
||||
}
|
||||
|
||||
if (gGeneral_config.measurement_format == MEASUREMENT_FORMAT_IMPERIAL) {
|
||||
fprintf(fp, "measurement_format = imperial\n");
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "measurement_format = metric\n");
|
||||
}
|
||||
|
||||
if (gGeneral_config.temperature_format == TEMPERATURE_FORMAT_F) {
|
||||
fprintf(fp, "temperature_format = fahrenheit\n");
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "temperature_format = celsius\n");
|
||||
}
|
||||
|
||||
if (gGeneral_config.always_show_gridlines){
|
||||
fprintf(fp, "always_show_gridlines = true\n");
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "always_show_gridlines = false\n");
|
||||
}
|
||||
|
||||
if (gGeneral_config.landscape_smoothing){
|
||||
fprintf(fp, "landscape_smoothing = true\n");
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "landscape_smoothing = false\n");
|
||||
}
|
||||
|
||||
if (gGeneral_config.show_height_as_units){
|
||||
fprintf(fp, "show_height_as_units = true\n");
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "show_height_as_units = false\n");
|
||||
}
|
||||
|
||||
if (gGeneral_config.save_plugin_data){
|
||||
fprintf(fp, "save_plugin_data = true\n");
|
||||
}
|
||||
else {
|
||||
fprintf(fp, "save_plugin_data = false\n");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Initilise the settings.
|
||||
|
|
@ -278,8 +448,7 @@ static int config_find_rct2_path(char *resultPath)
|
|||
*/
|
||||
static void config_create_default(char *path)
|
||||
{
|
||||
FILE* fp;
|
||||
|
||||
gGeneral_config = gGeneral_config_default;
|
||||
|
||||
if (!config_find_rct2_path(gGeneral_config.game_path)) {
|
||||
osinterface_show_messagebox("Unable to find RCT2 installation directory. Please select the directory where you installed RCT2!");
|
||||
|
|
@ -287,20 +456,7 @@ static void config_create_default(char *path)
|
|||
strcpy(gGeneral_config.game_path, res);
|
||||
}
|
||||
|
||||
fp = fopen(path, "w");
|
||||
fprintf(fp, "[general]\n");
|
||||
fprintf(fp, "game_path = %s\n", gGeneral_config.game_path);
|
||||
fprintf(fp, "screenshot_format = PNG\n");
|
||||
fprintf(fp, "play_intro = false\n");
|
||||
fprintf(fp, "confirmation_prompt = true\n");
|
||||
fprintf(fp, "edge_scrolling = true\n");
|
||||
fprintf(fp, "currency = GBP\n");
|
||||
fprintf(fp, "measurement_format = imperial\n");
|
||||
fprintf(fp, "temperature_format = fahrenheit\n");
|
||||
fprintf(fp, "[sound]\n");
|
||||
fprintf(fp, "sound_quality = high\n");
|
||||
fprintf(fp, "forced_software_buffering = false\n");
|
||||
fclose(fp);
|
||||
config_save_ini(path);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -415,7 +571,38 @@ static void config_general(char *setting, char *value){
|
|||
else if (strcmp(setting, "currency") == 0){
|
||||
config_parse_currency(value);
|
||||
}
|
||||
|
||||
else if (strcmp(setting, "always_show_gridlines") == 0){
|
||||
if (strcmp(value, "true") == 0){
|
||||
gGeneral_config.always_show_gridlines = 1;
|
||||
}
|
||||
else {
|
||||
gGeneral_config.always_show_gridlines = 0;
|
||||
}
|
||||
}
|
||||
else if (strcmp(setting, "landscape_smoothing") == 0){
|
||||
if (strcmp(value, "true") == 0){
|
||||
gGeneral_config.landscape_smoothing = 1;
|
||||
}
|
||||
else {
|
||||
gGeneral_config.landscape_smoothing = 0;
|
||||
}
|
||||
}
|
||||
else if (strcmp(setting, "show_height_as_units") == 0){
|
||||
if (strcmp(value, "true") == 0){
|
||||
gGeneral_config.show_height_as_units = 1;
|
||||
}
|
||||
else {
|
||||
gGeneral_config.show_height_as_units = 0;
|
||||
}
|
||||
}
|
||||
else if (strcmp(setting, "save_plugin_data") == 0){
|
||||
if (strcmp(value, "true") == 0){
|
||||
gGeneral_config.save_plugin_data = 1;
|
||||
}
|
||||
else {
|
||||
gGeneral_config.save_plugin_data = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -588,25 +775,6 @@ static int config_parse_section(FILE *fp, char *setting, char *value){
|
|||
return 1;
|
||||
}
|
||||
|
||||
static const struct { char *key; int value; } _currencyLookupTable[] = {
|
||||
{ "GBP", CURRENCY_POUNDS },
|
||||
{ "USD", CURRENCY_DOLLARS },
|
||||
{ "FRF", CURRENCY_FRANC },
|
||||
{ "DEM", CURRENCY_DEUTSCHMARK },
|
||||
{ "YEN", CURRENCY_YEN },
|
||||
{ "ESP", CURRENCY_PESETA },
|
||||
{ "ITL", CURRENCY_LIRA },
|
||||
{ "NLG", CURRENCY_GUILDERS },
|
||||
{ "NOK", CURRENCY_KRONA },
|
||||
{ "SEK", CURRENCY_KRONA },
|
||||
{ "DEK", CURRENCY_KRONA },
|
||||
{ "EUR", CURRENCY_EUROS },
|
||||
|
||||
{ "£", CURRENCY_POUNDS },
|
||||
{ "$", CURRENCY_DOLLARS },
|
||||
{ "€", CURRENCY_EUROS }
|
||||
};
|
||||
|
||||
static int config_parse_currency(char *currency)
|
||||
{
|
||||
int i;
|
||||
|
|
|
|||
24
src/config.h
24
src/config.h
|
|
@ -136,9 +136,31 @@ typedef struct general_configuration {
|
|||
sint8 currency_format;
|
||||
sint8 construction_marker_colour;
|
||||
sint8 edge_scrolling;
|
||||
|
||||
sint8 always_show_gridlines;
|
||||
sint8 landscape_smoothing;
|
||||
sint8 show_height_as_units;
|
||||
sint8 save_plugin_data;
|
||||
} general_configuration_t;
|
||||
|
||||
static const struct { char *key; int value; } _currencyLookupTable[] = {
|
||||
{ "GBP", CURRENCY_POUNDS },
|
||||
{ "USD", CURRENCY_DOLLARS },
|
||||
{ "FRF", CURRENCY_FRANC },
|
||||
{ "DEM", CURRENCY_DEUTSCHMARK },
|
||||
{ "YEN", CURRENCY_YEN },
|
||||
{ "ESP", CURRENCY_PESETA },
|
||||
{ "ITL", CURRENCY_LIRA },
|
||||
{ "NLG", CURRENCY_GUILDERS },
|
||||
{ "NOK", CURRENCY_KRONA },
|
||||
{ "SEK", CURRENCY_KRONA },
|
||||
{ "DEK", CURRENCY_KRONA },
|
||||
{ "EUR", CURRENCY_EUROS },
|
||||
|
||||
{ "Ł", CURRENCY_POUNDS },
|
||||
{ "$", CURRENCY_DOLLARS },
|
||||
{ "€", CURRENCY_EUROS }
|
||||
};
|
||||
|
||||
//typedef struct hotkey_configuration{
|
||||
|
||||
//};
|
||||
|
|
|
|||
|
|
@ -137,6 +137,15 @@ void finance_pay_ride_upkeep()
|
|||
}
|
||||
}
|
||||
|
||||
void finance_reset_history()
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < 128; i++) {
|
||||
RCT2_ADDRESS(RCT2_ADDRESS_BALANCE_HISTORY, money32)[i] = MONEY32_UNDEFINED;
|
||||
RCT2_ADDRESS(RCT2_ADDRESS_WEEKLY_PROFIT_HISTORY, money32)[i] = MONEY32_UNDEFINED;
|
||||
RCT2_ADDRESS(RCT2_ADDRESS_PARK_VALUE_HISTORY, money32)[i] = MONEY32_UNDEFINED;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ void finance_pay_wages();
|
|||
void finance_pay_research();
|
||||
void finance_pay_interest();
|
||||
void finance_pay_ride_upkeep();
|
||||
void finance_reset_history();
|
||||
void finance_init();
|
||||
void sub_69E869();
|
||||
|
||||
|
|
|
|||
107
src/game.c
107
src/game.c
|
|
@ -59,10 +59,47 @@ void game_create_windows()
|
|||
RCT2_CALLPROC_EBPSAFE(0x0066B905);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x006838BD
|
||||
*/
|
||||
void update_water_animation()
|
||||
{
|
||||
RCT2_CALLPROC_EBPSAFE(0x006838BD);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x00684218
|
||||
*/
|
||||
void update_rain_animation()
|
||||
{
|
||||
if (RCT2_GLOBAL(0x009ABDF2, uint8) == 0)
|
||||
return;
|
||||
|
||||
// Draw picked-up peep
|
||||
if (RCT2_GLOBAL(0x009DE550, uint32) != 0xFFFFFFFF) {
|
||||
gfx_draw_sprite(
|
||||
(rct_drawpixelinfo*)RCT2_ADDRESS_SCREEN_DPI,
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_SPRITE, uint32),
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_X, sint16),
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_PICKEDUP_PEEP_Y, sint16)
|
||||
);
|
||||
}
|
||||
|
||||
// Get rain draw function and draw rain
|
||||
uint32 eax = RCT2_ADDRESS(0x009AC058, uint32)[RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_RAIN_LEVEL, uint8)];
|
||||
if (eax != 0xFFFFFFFF && !(RCT2_GLOBAL(0x009DEA6F, uint8) & 1))
|
||||
RCT2_CALLPROC_X(0x00684266, eax, 0, 0, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
void game_update()
|
||||
{
|
||||
int eax, tmp;
|
||||
|
||||
// Handles picked-up peep and rain redraw
|
||||
RCT2_CALLPROC_EBPSAFE(0x006843DC);
|
||||
|
||||
// 0x006E3AEC // screen_game_process_mouse_input();
|
||||
// RCT2_CALLPROC_EBPSAFE(0x006E3AEC); // screen_game_process_keyboard_input();
|
||||
screenshot_check();
|
||||
|
|
@ -124,8 +161,8 @@ void game_update()
|
|||
RCT2_GLOBAL(0x0141F568, uint8) = RCT2_GLOBAL(0x0013CA740, uint8);
|
||||
game_handle_input();
|
||||
|
||||
RCT2_CALLPROC_EBPSAFE(0x006838BD);
|
||||
RCT2_CALLPROC_EBPSAFE(0x00684218);
|
||||
update_water_animation();
|
||||
update_rain_animation();
|
||||
|
||||
if (RCT2_GLOBAL(0x009AAC73, uint8) != 255) {
|
||||
RCT2_GLOBAL(0x009AAC73, uint8)++;
|
||||
|
|
@ -160,7 +197,7 @@ void game_logic_update()
|
|||
RCT2_CALLPROC_EBPSAFE(0x0068AFAD);
|
||||
RCT2_CALLPROC_EBPSAFE(0x006BBC6B); // vehicle and scream sounds
|
||||
peep_update_crowd_noise();
|
||||
RCT2_CALLPROC_EBPSAFE(0x006BCB91); // weather sound effects
|
||||
climate_update_sound();
|
||||
news_item_update_current();
|
||||
RCT2_CALLPROC_EBPSAFE(0x0067009A); // scenario editor opening of windows for a phase
|
||||
|
||||
|
|
@ -617,6 +654,37 @@ static void input_mouseover_widget_flatbutton_invalidate()
|
|||
widget_invalidate(RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WINDOWCLASS, rct_windowclass), RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WINDOWNUMBER, rct_windownumber), RCT2_GLOBAL(RCT2_ADDRESS_CURSOR_OVER_WIDGETINDEX, rct_windownumber));
|
||||
}
|
||||
|
||||
static void RCT2_CALLPROC_WE_MOUSE_DOWN(int address, int widgetIndex, rct_window*w, rct_widget* widget )
|
||||
{
|
||||
#ifdef _MSC_VER
|
||||
__asm {
|
||||
push address
|
||||
push widget
|
||||
push w
|
||||
push widgetIndex
|
||||
mov edi, widget
|
||||
mov edx, widgetIndex
|
||||
mov esi, w
|
||||
call[esp + 12]
|
||||
add esp, 16
|
||||
}
|
||||
#else
|
||||
__asm__("\
|
||||
push %[address]\n\
|
||||
mov edi, %[widget] \n\
|
||||
mov eax, %[w] \n\
|
||||
mov edx, %[widgetIndex] \n\
|
||||
push edi \n\
|
||||
push eax \n\
|
||||
push edx \n\
|
||||
mov esi, %[w] \n\
|
||||
call [esp+12] \n\
|
||||
add esp, 16 \n\
|
||||
" :[address] "+m" (address), [w] "+m" (w), [widget] "+m" (widget), [widgetIndex] "+m" (widgetIndex): : "eax", "esi", "edx", "edi"
|
||||
);
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x006E95F9
|
||||
|
|
@ -766,7 +834,7 @@ static void input_leftmousedown(int x, int y, rct_window *w, int widgetIndex)
|
|||
RCT2_GLOBAL(0x009DE528, uint16) = 1;
|
||||
|
||||
widget_invalidate(windowClass, windowNumber, widgetIndex);
|
||||
RCT2_CALLPROC_X(w->event_handlers[WE_MOUSE_DOWN], 0, 0, 0, widgetIndex, (int)w, (int)widget, 0);
|
||||
RCT2_CALLPROC_WE_MOUSE_DOWN(w->event_handlers[WE_MOUSE_DOWN], widgetIndex, w, widget);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -1030,7 +1098,7 @@ void handle_shortcut_command(int shortcutIndex)
|
|||
RCT2_CALLPROC_EBPSAFE(0x006B3CFF);
|
||||
window = window_find_by_id(WC_CONSTRUCT_RIDE, 0);
|
||||
if (window != NULL)
|
||||
window_event_helper(window, 10, WE_MOUSE_DOWN);
|
||||
RCT2_CALLPROC_WE_MOUSE_DOWN(window->event_handlers[WE_MOUSE_DOWN], 10, window, NULL);
|
||||
}
|
||||
break;
|
||||
case SHORTCUT_SHOW_RIDES_LIST:
|
||||
|
|
@ -1597,6 +1665,35 @@ static void load_game()
|
|||
}
|
||||
}
|
||||
|
||||
char save_game()
|
||||
{
|
||||
int eax, ebx, ecx, edx, esi, edi, ebp;
|
||||
RCT2_CALLFUNC_X(0x006750E9, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
|
||||
if (eax == 0) {
|
||||
// user pressed "cancel"
|
||||
gfx_invalidate_screen();
|
||||
return 0;
|
||||
}
|
||||
|
||||
char *src = (char*)0x0141EF67;
|
||||
do {
|
||||
src++;
|
||||
} while (*src != '.' && *src != '\0');
|
||||
strcpy(src, ".SV6");
|
||||
strcpy((char*) RCT2_ADDRESS_SAVED_GAMES_PATH_2, (char*) 0x0141EF68);
|
||||
|
||||
eax = 0;
|
||||
if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & 8)
|
||||
eax |= 1;
|
||||
RCT2_CALLPROC_X(0x006754F5, eax, 0, 0, 0, 0, 0, 0);
|
||||
// check success?
|
||||
|
||||
game_do_command(0, 1047, 0, -1, 0, 0, 0);
|
||||
gfx_invalidate_screen();
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* rct2: 0x006E3879
|
||||
|
|
|
|||
|
|
@ -29,5 +29,6 @@ int game_do_command(int eax, int ebx, int ecx, int edx, int esi, int edi, int eb
|
|||
|
||||
void game_load_or_quit_no_save_prompt();
|
||||
int game_load_save();
|
||||
char save_game();
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ typedef struct {
|
|||
short width; // 0x08
|
||||
short height; // 0x0A
|
||||
short pitch; // 0x0C note: this is actually (pitch - width)
|
||||
uint8 pad_0E; // 0x0E
|
||||
uint8 zoom_level; // 0x0E
|
||||
char var_0F; // 0x0F
|
||||
} rct_drawpixelinfo;
|
||||
|
||||
|
|
|
|||
38
src/map.c
38
src/map.c
|
|
@ -328,4 +328,40 @@ void sub_68B089()
|
|||
} while (mapElement->base_height == 255);
|
||||
mapElement++;
|
||||
RCT2_GLOBAL(0x0140E9A4, rct_map_element*) = mapElement;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if the tile at coordinate at height counts as connected.
|
||||
* @return 1 if connected, 0 otherwisei
|
||||
*/
|
||||
int map_coord_is_connected(uint16 tile_idx, uint8 height, uint8 face_direction)
|
||||
{
|
||||
rct_map_element* tile = RCT2_ADDRESS(RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS, rct_map_element*)[tile_idx];
|
||||
|
||||
do {
|
||||
rct_map_element_path_properties props = tile->properties.path;
|
||||
uint8 path_type = props.type >> 2, path_dir = props.type & 3;
|
||||
uint8 element_type = tile->type & MAP_ELEMENT_TYPE_MASK;
|
||||
|
||||
if (element_type != PATH_ROAD)
|
||||
continue;
|
||||
|
||||
if (path_type & 1) {
|
||||
if (path_dir == face_direction) {
|
||||
if (height == tile->base_height + 2)
|
||||
return 1;
|
||||
}
|
||||
else if ((path_dir ^ 2) == face_direction && height == tile->base_height) {
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
if (height == tile->base_height)
|
||||
return 1;
|
||||
}
|
||||
|
||||
} while (!(tile->flags & MAP_ELEMENT_FLAG_LAST_TILE) && tile++);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -195,5 +195,7 @@ void map_init();
|
|||
void map_update_tile_pointers();
|
||||
int map_element_height(int x, int y);
|
||||
void sub_68B089();
|
||||
int map_coord_is_connected(uint16 coordinate, uint8 height, uint8 face_direction);
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
|||
19
src/park.c
19
src/park.c
|
|
@ -104,7 +104,9 @@ void park_init()
|
|||
RCT2_GLOBAL(0x01358772, uint16) = 400;
|
||||
RCT2_GLOBAL(0x01358774, uint16) = 0;
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) = PARK_FLAGS_11 | PARK_FLAGS_SHOW_REAL_GUEST_NAMES;
|
||||
park_reset_awards_and_history();
|
||||
park_reset_history();
|
||||
finance_reset_history();
|
||||
award_reset();
|
||||
|
||||
rct_s6_info *info = (rct_s6_info*)0x0141F570;
|
||||
info->name[0] = '\0';
|
||||
|
|
@ -115,26 +117,13 @@ void park_init()
|
|||
*
|
||||
* rct2: 0x0066729F
|
||||
*/
|
||||
void park_reset_awards_and_history()
|
||||
void park_reset_history()
|
||||
{
|
||||
int i;
|
||||
|
||||
// Reset park rating and guests in park history
|
||||
for (i = 0; i < 32; i++) {
|
||||
RCT2_ADDRESS(RCT2_ADDRESS_PARK_RATING_HISTORY, uint8)[i] = 255;
|
||||
RCT2_ADDRESS(RCT2_ADDRESS_GUESTS_IN_PARK_HISTORY, uint8)[i] = 255;
|
||||
}
|
||||
|
||||
// Reset finance history
|
||||
for (i = 0; i < 128; i++) {
|
||||
RCT2_ADDRESS(RCT2_ADDRESS_BALANCE_HISTORY, money32)[i] = MONEY32_UNDEFINED;
|
||||
RCT2_ADDRESS(RCT2_ADDRESS_WEEKLY_PROFIT_HISTORY, money32)[i] = MONEY32_UNDEFINED;
|
||||
RCT2_ADDRESS(RCT2_ADDRESS_PARK_VALUE_HISTORY, money32)[i] = MONEY32_UNDEFINED;
|
||||
}
|
||||
|
||||
// Reset awards
|
||||
for (i = 0; i < 4; i++)
|
||||
RCT2_ADDRESS(RCT2_ADDRESS_AWARD_LIST, rct_award)[i].time = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ enum {
|
|||
|
||||
int park_is_open();
|
||||
void park_init();
|
||||
void park_reset_awards_and_history();
|
||||
void park_reset_history();
|
||||
int park_calculate_size();
|
||||
|
||||
int calculate_park_rating();
|
||||
|
|
|
|||
152
src/ride.c
152
src/ride.c
|
|
@ -20,6 +20,9 @@
|
|||
|
||||
#include <windows.h>
|
||||
#include "addresses.h"
|
||||
#include "map.h"
|
||||
#include "news_item.h"
|
||||
#include "sprite.h"
|
||||
#include "ride.h"
|
||||
#include "sprite.h"
|
||||
#include "peep.h"
|
||||
|
|
@ -191,3 +194,152 @@ void ride_update_favourited_stat()
|
|||
window_invalidate_by_id(WC_RIDE_LIST, 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* rct2: 0x006B7C59
|
||||
* @return 1 if the coordinate is reachable or has no entrance, 0 otw
|
||||
*/
|
||||
int ride_entrance_exit_is_reachable(uint16 coordinate, rct_ride* ride, int index) {
|
||||
int x = ((coordinate >> 8) & 0xFF) << 5, // cx
|
||||
y = (coordinate & 0xFF) << 5; // ax
|
||||
uint8 station_height = ride->station_heights[index];
|
||||
int tile_idx = ((x << 8) | y) >> 5;
|
||||
rct_map_element* tile = RCT2_ADDRESS(RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS, rct_map_element*)[tile_idx];
|
||||
|
||||
while(1) {
|
||||
uint8 element_type = tile->type & MAP_ELEMENT_TYPE_MASK;
|
||||
if (element_type == MAP_ELEMENT_TYPE_ENTRANCE && station_height == tile->base_height) {
|
||||
break;
|
||||
} else if (tile->flags & MAP_ELEMENT_FLAG_LAST_TILE) {
|
||||
return 1;
|
||||
}
|
||||
tile++;
|
||||
}
|
||||
|
||||
uint8 face_direction = tile->type & 3;
|
||||
y -= RCT2_ADDRESS(0x00993CCC, sint16)[face_direction * 2];
|
||||
x -= RCT2_ADDRESS(0x00993CCE, sint16)[face_direction * 2];
|
||||
tile_idx = ((x << 8) | y) >> 5;
|
||||
|
||||
return map_coord_is_connected(tile_idx, station_height, face_direction);
|
||||
}
|
||||
|
||||
|
||||
void ride_entrance_exit_connected(rct_ride* ride, int ride_idx)
|
||||
{
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
uint16 station_start = ride->station_starts[i],
|
||||
entrance = ride->entrances[i],
|
||||
exit = ride->exits[i];
|
||||
|
||||
if (station_start == -1 )
|
||||
continue;
|
||||
if (entrance != -1 && !ride_entrance_exit_is_reachable(entrance, ride, i)) {
|
||||
// name of ride is parameter of the format string
|
||||
RCT2_GLOBAL(0x013CE952, uint16) = ride->var_04A;
|
||||
RCT2_GLOBAL(0x013CE954, uint32) = ride->var_04C;
|
||||
news_item_add_to_queue(1, STR_ENTRANCE_NOT_CONNECTED, ride_idx);
|
||||
ride->connected_message_throttle = 3;
|
||||
}
|
||||
|
||||
if (exit != -1 && !ride_entrance_exit_is_reachable(exit, ride, i)) {
|
||||
// name of ride is parameter of the format string
|
||||
RCT2_GLOBAL(0x013CE952, uint16) = ride->var_04A;
|
||||
RCT2_GLOBAL(0x013CE954, uint32) = ride->var_04C;
|
||||
news_item_add_to_queue(1, STR_EXIT_NOT_CONNECTED, ride_idx);
|
||||
ride->connected_message_throttle = 3;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void ride_shop_connected(rct_ride* ride, int ride_idx)
|
||||
{
|
||||
uint16 coordinate = ride->station_starts[0];
|
||||
if (coordinate == 0xFFFF)
|
||||
return;
|
||||
|
||||
int x = ((coordinate >> 8) & 0xFF) << 5, // cx
|
||||
y = (coordinate & 0xFF) << 5; // ax
|
||||
uint16 entrance_directions = 0;
|
||||
int tile_idx = ((x << 8) | y) >> 5, count = 0;
|
||||
rct_map_element* tile = RCT2_ADDRESS(RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS, rct_map_element*)[tile_idx];
|
||||
|
||||
|
||||
while (1) {
|
||||
uint8 element_type = tile->type & MAP_ELEMENT_TYPE_MASK;
|
||||
if(element_type == MAP_ELEMENT_TYPE_TRACK && tile->properties.track.ride_index == ride_idx)
|
||||
break;
|
||||
|
||||
if(tile->flags & MAP_ELEMENT_FLAG_LAST_TILE)
|
||||
return;
|
||||
tile++;
|
||||
}
|
||||
|
||||
uint8 track_type = tile->properties.track.type;
|
||||
ride = GET_RIDE(tile->properties.track.ride_index);
|
||||
if (RCT2_GLOBAL(RCT2_ADDRESS_RIDE_FLAGS + ride->type * 8, uint32) & 0x80000) {
|
||||
entrance_directions = RCT2_ADDRESS(0x0099CA64, uint8)[track_type * 16];
|
||||
} else {
|
||||
entrance_directions = RCT2_ADDRESS(0x0099BA64, uint8)[track_type * 16];
|
||||
}
|
||||
|
||||
|
||||
uint8 tile_direction = tile->type & MAP_ELEMENT_DIRECTION_MASK;
|
||||
entrance_directions <<= tile_direction;
|
||||
entrance_directions = ((entrance_directions >> 12) | entrance_directions) & 0xF;
|
||||
|
||||
// now each bit in entrance_directions stands for an entrance direction to check
|
||||
if (entrance_directions == 0)
|
||||
return;
|
||||
|
||||
for (int count = 0; entrance_directions != 0; ++count) {
|
||||
if (!(entrance_directions & 1)) {
|
||||
entrance_directions >>= 1;
|
||||
continue;
|
||||
}
|
||||
entrance_directions >>= 1;
|
||||
|
||||
uint8 face_direction = count ^ 2; // flip direction north<->south, east<->west
|
||||
y -= RCT2_ADDRESS(0x00993CCC, sint16)[face_direction * 2];
|
||||
x -= RCT2_ADDRESS(0x00993CCE, sint16)[face_direction * 2];
|
||||
tile_idx = ((x << 8) | y) >> 5;
|
||||
|
||||
if (map_coord_is_connected(tile_idx, tile->base_height, face_direction))
|
||||
return;
|
||||
}
|
||||
|
||||
// name of ride is parameter of the format string
|
||||
RCT2_GLOBAL(0x013CE952, uint16) = ride->var_04A;
|
||||
RCT2_GLOBAL(0x013CE954, uint32) = ride->var_04C;
|
||||
news_item_add_to_queue(1, STR_ENTRANCE_NOT_CONNECTED, ride_idx);
|
||||
|
||||
ride->connected_message_throttle = 3;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* rct2: 0x006B7A5E
|
||||
**/
|
||||
void ride_check_all_reachable()
|
||||
{
|
||||
rct_ride *ride;
|
||||
int i;
|
||||
|
||||
FOR_ALL_RIDES(i, ride) {
|
||||
if (ride->connected_message_throttle != 0)
|
||||
ride->connected_message_throttle--;
|
||||
if (ride->status != RIDE_STATUS_OPEN || ride->connected_message_throttle != 0)
|
||||
continue;
|
||||
|
||||
if (RCT2_GLOBAL(RCT2_ADDRESS_RIDE_FLAGS + ride->type * 8, uint32) & 0x20000)
|
||||
ride_shop_connected(ride, i);
|
||||
else
|
||||
ride_entrance_exit_connected(ride, i);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,8 @@ typedef struct {
|
|||
uint32 var_04C;
|
||||
uint16 overall_view; // 0x050
|
||||
uint16 station_starts[4]; // 0x052
|
||||
uint8 pad_05A[0x10];
|
||||
uint8 station_heights[4]; // 0x05A
|
||||
uint8 pad_05E[0xC];
|
||||
uint16 entrances[4]; // 0x06A
|
||||
uint16 exits[4]; // 0x072
|
||||
uint8 pad_07A[0x0C];
|
||||
|
|
@ -111,8 +112,9 @@ typedef struct {
|
|||
uint8 var_199;
|
||||
uint8 pad_19A[0x14];
|
||||
uint8 var_1AE;
|
||||
uint8 pad_1AF[0x05];
|
||||
money32 profit; // 0x1B4
|
||||
uint8 connected_message_throttle;
|
||||
uint32 pad_1B0;
|
||||
sint32 profit; // 0x1B4
|
||||
uint8 queue_time[4]; // 0x1B8
|
||||
uint8 var_1BC;
|
||||
uint8 pad_1BD[0x10];
|
||||
|
|
@ -343,5 +345,6 @@ int ride_get_max_queue_time(rct_ride *ride);
|
|||
void ride_init_all();
|
||||
void reset_all_ride_build_dates();
|
||||
void ride_update_favourited_stat();
|
||||
void ride_check_all_reachable();
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -279,7 +279,9 @@ void scenario_load_and_play(const rct_scenario_basic *scenario)
|
|||
RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, uint32) = 0;
|
||||
RCT2_GLOBAL(0x013587D8, uint16) = 63;
|
||||
sub_69E869(); // (loan related, called above already)
|
||||
park_reset_awards_and_history();
|
||||
park_reset_history();
|
||||
finance_reset_history();
|
||||
award_reset();
|
||||
reset_all_ride_build_dates();
|
||||
date_reset();
|
||||
RCT2_CALLPROC_EBPSAFE(0x00674576);
|
||||
|
|
@ -590,7 +592,7 @@ void scenario_update()
|
|||
finance_pay_interest();
|
||||
marketing_update();
|
||||
peep_problem_warnings_update();
|
||||
RCT2_CALLPROC_EBPSAFE(0x006B7A5E); // check ride reachability
|
||||
ride_check_all_reachable();
|
||||
ride_update_favourited_stat();
|
||||
|
||||
if (month <= 1 && RCT2_GLOBAL(0x009ADAE0, sint32) != -1 && RCT2_GLOBAL(0x009ADAE0 + 14, uint16) & 1) {
|
||||
|
|
|
|||
277
src/scenario.h
277
src/scenario.h
|
|
@ -83,6 +83,283 @@ typedef struct {
|
|||
char completed_by[64]; // 0x0270
|
||||
} rct_scenario_basic;
|
||||
|
||||
/* This will be useful for backwards compatibility
|
||||
typedef struct {
|
||||
// SC6[0]
|
||||
rct_s6_header header;
|
||||
|
||||
// SC6[1]
|
||||
rct_s6_info info;
|
||||
|
||||
// SC6[2]
|
||||
// packed objects
|
||||
|
||||
// SC6[3]
|
||||
rct_object_entry objects[721];
|
||||
|
||||
// SC6[4]
|
||||
uint16 elapsed_months;
|
||||
uint16 current_day;
|
||||
uint32 dword_F663AC;
|
||||
uint32 scenario_srand_0;
|
||||
uint32 scenario_srand_1;
|
||||
|
||||
// SC6[5]
|
||||
rct_map_element map_elements[0x30000];
|
||||
|
||||
// SC6[6]
|
||||
uint32 dword_010E63B8;
|
||||
rct_sprite sprites[10000];
|
||||
uint16 sprites_next_index;
|
||||
uint16 sprites_start_vehicle;
|
||||
uint16 sprites_start_peep;
|
||||
uint16 sprites_start_textfx;
|
||||
uint16 sprites_start_litter;
|
||||
uint8 pad_013573C6[2];
|
||||
uint16 word_013573C8;
|
||||
uint8 pad_013573CA[4];
|
||||
uint16 word_013573CE;
|
||||
uint16 word_013573D0;
|
||||
uint8 pad_013573D2[2];
|
||||
uint16 word_013573D4;
|
||||
uint8 pad_013573D6[4];
|
||||
uint32 dword_013573D8;
|
||||
uint32 dword_013573DC;
|
||||
money32 current_loan;
|
||||
uint32 park_flags;
|
||||
money16 park_entrance_fee;
|
||||
uint16 word_013573EA;
|
||||
uint16 word_013573EC;
|
||||
uint8 pad_013573EE[16];
|
||||
uint8 byte_013573F0;
|
||||
uint8 pad_013573F1[2];
|
||||
rct2_peep_spawn peep_spawns[2];
|
||||
uint8 guest_count_change_modifier;
|
||||
uint8 byte_013573FF;
|
||||
uint8 pad_01357400[4];
|
||||
uint32 dword_01357404;
|
||||
uint32 dword_01357408;
|
||||
uint32 dword_0135740C;
|
||||
uint32 dword_01357410[5];
|
||||
uint32 dword_01357424[8];
|
||||
uint32 dword_01357444[128];
|
||||
uint32 dword_01357644[128];
|
||||
|
||||
// SC6[7]
|
||||
uint16 guests_in_park;
|
||||
uint16 guests_heading_for_park;
|
||||
|
||||
// Ignored in scenario
|
||||
money32 expenditure_table[14];
|
||||
uint32 dword_01357880[5];
|
||||
uint32 dword_01357894;
|
||||
uint32 dword_01357898;
|
||||
uint32 dword_0135789C;
|
||||
uint32 dword_013578A0;
|
||||
uint32 dword_013578A4[201];
|
||||
|
||||
// SC6[8]
|
||||
uint16 last_guests_in_park;
|
||||
uint8 pad_01357BCA[3];
|
||||
uint8 handyman_colour;
|
||||
uint8 mechanic_colour;
|
||||
uint8 security_colour;
|
||||
|
||||
// Ignored in scenario
|
||||
uint32 dword_01357BD0[56];
|
||||
|
||||
// SC6[9]
|
||||
uint16 park_rating;
|
||||
|
||||
// Ignored in scenario
|
||||
uint8 park_rating_history[32];
|
||||
uint8 guests_in_park_history[32];
|
||||
|
||||
// SC6[10]
|
||||
uint16 word_01357CF2;
|
||||
uint32 word_01357CF4;
|
||||
uint8 byte_01357CF8[1000];
|
||||
uint32 dword_013580E0[32];
|
||||
uint16 word_013580E4[16];
|
||||
uint8 byte_013580E6;
|
||||
uint8 byte_013580E7;
|
||||
uint8 byte_013580E8;
|
||||
uint8 byte_013580E9;
|
||||
uint16 park_size;
|
||||
uint16 guest_generation_probability;
|
||||
uint16 total_ride_value;
|
||||
uint32 dword_013580F0;
|
||||
uint16 dword_013580F4;
|
||||
uint8 dword_013580F6;
|
||||
uint8 dword_013580F7;
|
||||
uint8 objective_type;
|
||||
uint8 objective_year;
|
||||
uint8 pad_013580FA[4];
|
||||
money32 objective_currency;
|
||||
uint16 objective_guests;
|
||||
uint8 campaign_weeks_left[20];
|
||||
uint8 campaign_ride_index[22];
|
||||
|
||||
// Ignored in scenario
|
||||
money32 balance_history[128];
|
||||
|
||||
// SC6[11]
|
||||
uint32 dword_0135832C;
|
||||
uint32 current_profit;
|
||||
uint32 dword_01358334;
|
||||
uint16 word_01358338;
|
||||
uint8 pad_0135833A[2];
|
||||
|
||||
// Ignored in scenario
|
||||
uint8 pad_0135833C[2];
|
||||
money32 park_value;
|
||||
money32 park_value_history[128];
|
||||
|
||||
// SC6[12]
|
||||
money32 completed_company_value;
|
||||
uint32 total_admissions;
|
||||
money32 income_from_admissions;
|
||||
money32 company_value;
|
||||
uint8 byte_01358750[16];
|
||||
rct_award awards[4];
|
||||
uint16 word_01358770;
|
||||
uint16 word_01358772;
|
||||
uint16 word_01358774;
|
||||
uint8 pad_01358776[4];
|
||||
uint32 dword_01358778[17];
|
||||
uint32 dword_013587BC;
|
||||
uint32 dword_013587C0;
|
||||
uint32 dword_013587C4;
|
||||
uint16 dword_013587C8;
|
||||
uint8 pad_013587CA[16];
|
||||
uint32 dword_013587D0;
|
||||
uint8 pad_013587D4[8];
|
||||
uint16 word_013587D8[16];
|
||||
money32 cash;
|
||||
uint8 pad_013587FC[50];
|
||||
uint16 word_0135882E;
|
||||
uint16 word_01358830;
|
||||
uint16 word_01358832;
|
||||
uint16 map_size;
|
||||
uint16 word_01358836;
|
||||
uint32 word_01358838;
|
||||
uint16 suggested_max_guests;
|
||||
uint16 word_0135883E;
|
||||
uint8 word_01358840;
|
||||
uint8 word_01358841;
|
||||
uint8 pad_01358842[4];
|
||||
uint32 dword_01358844;
|
||||
uint8 pad_01358848;
|
||||
uint32 dword_01358849;
|
||||
uint8 pad_0135884D[2];
|
||||
uint8 dword_0135884E[622];
|
||||
uint8 pad_01359206[2];
|
||||
uint16 word_01359208;
|
||||
char scenario_name[64];
|
||||
char scenario_description[255];
|
||||
uint8 byte_01359349;
|
||||
uint8 byte_0135934A;
|
||||
uint8 pad_0135934B[3];
|
||||
uint32 dword_0135934C;
|
||||
uint16 park_entrance_x[4];
|
||||
uint16 park_entrance_y[4];
|
||||
uint16 park_entrance_z[4];
|
||||
uint8 byte_01359368;
|
||||
uint8 pad_01359369[3];
|
||||
uint8 byte_0135936C[256];
|
||||
uint8 byte_0135946C[3256];
|
||||
uint8 byte_0135A124;
|
||||
uint8 byte_0135A125;
|
||||
uint16 word_0135A126;
|
||||
uint8 byte_0135A128;
|
||||
uint8 byte_0135A129;
|
||||
uint8 byte_0135A12A;
|
||||
uint8 byte_0135A12B[793];
|
||||
uint8 byte_0135A444[1200];
|
||||
char custom_strings[0x8000];
|
||||
uint32 game_ticks_1;
|
||||
rct_ride rides[255];
|
||||
uint16 word_01388698;
|
||||
uint16 saved_view_x;
|
||||
uint16 saved_view_y;
|
||||
uint16 saved_view_zoom_and_rotation;
|
||||
uint8 byte_013886A0[6000];
|
||||
uint8 byte_01389E10[6000];
|
||||
uint16 word_0138B580;
|
||||
uint8 pad_0138B580[2];
|
||||
uint16 word_0138B584;
|
||||
uint16 word_0138B586;
|
||||
uint16 word_0138B588;
|
||||
uint16 word_0138B58A;
|
||||
uint16 word_0138B58C;
|
||||
uint16 word_0138B58E;
|
||||
uint8 byte_0138B590;
|
||||
uint8 byte_0138B591;
|
||||
uint8 byte_0138B592;
|
||||
uint8 byte_0138B593;
|
||||
uint16 word_0138B594;
|
||||
uint16 word_0138B596;
|
||||
uint16 word_0138B598;
|
||||
uint16 word_0138B59A;
|
||||
uint16 word_0138B59C;
|
||||
uint16 word_0138B59E;
|
||||
uint16 word_0138B5A0;
|
||||
uint16 word_0138B5A2;
|
||||
uint16 word_0138B5A4;
|
||||
uint16 word_0138B5A6;
|
||||
uint16 word_0138B5A8;
|
||||
uint16 word_0138B5AA;
|
||||
uint16 word_0138B5AC;
|
||||
uint16 word_0138B5AE;
|
||||
uint16 word_0138B5B0;
|
||||
uint16 word_0138B5B2;
|
||||
uint16 word_0138B5B4;
|
||||
uint16 word_0138B5B6;
|
||||
uint16 word_0138B5B8;
|
||||
uint16 word_0138B5BA;
|
||||
uint16 word_0138B5BC;
|
||||
uint16 word_0138B5BE;
|
||||
uint16 word_0138B5C0;
|
||||
uint16 word_0138B5C2;
|
||||
uint16 word_0138B5C4;
|
||||
uint16 word_0138B5C6;
|
||||
uint16 word_0138B5C8;
|
||||
uint16 word_0138B5CA;
|
||||
uint16 word_0138B5CC;
|
||||
uint16 word_0138B5CE[31];
|
||||
uint8 ride_measurements[0x25860];
|
||||
uint32 dword_13B0E6C;
|
||||
uint16 word_13B0E70;
|
||||
uint32 dword_13B0E72[0x6600];
|
||||
uint8 byte_13CA672[116];
|
||||
uint8 byte_13CA6E6[84];
|
||||
uint8 byte_13CA73A[4];
|
||||
uint8 unk_13CA73E;
|
||||
uint8 pad_13CA73E;
|
||||
uint8 byte_13CA740;
|
||||
uint8 byte_13CA741;
|
||||
uint8 byte_13CA7424[4];
|
||||
uint8 climate;
|
||||
uint8 pad_013CA747;
|
||||
uint16 climate_update_timer;
|
||||
uint8 current_weather;
|
||||
uint8 next_weather;
|
||||
uint8 temperature;
|
||||
uint8 next_temperature;
|
||||
uint8 current_weather_effect;
|
||||
uint8 next_weather_effect;
|
||||
uint8 current_weather_gloom;
|
||||
uint8 next_weather_gloom;
|
||||
uint8 current_rain_level;
|
||||
uint8 next_rain_level;
|
||||
rct_news_item news_items[61];
|
||||
uint8 byte_13CE730[64];
|
||||
uint32 dword_13CE770;
|
||||
uint16 word_13CE774;
|
||||
uint16 word_13CE776[217];
|
||||
} rct_s6_data;
|
||||
*/
|
||||
|
||||
enum {
|
||||
SCENARIO_FLAGS_VISIBLE = (1 << 0),
|
||||
SCENARIO_FLAGS_COMPLETED = (1 << 1),
|
||||
|
|
|
|||
|
|
@ -1525,6 +1525,7 @@ void format_string_part(char **dest, rct_string_id format, char **args)
|
|||
// args += (format & 0xC00) >> 9;
|
||||
format &= ~0xC00;
|
||||
strcpy(*dest, RCT2_ADDRESS(0x135A8F4 + (format * 32), char));
|
||||
*dest = strchr(*dest, 0);
|
||||
} else if (format < 0xE000) {
|
||||
// Real name
|
||||
format -= -0xA000;
|
||||
|
|
@ -1532,6 +1533,7 @@ void format_string_part(char **dest, rct_string_id format, char **args)
|
|||
real_names[format % countof(real_names)],
|
||||
real_name_initials[(format >> 10) % countof(real_name_initials)]
|
||||
);
|
||||
*dest = strchr(*dest, 0);
|
||||
} else {
|
||||
// ?
|
||||
RCT2_CALLPROC_EBPSAFE(RCT2_ADDRESS(0x0095AFB8, uint32)[format]);
|
||||
|
|
|
|||
|
|
@ -567,6 +567,9 @@ enum {
|
|||
|
||||
STR_NO_RECENT_AWARDS = 2848,
|
||||
|
||||
STR_ENTRANCE_NOT_CONNECTED = 2854,
|
||||
STR_EXIT_NOT_CONNECTED = 2855,
|
||||
|
||||
STR_TUTORIAL = 2856,
|
||||
STR_PRESS_KEY_OR_MOUSE_BUTTON_FOR_CONTROL = 2857,
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ rct_widget window_banner_widgets[] = {
|
|||
|
||||
static void window_banner_emptysub() { }
|
||||
static void window_banner_mouseup();
|
||||
static void window_banner_mousedown();
|
||||
static void window_banner_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_banner_dropdown();
|
||||
static void window_banner_textinput();
|
||||
static void window_banner_invalidate();
|
||||
|
|
@ -182,14 +182,14 @@ static void window_banner_mouseup()
|
|||
}
|
||||
}
|
||||
|
||||
static void window_banner_mousedown()
|
||||
static void window_banner_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
short widgetIndex;
|
||||
//short widgetIndex;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
//__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
// __asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ static rct_widget window_footpath_widgets[] = {
|
|||
static void window_footpath_emptysub() { }
|
||||
static void window_footpath_close();
|
||||
static void window_footpath_mouseup();
|
||||
static void window_footpath_mousedown();
|
||||
static void window_footpath_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_footpath_dropdown();
|
||||
static void window_footpath_update(rct_window *w);
|
||||
static void window_footpath_toolupdate();
|
||||
|
|
@ -307,31 +307,8 @@ static void window_footpath_mouseup()
|
|||
*
|
||||
* rct2: 0x006A7EC5
|
||||
*/
|
||||
static void window_footpath_mousedown()
|
||||
static void window_footpath_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
short widgetIndex;
|
||||
rct_window *w;
|
||||
rct_widget *widget;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov w, esi
|
||||
#else
|
||||
__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widget, edi
|
||||
#else
|
||||
__asm__ ( "mov %[widget], edi " : [widget] "+m" (widget) );
|
||||
#endif
|
||||
|
||||
|
||||
switch (widgetIndex) {
|
||||
case WIDX_FOOTPATH_TYPE:
|
||||
window_footpath_show_footpath_types_dialog(w, widget, 0);
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ static rct_widget window_game_top_toolbar_widgets[] = {
|
|||
|
||||
static void window_game_top_toolbar_emptysub() { }
|
||||
static void window_game_top_toolbar_mouseup();
|
||||
static void window_game_top_toolbar_mousedown();
|
||||
static void window_game_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_game_top_toolbar_dropdown();
|
||||
static void window_game_top_toolbar_invalidate();
|
||||
static void window_game_top_toolbar_paint();
|
||||
|
|
@ -166,6 +166,11 @@ static void window_game_top_toolbar_mouseup()
|
|||
game_do_command(0, 1, 0, 0, 2, 0, 0);
|
||||
break;
|
||||
case WIDX_FASTFORWARD:
|
||||
// This is an excellent place to add in debugging statements and
|
||||
// print routines, that will be triggered when you press the
|
||||
// button in the game. Use "git update-index --skip-worktree
|
||||
// src/window_game_top_toolbar" to avoid committing these changes to
|
||||
// version control.
|
||||
window_cheats_open();
|
||||
break;
|
||||
|
||||
|
|
@ -254,32 +259,10 @@ static void window_game_top_toolbar_mouseup()
|
|||
*
|
||||
* rct2: 0x0066CA3B
|
||||
*/
|
||||
static void window_game_top_toolbar_mousedown()
|
||||
static void window_game_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
short widgetIndex;
|
||||
rct_window *w;
|
||||
rct_widget *widget;
|
||||
rct_viewport *mainViewport;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov w, esi
|
||||
#else
|
||||
__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widget, edi
|
||||
#else
|
||||
__asm__ ( "mov %[widget], edi " : [widget] "+m" (widget) );
|
||||
#endif
|
||||
|
||||
|
||||
if (widgetIndex == WIDX_FILE_MENU) {
|
||||
gDropdownItemsFormat[0] = 882;
|
||||
gDropdownItemsFormat[1] = 883;
|
||||
|
|
@ -384,30 +367,7 @@ static void window_game_top_toolbar_dropdown()
|
|||
break;
|
||||
case 1: // save game
|
||||
tool_cancel();
|
||||
{
|
||||
int eax, ebx, ecx, edx, esi, edi, ebp;
|
||||
RCT2_CALLFUNC_X(0x006750E9, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
|
||||
if (eax == 0) {
|
||||
gfx_invalidate_screen();
|
||||
break;
|
||||
}
|
||||
|
||||
char *src = (char*)0x0141EF67;
|
||||
do {
|
||||
src++;
|
||||
} while (*src != '.' && *src != '\0');
|
||||
strcpy(src, ".SV6");
|
||||
strcpy((char*) RCT2_ADDRESS_SAVED_GAMES_PATH_2, (char*) 0x0141EF68);
|
||||
|
||||
eax = 0;
|
||||
if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) & 8)
|
||||
eax |= 1;
|
||||
RCT2_CALLPROC_X(0x006754F5, eax, 0, 0, 0, 0, 0, 0);
|
||||
// check success?
|
||||
|
||||
game_do_command(0, 1047, 0, -1, 0, 0, 0);
|
||||
gfx_invalidate_screen();
|
||||
}
|
||||
save_game();
|
||||
break;
|
||||
case 3: // about
|
||||
window_about_open();
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ static rct_widget window_guest_list_widgets[] = {
|
|||
static void window_guest_list_emptysub() { }
|
||||
static void window_guest_list_mouseup();
|
||||
static void window_guest_list_resize();
|
||||
static void window_guest_list_mousedown();
|
||||
static void window_guest_list_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_guest_list_dropdown();
|
||||
static void window_guest_list_update(rct_window *w);
|
||||
static void window_guest_list_scrollgetsize();
|
||||
|
|
@ -241,32 +241,9 @@ static void window_guest_list_resize()
|
|||
*
|
||||
* rct2: 0x00699AC4
|
||||
*/
|
||||
static void window_guest_list_mousedown()
|
||||
static void window_guest_list_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
int i;
|
||||
short widgetIndex;
|
||||
rct_window *w;
|
||||
rct_widget *widget;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov w, esi
|
||||
#else
|
||||
__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widget, edi
|
||||
#else
|
||||
__asm__ ( "mov %[widget], edi " : [widget] "+m" (widget) );
|
||||
#endif
|
||||
|
||||
|
||||
switch (widgetIndex) {
|
||||
case WIDX_TAB_1:
|
||||
case WIDX_TAB_2:
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ static rct_widget window_land_widgets[] = {
|
|||
static void window_land_emptysub() { }
|
||||
static void window_land_close();
|
||||
static void window_land_mouseup();
|
||||
static void window_land_mousedown();
|
||||
static void window_land_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_land_dropdown();
|
||||
static void window_land_update(rct_window *w);
|
||||
static void window_land_invalidate();
|
||||
|
|
@ -217,31 +217,9 @@ static void window_land_mouseup()
|
|||
*
|
||||
* rct2: 0x0066407B
|
||||
*/
|
||||
static void window_land_mousedown()
|
||||
static void window_land_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
int i;
|
||||
short widgetIndex;
|
||||
rct_window *w;
|
||||
rct_widget *widget;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov w, esi
|
||||
#else
|
||||
__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widget, edi
|
||||
#else
|
||||
__asm__ ( "mov %[widget], edi " : [widget] "+m" (widget) );
|
||||
#endif
|
||||
|
||||
|
||||
switch (widgetIndex) {
|
||||
case WIDX_FLOOR:
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ static rct_widget window_map_widgets[] = {
|
|||
static void window_map_emptysub() { }
|
||||
static void window_map_close();
|
||||
static void window_map_mouseup();
|
||||
static void window_map_mousedown();
|
||||
static void window_map_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_map_update(rct_window *w);
|
||||
static void window_map_scrollgetsize();
|
||||
static void window_map_scrollmousedown();
|
||||
|
|
@ -228,7 +228,7 @@ static void window_map_mouseup()
|
|||
*
|
||||
* rct2: 0x0068D040
|
||||
*/
|
||||
static void window_map_mousedown()
|
||||
static void window_map_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
RCT2_CALLPROC_EBPSAFE(0x0068D040);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ static rct_widget window_options_widgets[] = {
|
|||
|
||||
static void window_options_emptysub() { }
|
||||
static void window_options_mouseup();
|
||||
static void window_options_mousedown();
|
||||
static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_options_dropdown();
|
||||
static void window_options_update(rct_window *w);
|
||||
static void window_options_paint();
|
||||
|
|
@ -223,6 +223,7 @@ static void window_options_mouseup()
|
|||
break;
|
||||
case WIDX_SCREEN_EDGE_SCROLLING:
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_EDGE_SCROLLING, uint8) ^= 1;
|
||||
gGeneral_config.edge_scrolling ^= 1;
|
||||
config_save();
|
||||
window_invalidate(w);
|
||||
break;
|
||||
|
|
@ -248,11 +249,15 @@ static void window_options_mouseup()
|
|||
break;
|
||||
case WIDX_TILE_SMOOTHING_CHECKBOX:
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) ^= CONFIG_FLAG_DISABLE_SMOOTH_LANDSCAPE;
|
||||
gGeneral_config.landscape_smoothing = !(RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8)
|
||||
& CONFIG_FLAG_DISABLE_SMOOTH_LANDSCAPE);
|
||||
config_save();
|
||||
gfx_invalidate_screen();
|
||||
break;
|
||||
case WIDX_GRIDLINES_CHECKBOX:
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) ^= CONFIG_FLAG_ALWAYS_SHOW_GRIDLINES;
|
||||
gGeneral_config.always_show_gridlines = RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8)
|
||||
& CONFIG_FLAG_ALWAYS_SHOW_GRIDLINES;
|
||||
config_save();
|
||||
gfx_invalidate_screen();
|
||||
|
||||
|
|
@ -265,12 +270,15 @@ static void window_options_mouseup()
|
|||
break;
|
||||
case WIDX_SAVE_PLUGIN_DATA_CHECKBOX:
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) ^= CONFIG_FLAG_SAVE_PLUGIN_DATA;
|
||||
gGeneral_config.save_plugin_data = !(RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8)
|
||||
& CONFIG_FLAG_SAVE_PLUGIN_DATA);
|
||||
config_save();
|
||||
window_invalidate(w);
|
||||
break;
|
||||
case WIDX_SOUND_SW_BUFFER_CHECKBOX:
|
||||
pause_sounds();
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_SOUND_SW_BUFFER, uint8) ^= 1;
|
||||
gSound_config.forced_software_buffering ^= 1;
|
||||
config_save();
|
||||
unpause_sounds();
|
||||
window_invalidate(w);
|
||||
|
|
@ -282,25 +290,9 @@ static void window_options_mouseup()
|
|||
*
|
||||
* rct2: 0x006BB01B
|
||||
*/
|
||||
static void window_options_mousedown()
|
||||
static void window_options_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
int num_items, i;
|
||||
short widgetIndex;
|
||||
rct_window *w;
|
||||
rct_widget *widget;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov w, esi
|
||||
#else
|
||||
__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
|
||||
#endif
|
||||
|
||||
|
||||
widget = &w->widgets[widgetIndex - 1];
|
||||
|
||||
|
|
@ -445,9 +437,12 @@ static void window_options_dropdown()
|
|||
case WIDX_HEIGHT_LABELS_DROPDOWN:
|
||||
// reset flag and set it to 1 if height as units is selected
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) &= ~CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS;
|
||||
gGeneral_config.show_height_as_units = 0;
|
||||
|
||||
if (dropdownIndex == 0)
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) |= CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS;
|
||||
if (dropdownIndex == 0) {
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) |= CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS;
|
||||
gGeneral_config.show_height_as_units = 1;
|
||||
}
|
||||
|
||||
window_options_update_height_markers();
|
||||
break;
|
||||
|
|
@ -463,17 +458,20 @@ static void window_options_dropdown()
|
|||
// TODO: no clue what this does (and if it's correct)
|
||||
RCT2_GLOBAL(0x009AAC75, uint8) = RCT2_GLOBAL(0x009AF601 + dropdownIndex, uint8);
|
||||
RCT2_GLOBAL(0x009AAC76, uint8) = RCT2_GLOBAL(0x009AF604 + dropdownIndex, uint8);
|
||||
|
||||
gSound_config.sound_quality = (sint8)dropdownIndex;
|
||||
config_save();
|
||||
window_invalidate(w);
|
||||
break;
|
||||
case WIDX_CURRENCY_DROPDOWN:
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_CURRENCY, uint8) = dropdownIndex | 0xC0;
|
||||
gGeneral_config.currency_format = (sint8)dropdownIndex;
|
||||
config_save();
|
||||
gfx_invalidate_screen();
|
||||
break;
|
||||
case WIDX_DISTANCE_DROPDOWN:
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, uint8) = (uint8)dropdownIndex;
|
||||
gGeneral_config.measurement_format = (sint8)dropdownIndex;
|
||||
config_save();
|
||||
window_options_update_height_markers();
|
||||
break;
|
||||
case WIDX_RESOLUTION_DROPDOWN:
|
||||
|
|
@ -488,6 +486,7 @@ static void window_options_dropdown()
|
|||
case WIDX_TEMPERATURE_DROPDOWN:
|
||||
if (dropdownIndex != RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, uint8)) {
|
||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, uint8) = (uint8)dropdownIndex;
|
||||
gGeneral_config.temperature_format = (sint8)dropdownIndex;
|
||||
config_save();
|
||||
gfx_invalidate_screen();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ static void window_park_emptysub() { }
|
|||
static void window_park_entrance_close();
|
||||
static void window_park_entrance_mouseup();
|
||||
static void window_park_entrance_resize();
|
||||
static void window_park_entrance_mousedown();
|
||||
static void window_park_entrance_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_park_entrance_dropdown();
|
||||
static void window_park_entrance_update(rct_window *w);
|
||||
static void window_park_entrance_toolupdate();
|
||||
|
|
@ -243,7 +243,7 @@ static void window_park_guests_paint();
|
|||
|
||||
static void window_park_price_mouseup();
|
||||
static void window_park_price_resize();
|
||||
static void window_park_price_mousedown();
|
||||
static void window_park_price_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_park_price_update(rct_window *w);
|
||||
static void window_park_price_invalidate();
|
||||
static void window_park_price_paint();
|
||||
|
|
@ -731,31 +731,8 @@ static void window_park_entrance_resize()
|
|||
*
|
||||
* rct2: 0x006681BF
|
||||
*/
|
||||
static void window_park_entrance_mousedown()
|
||||
static void window_park_entrance_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
short widgetIndex;
|
||||
rct_window *w;
|
||||
rct_widget *widget;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov w, esi
|
||||
#else
|
||||
__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widget, edi
|
||||
#else
|
||||
__asm__ ( "mov %[widget], edi " : [widget] "+m" (widget) );
|
||||
#endif
|
||||
|
||||
|
||||
if (widgetIndex == WIDX_OPEN_OR_CLOSE) {
|
||||
gDropdownItemsFormat[0] = 1142;
|
||||
gDropdownItemsFormat[1] = 1142;
|
||||
|
|
@ -1617,24 +1594,9 @@ static void window_park_price_resize()
|
|||
*
|
||||
* rct2: 0x0066902C
|
||||
*/
|
||||
static void window_park_price_mousedown()
|
||||
static void window_park_price_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
int newFee;
|
||||
short widgetIndex;
|
||||
rct_window *w;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov w, esi
|
||||
#else
|
||||
__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
|
||||
#endif
|
||||
|
||||
|
||||
switch (widgetIndex) {
|
||||
case WIDX_CLOSE:
|
||||
|
|
@ -2259,13 +2221,13 @@ static void window_park_awards_paint()
|
|||
y = w->y + window_park_awards_widgets[WIDX_PAGE_BACKGROUND].top + 4;
|
||||
|
||||
count = 0;
|
||||
for (i = 0; i < 4; i++) {
|
||||
for (i = 0; i < MAX_AWARDS; i++) {
|
||||
award = &RCT2_ADDRESS(RCT2_ADDRESS_AWARD_LIST, rct_award)[i];
|
||||
if (award->time == 0)
|
||||
continue;
|
||||
|
||||
gfx_draw_sprite(dpi, SPR_AWARD_MOST_UNTIDY + award->type, x, y);
|
||||
gfx_draw_string_left_wrapped(dpi, NULL, x + 34, y + 6, 180, STR_AWARD_MOST_UNTIDY, 0);
|
||||
gfx_draw_string_left_wrapped(dpi, NULL, x + 34, y + 6, 180, STR_AWARD_MOST_UNTIDY + award->type, 0);
|
||||
|
||||
y += 32;
|
||||
count++;
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ static rct_widget window_ride_list_widgets[] = {
|
|||
static void window_ride_list_emptysub() { }
|
||||
static void window_ride_list_mouseup();
|
||||
static void window_ride_list_resize();
|
||||
static void window_ride_list_mousedown();
|
||||
static void window_ride_list_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_ride_list_dropdown();
|
||||
static void window_ride_list_update(rct_window *w);
|
||||
static void window_ride_list_scrollgetsize();
|
||||
|
|
@ -248,31 +248,9 @@ static void window_ride_list_resize()
|
|||
*
|
||||
* rct2: 0x006B3532
|
||||
*/
|
||||
static void window_ride_list_mousedown()
|
||||
static void window_ride_list_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
int numItems, i;
|
||||
short widgetIndex;
|
||||
rct_window *w;
|
||||
rct_widget *widget;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov w, esi
|
||||
#else
|
||||
__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widget, edi
|
||||
#else
|
||||
__asm__ ( "mov %[widget], edi " : [widget] "+m" (widget) );
|
||||
#endif
|
||||
|
||||
|
||||
if (widgetIndex == WIDX_OPEN_CLOSE_ALL) {
|
||||
gDropdownItemsFormat[0] = STR_CLOSE_ALL;
|
||||
|
|
|
|||
|
|
@ -257,11 +257,12 @@ static void window_save_prompt_mouseup()
|
|||
} else {
|
||||
switch (widgetIndex) {
|
||||
case WIDX_SAVE:
|
||||
// TODO to avoid data loss, treat SAVE as CANCEL
|
||||
RCT2_ERROR("TODO");
|
||||
window_close(w);
|
||||
window_save_prompt_close();
|
||||
return;
|
||||
if (!save_game()) {
|
||||
// user pressed cancel
|
||||
window_close(w);
|
||||
window_save_prompt_close();
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case WIDX_DONT_SAVE:
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ static rct_widget window_title_menu_widgets[] = {
|
|||
|
||||
static void window_title_menu_emptysub() { }
|
||||
static void window_title_menu_mouseup();
|
||||
static void window_title_menu_mousedown();
|
||||
static void window_title_menu_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_title_menu_dropdown();
|
||||
static void window_title_menu_unknown17();
|
||||
static void window_title_menu_paint();
|
||||
|
|
@ -122,31 +122,8 @@ static void window_title_menu_mouseup()
|
|||
}
|
||||
}
|
||||
|
||||
static void window_title_menu_mousedown()
|
||||
static void window_title_menu_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
short widgetIndex;
|
||||
rct_window *w;
|
||||
rct_widget *widget;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov w, esi
|
||||
#else
|
||||
__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widget, edi
|
||||
#else
|
||||
__asm__ ( "mov %[widget], edi " : [widget] "+m" (widget) );
|
||||
#endif
|
||||
|
||||
|
||||
if (widgetIndex == WIDX_SHOW_TUTORIAL) {
|
||||
gDropdownItemsFormat[0] = STR_TUTORIAL_BEGINNERS;
|
||||
gDropdownItemsFormat[1] = STR_TUTORIAL_CUSTOM_RIDES;
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ static void window_scenarioselect_init_tabs();
|
|||
|
||||
static void window_scenarioselect_emptysub() { }
|
||||
static void window_scenarioselect_mouseup();
|
||||
static void window_scenarioselect_mousedown();
|
||||
static void window_scenarioselect_mousedown(int widgetIndex, rct_window*w, rct_widget* widget);
|
||||
static void window_scenarioselect_scrollgetsize();
|
||||
static void window_scenarioselect_scrollmousedown();
|
||||
static void window_scenarioselect_scrollmouseover();
|
||||
|
|
@ -190,24 +190,8 @@ static void window_scenarioselect_mouseup()
|
|||
window_close(w);
|
||||
}
|
||||
|
||||
static void window_scenarioselect_mousedown()
|
||||
static void window_scenarioselect_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
|
||||
{
|
||||
short widgetIndex;
|
||||
rct_window *w;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov widgetIndex, dx
|
||||
#else
|
||||
__asm__ ( "mov %[widgetIndex], dx " : [widgetIndex] "+m" (widgetIndex) );
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
__asm mov w, esi
|
||||
#else
|
||||
__asm__ ( "mov %[w], esi " : [w] "+m" (w) );
|
||||
#endif
|
||||
|
||||
|
||||
if (widgetIndex >= WIDX_TAB1 && widgetIndex <= WIDX_TAB5) {
|
||||
w->selected_tab = widgetIndex - 4;
|
||||
w->var_494 = 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue