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

Strip all whitespace

This commit is contained in:
Michał Janiszewski 2015-10-20 20:16:30 +02:00
parent 6fb6bb2556
commit 7d0ce00bab
163 changed files with 1280 additions and 1280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
distribution/windows/install.nsi
View File

@ -121,7 +121,7 @@ Section "!OpenRCT2" Section1
; Copy the rest of the stuff
SetOutPath "$INSTDIR\"
; Copy curl ca file
File ..\..\curl-ca-bundle.crt
@ -370,14 +370,14 @@ FunctionEnd
; $var=2 Version2 is newer
Function VersionCompare
!define VersionCompare `!insertmacro VersionCompareCall`
!macro VersionCompareCall _VER1 _VER2 _RESULT
Push `${_VER1}`
Push `${_VER2}`
Call VersionCompare
Pop ${_RESULT}
!macroend
Exch $1
Exch
Exch $0
@ -388,7 +388,7 @@ Function VersionCompare
Push $5
Push $6
Push $7
begin:
StrCpy $2 -1
IntOp $2 $2 + 1
@ -398,7 +398,7 @@ Function VersionCompare
StrCpy $4 $0 $2
IntOp $2 $2 + 1
StrCpy $0 $0 '' $2
StrCpy $2 -1
IntOp $2 $2 + 1
StrCpy $3 $1 1 $2
@ -407,32 +407,32 @@ Function VersionCompare
StrCpy $5 $1 $2
IntOp $2 $2 + 1
StrCpy $1 $1 '' $2
StrCmp $4$5 '' equal
StrCpy $6 -1
IntOp $6 $6 + 1
StrCpy $3 $4 1 $6
StrCmp $3 '0' -2
StrCmp $3 '' 0 +2
StrCpy $4 0
StrCpy $7 -1
IntOp $7 $7 + 1
StrCpy $3 $5 1 $7
StrCmp $3 '0' -2
StrCmp $3 '' 0 +2
StrCpy $5 0
StrCmp $4 0 0 +2
StrCmp $5 0 begin newer2
StrCmp $5 0 newer1
IntCmp $6 $7 0 newer1 newer2
StrCpy $4 '1$4'
StrCpy $5 '1$5'
IntCmp $4 $5 begin newer2 newer1
equal:
StrCpy $0 0
goto end
@ -441,7 +441,7 @@ Function VersionCompare
goto end
newer2:
StrCpy $0 2
end:
Pop $7
Pop $6

2
projects/resource.h
View File

@ -3,7 +3,7 @@
// Used by openrct2.rc
// Next default values for new objects
//
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101

4
src/audio/mixer.cpp
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/audio/mixer.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/cheats.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

6
src/cmdline.c
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@ -70,7 +70,7 @@ static const char *const usage[] = {
*/
int cmdline_run(const char **argv, int argc)
{
//
//
int version = 0, headless = 0, verbose = 0, width = 0, height = 0, port = 0;
char *server = NULL;

4
src/cmdline.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

20
src/cmdline_sprite.c
View File

@ -89,7 +89,7 @@ bool sprite_file_save(const char *path)
SDL_RWops *file = SDL_RWFromFile(path, "wb");
if (file == NULL)
return false;
if (SDL_RWwrite(file, &spriteFileHeader, sizeof(rct_sprite_file_header), 1) != 1) {
SDL_RWclose(file);
return false;
@ -218,7 +218,7 @@ int get_closest_palette_index(sint16 *colour){
}
int get_palette_index(sint16 *colour)
{
{
if (is_transparent_pixel(colour))
return -1;
@ -267,7 +267,7 @@ bool sprite_file_import(const char *path, rct_g1_element *outElement, uint8 **ou
}
uint8 *dst = buffer + (height * 2);
for (unsigned int y = 0; y < height; y++) {
rle_code *previousCode, *currentCode;
@ -285,7 +285,7 @@ bool sprite_file_import(const char *path, rct_g1_element *outElement, uint8 **ou
if (mode == MODE_CLOSEST || mode == MODE_DITHERING)
if (paletteIndex == -1 && !is_transparent_pixel(src))
paletteIndex = get_closest_palette_index(src);
if (mode == MODE_DITHERING)
if (!is_transparent_pixel(src) && is_changable_pixel(get_palette_index(src))){
@ -487,7 +487,7 @@ int cmdline_for_sprite(const char **argv, int argc)
int maxIndex = (int)spriteFileHeader.num_entries;
int numbers = (int)floor(log(maxIndex));
strncpy(outputPath, argv[2], MAX_PATH);
int pathLen = strlen(outputPath);
@ -560,7 +560,7 @@ int cmdline_for_sprite(const char **argv, int argc)
fprintf(stderr, "Unable to open input sprite file.\n");
return -1;
}
spriteFileHeader.num_entries++;
spriteFileHeader.total_size += bufferLength;
spriteFileEntries = realloc(spriteFileEntries, spriteFileHeader.num_entries * sizeof(rct_g1_element));
@ -572,7 +572,7 @@ int cmdline_for_sprite(const char **argv, int argc)
spriteFileEntries[spriteFileHeader.num_entries - 1] = spriteElement;
memcpy(spriteFileData + (spriteFileHeader.total_size - bufferLength), buffer, bufferLength);
spriteFileEntries[spriteFileHeader.num_entries - 1].offset = spriteFileData + (spriteFileHeader.total_size - bufferLength);
free(buffer);
if (!sprite_file_save(spriteFilePath))
return -1;
@ -672,7 +672,7 @@ static rct_sprite_file_palette_entry _standardPalette[256] = {
{ 0, 0, 0, 255 },
{ 0, 0, 0, 255 },
//
//
{ 35, 35, 23, 255 },
{ 51, 51, 35, 255 },
{ 67, 67, 47, 255 },
@ -865,9 +865,9 @@ static rct_sprite_file_palette_entry _standardPalette[256] = {
{ 207, 207, 131, 255 },
{ 231, 231, 171, 255 },
{ 255, 255, 207, 255 },
// 203 - 214 (Secondary remap)
{ 27, 0, 63, 255 },
{ 27, 0, 63, 255 },
{ 51, 0, 103, 255 },
{ 63, 11, 123, 255 },
{ 79, 23, 143, 255 },

4
src/config.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

6
src/drawing/drawing.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -79,7 +79,7 @@ extern int gLastDrawStringY;
extern rct_g1_element *g1Elements;
extern rct_gx g2;
//
//
rct_drawpixelinfo* clip_drawpixelinfo(rct_drawpixelinfo* dpi, int left, int width, int top, int height);
void gfx_set_dirty_blocks(sint16 left, sint16 top, sint16 right, sint16 bottom);
void gfx_draw_all_dirty_blocks();

4
src/drawing/font.c
View File

@ -21,7 +21,7 @@ void font_sprite_initialise_characters()
int glyphOffset = fontSize * FONT_SPRITE_GLYPH_COUNT;
for (uint8 glyphIndex = 0; glyphIndex < FONT_SPRITE_GLYPH_COUNT; glyphIndex++) {
rct_g1_element g1 = g1Elements[glyphIndex + SPR_CHAR_START + glyphOffset];
int width = fontSize == FONT_SIZE_BIG ? g1.width + 1 : g1.width - 1;
if (glyphIndex >= (FORMAT_ARGUMENT_CODE_START - 32) && glyphIndex < (FORMAT_COLOUR_CODE_END - 32)) {
width = 0;
@ -29,7 +29,7 @@ void font_sprite_initialise_characters()
*pCharacterWidth++ = (uint8)width;
}
}
scrolling_text_initialise_bitmaps();
for (int i = 0; i < 32; i++) {

4
src/drawing/line.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

14
src/drawing/rain.c
View File

@ -1,5 +1,5 @@
/*****************************************************************************
* Copyright (c) 2014
* Copyright (c) 2014
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
* This file is part of OpenRCT2.
@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -105,7 +105,7 @@ static void draw_rain_window(rct_window* original_w, short left, short right, sh
draw_rain_window(original_w, left, w_right, top, bottom, draw_rain_func);
left = w_right;
draw_rain_window(original_w, left, right, top, bottom, draw_rain_func);
draw_rain_window(original_w, left, right, top, bottom, draw_rain_func);
return;
}
@ -113,7 +113,7 @@ static void draw_rain_window(rct_window* original_w, short left, short right, sh
draw_rain_window(original_w, left, right, top, w->y, draw_rain_func);
top = w->y;
draw_rain_window(original_w, left, right, top, bottom, draw_rain_func);
draw_rain_window(original_w, left, right, top, bottom, draw_rain_func);
return;
}
@ -122,7 +122,7 @@ static void draw_rain_window(rct_window* original_w, short left, short right, sh
draw_rain_window(original_w, left, right, top, w_bottom, draw_rain_func);
top = w_bottom;
draw_rain_window(original_w, left, right, top, bottom, draw_rain_func);
draw_rain_window(original_w, left, right, top, bottom, draw_rain_func);
return;
}
}
@ -147,7 +147,7 @@ static void draw_rain_animation(uint32 draw_rain_func)
}
/**
*
*
* rct2: 0x00684218
*/
void update_rain_animation()

20
src/drawing/rect.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -42,7 +42,7 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
top_ = top;
bottom_ = bottom;
dpi_ = dpi;
if ((left > right) || (top > bottom) || (dpi->x > right) || (left >= (dpi->x + dpi->width)) ||
(bottom < dpi->y) || (top >= (dpi->y + dpi->height)))
return;
@ -52,7 +52,7 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
uint16 cross_pattern = 0;
int start_x = left - dpi->x;
if (start_x < 0){
if (start_x < 0){
cross_pattern ^= start_x;
start_x = 0;
}
@ -65,7 +65,7 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
int width = end_x - start_x;
int start_y = top - dpi->y;
if (start_y < 0){
if (start_y < 0){
cross_pattern ^= start_y;
start_y = 0;
}
@ -80,14 +80,14 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
// 00678B2E 00678BE5
//Cross hatching
uint8* dest_pointer = (start_y * (dpi->width + dpi->pitch)) + start_x + dpi->bits;
uint32 ecx;
for (int i = 0; i < height; ++i) {
uint8* next_dest_pointer = dest_pointer + dpi->width + dpi->pitch;
ecx = cross_pattern;
// Rotate right
ecx = (ecx >> 1) | (ecx << (sizeof(ecx) * CHAR_BIT - 1));
ecx = (ecx & 0xFFFF0000) | width;
ecx = (ecx & 0xFFFF0000) | width;
// Fill every other pixel with the colour
for (; (ecx & 0xFFFF) > 0; ecx--) {
ecx = ecx ^ 0x80000000;
@ -98,7 +98,7 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
}
cross_pattern ^= 1;
dest_pointer = next_dest_pointer;
}
return;
}
@ -143,7 +143,7 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
for (int no_lines = height; no_lines > 0; no_lines--) {
char* next_dest_pointer = dest_pointer + dpi->width + dpi->pitch;
uint16 pattern = pattern_pointer[pattern_y];
uint16 pattern = pattern_pointer[pattern_y];
for (int no_pixels = width; no_pixels > 0; --no_pixels) {
if (pattern & (1 << pattern_x))
@ -168,7 +168,7 @@ void gfx_fill_rect(rct_drawpixelinfo *dpi, int left, int top, int right, int bot
left -= dpi->x;//0x4
if ( left < 0 ){
RCT2_GLOBAL(0xEDF824,sint32) -= left;
left = 0;
left = 0;
}
right -= dpi->x;
right++;

10
src/drawing/scrolling_text.c
View File

@ -33,7 +33,7 @@ void scrolling_text_initialise_bitmaps()
.zoom_level = 0
};
for (int i = 0; i < 224; i++) {
memset(drawingSurface, 0, sizeof(drawingSurface));
gfx_draw_sprite(&dpi, i + 0x10D5, -1, 0, 0);
@ -136,7 +136,7 @@ int scrolling_text_setup(rct_string_id stringId, uint16 scroll, uint16 scrolling
scrolling_text_format(scrollString, scrollText);
sint16* scrollingModePositions = RCT2_ADDRESS(RCT2_ADDRESS_SCROLLING_MODE_POSITIONS, uint16*)[scrollingMode];
memset(scrollText->bitmap, 0, 320 * 8);
if (gUseTrueTypeFont) {
scrolling_text_set_bitmap_for_ttf(scrollString, scroll, scrollText->bitmap, scrollingModePositions);
@ -186,8 +186,8 @@ void scrolling_text_set_bitmap_for_sprite(utf8 *text, int scroll, uint8 *bitmap,
uint8 *dst = &bitmap[scrollPosition];
for (uint8 char_bitmap = *characterBitmap; char_bitmap != 0; char_bitmap >>= 1){
if (char_bitmap & 1) *dst = characterColour;
// Jump to next row
// Jump to next row
dst += 64;
}
}
@ -261,7 +261,7 @@ void scrolling_text_set_bitmap_for_ttf(utf8 *text, int scroll, uint8 *bitmap, si
for (int y = 0; y < height; y++) {
if (src[y * pitch + x] != 0) *dst = colour;
// Jump to next row
// Jump to next row
dst += 64;
}
}

20
src/drawing/sprite.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -32,7 +32,7 @@ rct_gx g2;
rct_g1_element *g1Elements = (rct_g1_element*)RCT2_ADDRESS_G1_ELEMENTS;
/**
*
*
* rct2: 0x00678998
*/
int gfx_load_g1()
@ -267,8 +267,8 @@ void gfx_rle_sprite_to_buffer(uint8* source_bits_pointer, uint8* dest_bits_point
int line_width = (dpi->width >> zoom_level) + dpi->pitch;
if (source_y_start < 0){
source_y_start += zoom_amount;
if (source_y_start < 0){
source_y_start += zoom_amount;
next_dest_pointer += line_width;
height -= zoom_amount;
}
@ -351,7 +351,7 @@ void gfx_rle_sprite_to_buffer(uint8* source_bits_pointer, uint8* dest_bits_point
else if (image_type & IMAGE_TYPE_MIX_BACKGROUND){//In the .exe these are all unraveled loops
//Doesnt use source pointer ??? mix with background only?
//Not Tested
for (; no_pixels > 0; no_pixels -= zoom_amount, dest_pointer++){
uint8 pixel = *dest_pointer;
pixel = palette_pointer[pixel];
@ -374,7 +374,7 @@ void gfx_rle_sprite_to_buffer(uint8* source_bits_pointer, uint8* dest_bits_point
/**
*
* rct2: 0x0067A28E
* image_id (ebx)
* image_id (ebx)
* image_id as below
* 0b_111X_XXXX_XXXX_XXXX_XXXX_XXXX_XXXX_XXXX image_type
* 0b_XXX1_11XX_XXXX_XXXX_XXXX_XXXX_XXXX_XXXX image_sub_type (unknown pointer)
@ -444,7 +444,7 @@ void gfx_draw_sprite(rct_drawpixelinfo *dpi, int image_id, int x, int y, uint32
uint32 top_offset = palette_to_g1_offset[top_type]; //RCT2_ADDRESS(0x97FCBC, uint32)[top_type];
rct_g1_element top_palette = g1Elements[top_offset];
memcpy(palette_pointer + 0xF3, top_palette.offset + 0xF3, 12);
//Trousers
int trouser_type = (image_id >> 24) & 0x1f;
uint32 trouser_offset = palette_to_g1_offset[trouser_type]; //RCT2_ADDRESS(0x97FCBC, uint32)[trouser_type];
@ -471,7 +471,7 @@ void gfx_draw_sprite_palette_set(rct_drawpixelinfo *dpi, int image_id, int x, in
{
int image_element = image_id & 0x7FFFF;
int image_type = (image_id & 0xE0000000) >> 28;
rct_g1_element* g1_source;
if (image_element < SPR_G2_BEGIN) {
g1_source = &g1Elements[image_element];
@ -598,7 +598,7 @@ void gfx_draw_sprite_palette_set(rct_drawpixelinfo *dpi, int image_id, int x, in
uint8* dest_pointer = (uint8*)dpi->bits;
//Move the pointer to the start point of the destination
dest_pointer += ((dpi->width / zoom_amount) + dpi->pitch)*dest_start_y + dest_start_x;
if (g1_source->flags & G1_FLAG_RLE_COMPRESSION){
//We have to use a different method to move the source pointer for
//rle encoded sprites so that will be handled within this function

14
src/editor.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -183,7 +183,7 @@ void trackdesigner_load()
banner_init();
reset_park_entrances();
user_string_clear_all();
reset_sprite_list();
reset_sprite_list();
ride_init_all();
window_guest_list_init_vars_a();
staff_reset_modes();
@ -261,7 +261,7 @@ static void set_all_land_owned()
void editor_load_landscape(const char *path)
{
window_close_construction_windows();
char *extension = strrchr(path, '.');
if (extension != NULL) {
if (_stricmp(extension, ".sv4") == 0) {
@ -413,19 +413,19 @@ static int editor_read_s6(const char *path)
map_update_tile_pointers();
map_remove_all_rides();
//
//
for (i = 0; i < MAX_BANNERS; i++)
if (gBanners[i].type == 255)
gBanners[i].flags &= ~BANNER_FLAG_2;
//
//
rct_ride *ride;
FOR_ALL_RIDES(i, ride)
user_string_free(ride->name);
ride_init_all();
//
//
for (i = 0; i < MAX_SPRITES; i++) {
rct_sprite *sprite = &g_sprite_list[i];
user_string_free(sprite->unknown.name_string_idx);

4
src/editor.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

6
src/game.h
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#ifndef _GAME_H_
#define _GAME_H_

4
src/hook.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

42
src/input.c
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@ -98,7 +98,7 @@ static void sub_6EA2AA(rct_window *w, int widgetIndex, int x, int y, int edi);
#pragma region Mouse input
/**
*
*
* rct2: 0x006EA627
*/
void game_handle_input()
@ -144,7 +144,7 @@ void game_handle_input()
}
/**
*
*
* rct2: 0x006E83C7
*/
static void game_get_next_input(int *x, int *y, int *state)
@ -165,7 +165,7 @@ static void game_get_next_input(int *x, int *y, int *state)
}
/**
*
*
* rct2: 0x00407074
*/
static rct_mouse_data* get_mouse_input()
@ -181,7 +181,7 @@ static rct_mouse_data* get_mouse_input()
}
/**
*
*
* rct2: 0x006E8655
*/
static void game_handle_input_mouse(int x, int y, int state)
@ -330,7 +330,7 @@ static void game_handle_input_mouse(int x, int y, int state)
break;
}
}
#pragma region Window positioning / resizing
void input_window_position_begin(rct_window *w, int widgetIndex, int x, int y)
@ -512,7 +512,7 @@ static void input_scroll_begin(rct_window *w, int widgetIndex, int x, int y)
case SCROLL_PART_HSCROLLBAR_RIGHT:
scroll->h_left = min(scroll->h_left + 3, widget_width);
break;
case SCROLL_PART_HSCROLLBAR_LEFT_TROUGH:
case SCROLL_PART_HSCROLLBAR_LEFT_TROUGH:
scroll->h_left = max(scroll->h_left - widget_width , 0);
break;
case SCROLL_PART_HSCROLLBAR_RIGHT_TROUGH:
@ -556,9 +556,9 @@ static void input_scroll_continue(rct_window *w, int widgetIndex, int state, int
invalidate_scroll();
return;
}
widget_scroll_get_part(w, widget, x, y, &x2, &y2, &scroll_part, &scroll_id);
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_SCROLL_AREA, uint16) == SCROLL_PART_HSCROLLBAR_THUMB){
int temp_x = x;
x -= RCT2_GLOBAL(RCT2_ADDRESS_TOOLTIP_CURSOR_X, uint16);
@ -780,7 +780,7 @@ static void input_scroll_part_update_vbottom(rct_window *w, int widgetIndex, int
#pragma region Widgets
/**
*
*
* rct2: 0x006E9253
*/
static void input_widget_over(int x, int y, rct_window *w, int widgetIndex)
@ -818,7 +818,7 @@ static void input_widget_over(int x, int y, rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x006E9269
*/
static void input_widget_over_change_check(rct_windowclass windowClass, rct_windownumber windowNumber, int widgetIndex)
@ -871,7 +871,7 @@ static void input_widget_over_flatbutton_invalidate()
}
/**
*
*
* rct2: 0x006E95F9
*/
static void input_widget_left(int x, int y, rct_window *w, int widgetIndex)
@ -956,7 +956,7 @@ static void input_widget_left(int x, int y, rct_window *w, int widgetIndex)
#pragma endregion
/**
*
*
* rct2: 0x006ED833
*/
void process_mouse_over(int x, int y)
@ -1072,7 +1072,7 @@ void process_mouse_tool(int x, int y)
}
/**
*
*
* rct2: 0x006E8DA7
*/
void input_state_widget_pressed(int x, int y, int state, int widgetIndex, rct_window *w, rct_widget *widget)
@ -1270,14 +1270,14 @@ static void input_update_tooltip(rct_window *w, int widgetIndex, int x, int y)
#pragma region Keyboard input
/**
*
*
* rct2: 0x006E3B43
*/
void title_handle_keyboard_input()
{
rct_window *w;
int key;
if (!gConsoleOpen) {
// Handle modifier keys and key scrolling
RCT2_GLOBAL(RCT2_ADDRESS_PLACE_OBJECT_MODIFIER, uint8) = 0;
@ -1294,7 +1294,7 @@ void title_handle_keyboard_input()
while ((key = get_next_key()) != 0) {
if (key == 255)
continue;
// Reserve backtick for console
if (key == SDL_SCANCODE_GRAVE) {
if (gConfigGeneral.debugging_tools || gConsoleOpen) {
@ -1320,7 +1320,7 @@ void title_handle_keyboard_input()
}
/**
*
*
* rct2: 0x006E3B43
*/
void game_handle_keyboard_input()
@ -1464,7 +1464,7 @@ static void sub_6EA2AA(rct_window *w, int widgetIndex, int x, int y, int edi)
}
/**
*
*
* rct2: 0x00406CD2
*/
int get_next_key()
@ -1505,7 +1505,7 @@ void sub_6ED990(char cursor_id){
/**
*
*
* rct2: 0x006E876D
*/
void invalidate_scroll()

4
src/input.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/interface/console.c
View File

@ -154,7 +154,7 @@ void console_draw(rct_drawpixelinfo *dpi)
int x = _consoleLeft + 4;
int y = _consoleTop + 4;
// Draw previous lines
utf8 lineBuffer[2 + 256], *lineCh;
ch = _consoleViewBufferStart;
@ -933,7 +933,7 @@ console_command console_command_table[] = {
{ "windows", cc_windows, "Lists all the windows that can be opened.", "windows" },
{ "load_object", cc_load_object, "Loads the object file into the scenario.\n"
"Loading a scenery group will not load its associated objects.\n"
"This is a safer method opposed to \"open object_selection\".",
"This is a safer method opposed to \"open object_selection\".",
"load_object <objectfilenodat>" },
{ "object_count", cc_object_count, "Shows the number of objects of each type in the scenario.", "object_count" },
{ "twitch", cc_twitch, "Twitch API" },

4
src/interface/graph.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/interface/graph.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

8
src/interface/keyboard_shortcut.c
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@ -35,7 +35,7 @@ typedef void (*shortcut_action)();
static const shortcut_action shortcut_table[SHORTCUT_COUNT];
/**
*
*
* rct2: 0x006E3E91
*/
void keyboard_shortcut_set(int key)
@ -58,7 +58,7 @@ void keyboard_shortcut_set(int key)
}
/**
*
*
* rct2: 0x006E3E68
*/
void keyboard_shortcut_handle(int key)

4
src/interface/keyboard_shortcut.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/interface/screenshot.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/interface/themes.c
View File

@ -98,7 +98,7 @@ theme_window_preset gThemeWindowsRCT1[] = {
{ WC_GUEST_LIST, COLOURS_RCT1(22, 26, 26, 0, 0, 0) },
{ WC_STAFF_LIST, COLOURS_RCT1(12, 4, 4, 0, 0, 0) },
{ WC_FINANCES, COLOURS_RCT1(4, 1, 1, 0, 0, 0) },
{ WC_TITLE_MENU, COLOURS_RCT1(129, 129, 129, 0, 0, 0) },
{ WC_TITLE_MENU, COLOURS_RCT1(129, 129, 129, 0, 0, 0) },
{ WC_TITLE_EXIT, COLOURS_RCT1(129, 129, 129, 0, 0, 0) },
{ WC_NEW_CAMPAIGN, COLOURS_RCT1(4, 4, 1, 0, 0, 0) },
{ WC_TITLE_OPTIONS, COLOURS_RCT1(129, 129, 129, 0, 0, 0) },
@ -156,7 +156,7 @@ void colour_scheme_update(rct_window *window)
void colour_scheme_update_by_class(rct_window *window, rct_windowclass classification)
{
theme_window* theme = theme_window_get_by_class(classification);
bool transparent = false;
for (int i = 0; i < 6; i++) {
window->colours[i] = theme->colours[i];

10
src/interface/title_sequences.c
View File

@ -100,7 +100,7 @@ void title_sequence_create_preset(const char *name)
strcat(path, gConfigTitleSequences.presets[preset].name);
platform_file_delete(path);
platform_ensure_directory_exists(path);
title_sequence_save_preset_script(preset);
gCurrentTitleSequence = preset;
}
@ -164,7 +164,7 @@ void title_sequence_duplicate_preset(int duplicate, const char *name)
if (loadmm) {
title_sequence_add_save(preset, get_file_path(PATH_ID_SIXFLAGS_MAGICMOUNTAIN), "Six Flags Magic Mountain.SC6");
}
title_sequence_save_preset_script(preset);
gCurrentTitleSequence = preset;
}
@ -241,7 +241,7 @@ void title_sequence_add_save(int preset, const char *path, const char *newName)
gConfigTitleSequences.presets[preset].num_saves++;
gConfigTitleSequences.presets[preset].saves = realloc(gConfigTitleSequences.presets[preset].saves, sizeof(char[TITLE_SEQUENCE_MAX_SAVE_LENGTH]) * (size_t)gConfigTitleSequences.presets[preset].num_saves);
strcpy(gConfigTitleSequences.presets[preset].saves[gConfigTitleSequences.presets[preset].num_saves - 1], newName);
// Add the appropriate extension if needed
if (_stricmp(extension, ".sv6") != 0 && _stricmp(extension, ".sc6") != 0)
@ -260,7 +260,7 @@ void title_sequence_remove_save(int preset, int index)
strncat(path, &separator, 1);
strcat(path, gConfigTitleSequences.presets[preset].saves[index]);
platform_file_delete(path);
// Remove all references to this save in the commands and decrement save indecies
for (int i = 0; i < gConfigTitleSequences.presets[preset].num_commands; i++) {
if (gConfigTitleSequences.presets[preset].commands[i].command == TITLE_SCRIPT_LOAD) {
@ -270,7 +270,7 @@ void title_sequence_remove_save(int preset, int index)
gConfigTitleSequences.presets[preset].commands[i].saveIndex--;
}
}
for (int i = index; i < gConfigTitleSequences.presets[preset].num_saves - 1; i++) {
strcpy(gConfigTitleSequences.presets[preset].saves[i], gConfigTitleSequences.presets[preset].saves[i + 1]);
}

4
src/interface/viewport.h
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or

34
src/interface/viewport_interaction.c
View File

@ -56,7 +56,7 @@ int viewport_interaction_get_item_left(int x, int y, viewport_interaction_info *
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_MANAGER))
return info->type = VIEWPORT_INTERACTION_ITEM_NONE;
//
//
if ((RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) && s6Info->editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER)
return info->type = VIEWPORT_INTERACTION_ITEM_NONE;
@ -162,7 +162,7 @@ int viewport_interaction_left_click(int x, int y)
}
/**
*
*
* rct2: 0x006EDE88
*/
int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info *info)
@ -179,7 +179,7 @@ int viewport_interaction_get_item_right(int x, int y, viewport_interaction_info
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & (SCREEN_FLAGS_TITLE_DEMO | SCREEN_FLAGS_TRACK_MANAGER))
return info->type = VIEWPORT_INTERACTION_ITEM_NONE;
//
//
if ((RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) && s6Info->editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER)
return info->type = VIEWPORT_INTERACTION_ITEM_NONE;
@ -336,7 +336,7 @@ int viewport_interaction_right_over(int x, int y)
}
/**
*
*
* rct2: 0x006E8A62
*/
int viewport_interaction_right_click(int x, int y)
@ -385,7 +385,7 @@ int viewport_interaction_right_click(int x, int y)
}
/**
*
*
* rct2: 0x006E08D2
*/
static void viewport_interaction_remove_scenery(rct_map_element *mapElement, int x, int y)
@ -403,7 +403,7 @@ static void viewport_interaction_remove_scenery(rct_map_element *mapElement, int
}
/**
*
*
* rct2: 0x006A614A
*/
static void viewport_interaction_remove_footpath(rct_map_element *mapElement, int x, int y)
@ -413,7 +413,7 @@ static void viewport_interaction_remove_footpath(rct_map_element *mapElement, in
rct_map_element *mapElement2;
z = mapElement->base_height;
w = window_find_by_class(WC_FOOTPATH);
if (w != NULL)
footpath_provisional_update();
@ -429,7 +429,7 @@ static void viewport_interaction_remove_footpath(rct_map_element *mapElement, in
}
/**
*
*
* rct2: 0x006A61AB
*/
static void viewport_interaction_remove_footpath_item(rct_map_element *mapElement, int x, int y)
@ -453,7 +453,7 @@ static void viewport_interaction_remove_footpath_item(rct_map_element *mapElemen
}
/**
*
*
* rct2: 0x00666C0E
*/
void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, int x, int y)
@ -474,7 +474,7 @@ void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, int
}
/**
*
*
* rct2: 0x006E57A9
*/
static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, int x, int y)
@ -499,7 +499,7 @@ static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, i
}
/**
*
*
* rct2: 0x006B88DC
*/
static void viewport_interaction_remove_large_scenery(rct_map_element *mapElement, int x, int y)
@ -516,12 +516,12 @@ static void viewport_interaction_remove_large_scenery(rct_map_element *mapElemen
} else {
RCT2_GLOBAL(RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE, rct_string_id) = STR_CANT_REMOVE_THIS;
game_do_command(
x,
1 | ((mapElement->type & 0x3) << 8),
y,
x,
1 | ((mapElement->type & 0x3) << 8),
y,
mapElement->base_height | ((mapElement->properties.scenerymultiple.type >> 10) << 8),
GAME_COMMAND_REMOVE_LARGE_SCENERY,
0,
GAME_COMMAND_REMOVE_LARGE_SCENERY,
0,
0
);
}
@ -538,7 +538,7 @@ static rct_peep *viewport_interaction_get_closest_peep(int x, int y, int maxDist
w = window_find_from_point(x, y);
if (w == NULL)
return 0;
viewport = w->viewport;
if (viewport == NULL || viewport->zoom >= 2)
return 0;

54
src/interface/widget.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -48,7 +48,7 @@ static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex);
/**
*
*
* rct2: 0x006EAF26
*/
void widget_scroll_update_thumbs(rct_window *w, int widget_index)
@ -102,7 +102,7 @@ void widget_scroll_update_thumbs(rct_window *w, int widget_index)
}
/**
*
*
* rct2: 0x006EB2A8
*/
void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -170,7 +170,7 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x006EB6CE
*/
static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -188,7 +188,7 @@ static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
r = w->x + widget->right;
b = w->y + widget->bottom;
//
//
press = (w->flags & WF_10 ? 0x80 : 0);
// Get the colour
@ -210,7 +210,7 @@ static void widget_frame_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
}
/**
*
*
* rct2: 0x006EB765
*/
static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -247,7 +247,7 @@ static void widget_resize_draw(rct_drawpixelinfo *dpi, rct_window *w, int widget
}
/**
*
*
* rct2: 0x006EB8E5
*/
static void widget_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -297,7 +297,7 @@ static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetInd
// Get the widget
widget = &w->widgets[widgetIndex];
//
//
if (widget->image == -1)
return;
@ -330,7 +330,7 @@ static void widget_tab_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetInd
}
/**
*
*
* rct2: 0x006EB861
*/
static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -373,7 +373,7 @@ static void widget_flat_button_draw(rct_drawpixelinfo *dpi, rct_window *w, int w
}
/**
*
*
* rct2: 0x006EBBEB
*/
static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -403,7 +403,7 @@ static void widget_text_button(rct_drawpixelinfo *dpi, rct_window *w, int widget
}
/**
*
*
* rct2: 0x006EBC41
*/
static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -462,7 +462,7 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widge
}
/**
*
*
* rct2: 0x006EBD52
*/
static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -492,7 +492,7 @@ static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x006EBD1F
*/
static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -518,7 +518,7 @@ static void widget_text_inset(rct_drawpixelinfo *dpi, rct_window *w, int widgetI
}
/**
*
*
* rct2: 0x006EC1A6
*/
static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -546,12 +546,12 @@ static void widget_text_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIn
gfx_fill_rect_inset(dpi, l, t, r, b, colour, press);
// TODO
gfx_fill_rect(dpi, l, t, r, b, colour);
}
/**
*
*
* rct2: 0x006EB535
*/
static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -611,7 +611,7 @@ static void widget_groupbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
}
/**
*
*
* rct2: 0x006EB2F9
*/
static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -632,7 +632,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
// Get the colour
colour = w->colours[widget->colour];
//
//
if (w->var_4B8 != -1) {
gfx_draw_sprite(dpi, *((char*)(0x013CA742 + w->var_4B8)) << 19, l + 1, t + 1, 0);
if (w->width > 638)
@ -643,7 +643,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
gfx_draw_sprite(dpi, *((char*)(0x013CA742 + w->var_4B9)) << 19, l + 1 + 638, t + 1, 0);
}
//
//
press = 0x70;
if (w->flags & WF_10)
press |= 0x80;
@ -651,7 +651,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
gfx_fill_rect_inset(dpi, l, t, r, b, colour, press);
gfx_fill_rect(dpi, r + 1, t, r + 1, b, *((char*)(0x0141FC47 + (colour * 8))));
} else {
//
//
press = 0x60;
if (w->flags & WF_10)
press |= 0x80;
@ -682,7 +682,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
}
/**
*
*
* rct2: 0x006EBB85
*/
static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -726,7 +726,7 @@ static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
}
/**
*
*
* rct2: 0x006EBAD9
*/
static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -770,7 +770,7 @@ static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
}
/**
*
*
* rct2: 0x006EBD96
*/
static void widget_scroll_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
@ -858,11 +858,11 @@ static void widget_hscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
gfx_fill_rect(dpi, l + 10, t + 3, r - 10, t + 3, *((char*)(0x0141FC4B + (colour * 8))));
gfx_fill_rect(dpi, l + 10, t + 7, r - 10, t + 7, *((char*)(0x0141FC47 + (colour * 8))));
gfx_fill_rect(dpi, l + 10, t + 8, r - 10, t + 8, *((char*)(0x0141FC4B + (colour * 8))));
// Left button
gfx_fill_rect_inset(dpi, l, t, l + 9, b, colour, (scroll->flags & HSCROLLBAR_LEFT_PRESSED ? 0x20 : 0));
gfx_draw_string(dpi, (char*)BlackLeftArrowString, 0, l + 1, t);
// Thumb
gfx_fill_rect_inset(dpi,
max(l + 10, l + scroll->h_thumb_left - 1), t,
@ -901,7 +901,7 @@ static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
}
/**
*
*
* rct2: 0x006EB951
*/
static void widget_draw_image(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)

4
src/interface/widget.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

10
src/interface/window.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -102,7 +102,7 @@ typedef struct {
uint16 v_thumb_bottom; // 0x10
} rct_scroll;
/**
/**
* Viewport focus structure.
* size: 0xA
* Use sprite.type to work out type.
@ -122,7 +122,7 @@ typedef struct{
uint16 sprite_id; //0x482
uint8 pad_484;
uint8 type; //0x485 & VIEWPORT_FOCUS_TYPE_MASK
uint16 pad_486;
uint16 pad_486;
uint8 rotation; //0x488
uint8 zoom; //0x489
} sprite_focus;
@ -286,7 +286,7 @@ typedef enum {
WE_RESIZE = 2,
WE_MOUSE_DOWN = 3,
WE_DROPDOWN = 4,
WE_UNKNOWN_05 = 5,
WE_UNKNOWN_05 = 5,
// Unknown 05: Used to update tabs that are not being animated
// see window_peep. When the overview tab is not highlighted the
// items being carried such as hats/balloons still need to be shown

8
src/intro.c
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include "addresses.h"
#include "audio/audio.h"
#include "drawing/drawing.h"
@ -101,7 +101,7 @@ void intro_update()
break;
case 3:
//
//
_tick_counter += 5;
// Clear the screen

6
src/intro.h
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#ifndef _INTRO_H_
#define _INTRO_H_

6
src/management/award.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -416,7 +416,7 @@ static int award_is_deserved_most_disappointing(int awardType, int activeAwardTy
FOR_ALL_RIDES(i, ride) {
if (ride->excitement == (ride_rating)0xFFFF || ride->popularity == 0xFF)
continue;
countedRides++;
// Unpopular

4
src/management/award.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/management/finance.c
View File

@ -66,7 +66,7 @@ void finance_payment(money32 amount, rct_expenditure_type type)
RCT2_ADDRESS(RCT2_ADDRESS_EXPENDITURE_TABLE, money32)[type] -= amount;
if (dword_988E60[type] & 1)
RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_EXPENDITURE, money32) -= amount; // Cumulative amount of money spent this day
RCT2_GLOBAL(RCT2_ADDRESS_BTM_TOOLBAR_DIRTY_FLAGS, uint32) |= BTM_TB_DIRTY_FLAG_MONEY;
window_invalidate_by_class(WC_FINANCES);
@ -353,7 +353,7 @@ void finance_shift_expenditure_table() {
}
/**
*
*
* rct2: 0x0069E89B
*/
void finance_reset_cash_to_initial()

8
src/management/marketing.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -85,7 +85,7 @@ void marketing_update()
gMarketingCampaignDaysLeft[campaign] &= ~CAMPAIGN_ACTIVE_FLAG;
if (active)
continue;
if (--gMarketingCampaignDaysLeft[campaign] != 0)
continue;
@ -143,7 +143,7 @@ void marketing_start_campaign(int type, int rideOrItem, int numWeeks)
}
/**
*
*
* rct2: 0x0069E73C
*/
void game_command_start_campaign(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* edi, int* ebp)

4
src/management/marketing.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

10
src/management/news_item.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -103,7 +103,7 @@ static bool news_item_is_current_old()
}
/**
*
*
* rct2: 0x0066E252
*/
void news_item_update_current()
@ -156,7 +156,7 @@ void news_item_update_current()
}
/**
*
*
* rct2: 0x0066E377
*/
void news_item_close_current()
@ -381,7 +381,7 @@ void news_item_open_subject(int type, int subject)
}
}
}
// Switch to new scenery tab
window = window_find_by_class(WC_SCENERY);
if (window != NULL)

4
src/management/news_item.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

12
src/management/research.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -91,7 +91,7 @@ static void research_calculate_expected_date()
expectedDay = currentDay + (daysRemaining & 0xFFFF);
dayQuotient = expectedDay / 0x10000;
dayRemainder = expectedDay % 0x10000;
expectedMonth = date_get_month(currentMonth + dayQuotient + (daysRemaining >> 16));
expectedDay = (dayRemainder * days_in_month[expectedMonth]) >> 16;
@ -299,7 +299,7 @@ void sub_684AC3(){
ebp->entryIndex = (research + 1)->entryIndex;
uint8 cat = edx->category;
edx->category = ebp->category;
edx->category = ebp->category;
ebp->category = cat;
}
@ -322,7 +322,7 @@ void sub_684AC3(){
}
}
for (research = gResearchItems; research->entryIndex != RESEARCHED_ITEMS_SEPARATOR; research++){
research_finish_item(research->entryIndex);
}
@ -351,7 +351,7 @@ void research_remove_non_separate_vehicle_types()
researchItem != gResearchItems &&
researchItem->entryIndex != RESEARCHED_ITEMS_SEPARATOR &&
researchItem->entryIndex != RESEARCHED_ITEMS_END &&
researchItem->entryIndex >= 0x10000
researchItem->entryIndex >= 0x10000
) {
rct_ride_type *rideEntry = GET_RIDE_ENTRY(researchItem->entryIndex & 0xFF);
if (!(rideEntry->flags & (RIDE_ENTRY_FLAG_SEPARATE_RIDE | RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME))) {

6
src/management/research.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -29,7 +29,7 @@ typedef struct {
uint8 category;
} rct_research_item;
enum{
enum{
RESEARCH_ENTRY_FLAG_SCENERY_SET_ALWAYS_RESEARCHED = (1 << 29),
RESEARCH_ENTRY_FLAG_RIDE_ALWAYS_RESEARCHED = (1 << 30),
};

12
src/network/network.cpp
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -166,7 +166,7 @@ int NetworkConnection::ReadPacket()
if (LAST_SOCKET_ERROR() != EWOULDBLOCK && LAST_SOCKET_ERROR() != EAGAIN) {
return NETWORK_DISCONNECTED;
} else {
return NETWORK_NO_DATA;
return NETWORK_NO_DATA;
}
}
inboundpacket.transferred += readBytes;
@ -613,14 +613,14 @@ void Network::Server_Send_CHAT(const char* text)
void Network::Client_Send_GAMECMD(uint32 eax, uint32 ebx, uint32 ecx, uint32 edx, uint32 esi, uint32 edi, uint32 ebp, uint8 callback)
{
std::unique_ptr<NetworkPacket> packet = std::move(NetworkPacket::Allocate());
*packet << (uint32)NETWORK_COMMAND_GAMECMD << (uint32)RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32) << eax << (ebx | GAME_COMMAND_FLAG_NETWORKED) << ecx << edx << esi << edi << ebp << callback;
*packet << (uint32)NETWORK_COMMAND_GAMECMD << (uint32)RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32) << eax << (ebx | GAME_COMMAND_FLAG_NETWORKED) << ecx << edx << esi << edi << ebp << callback;
server_connection.QueuePacket(std::move(packet));
}
void Network::Server_Send_GAMECMD(uint32 eax, uint32 ebx, uint32 ecx, uint32 edx, uint32 esi, uint32 edi, uint32 ebp, uint8 playerid, uint8 callback)
{
std::unique_ptr<NetworkPacket> packet = std::move(NetworkPacket::Allocate());
*packet << (uint32)NETWORK_COMMAND_GAMECMD << (uint32)RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32) << eax << (ebx | GAME_COMMAND_FLAG_NETWORKED) << ecx << edx << esi << edi << ebp << playerid << callback;
*packet << (uint32)NETWORK_COMMAND_GAMECMD << (uint32)RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32) << eax << (ebx | GAME_COMMAND_FLAG_NETWORKED) << ecx << edx << esi << edi << ebp << playerid << callback;
SendPacketToClients(*packet);
}
@ -803,7 +803,7 @@ void Network::PrintError()
char *s = strerror(LAST_SOCKET_ERROR());
fprintf(stderr, "%s\n", s);
#endif
}
int Network::Client_Handle_AUTH(NetworkConnection& connection, NetworkPacket& packet)

4
src/network/network.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

2
src/network/twitch.cpp
View File

@ -175,7 +175,7 @@ static void twitch_leave()
// http_request_json_dispose(jsonResponse);
// _twitchState = TWITCH_STATE_LEFT;
// _twitchIdle = true;
//
//
// console_writeline("Left twitch channel.");
// });
}

4
src/openrct2.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/peep/peep.c
View File

@ -8379,7 +8379,7 @@ static bool peep_should_go_on_ride(rct_peep *peep, int rideIndex, int entranceNu
// Nausea calculations.
ride_rating maxNausea = NauseaMaximumThresholds[(peep->nausea_tolerance & 3)] + peep->happiness;
if (ride->nausea > maxNausea) {
if (peepAtRide) {
peep_insert_new_thought(peep, PEEP_THOUGHT_TYPE_SICKENING, rideIndex);
@ -9125,7 +9125,7 @@ money32 set_peep_name(int flags, int state, uint16 sprite_index, uint8* text_1,
peep->flags |= PEEP_FLAGS_LEAVING_PARK;
peep->flags &= ~PEEP_FLAGS_PARK_ENTRANCE_CHOSEN;
}
peep->flags &= ~PEEP_FLAGS_PURPLE;
if (peep_check_easteregg_name(EASTEREGG_PEEP_NAME_EMMA_GARRELL, peep)) {
peep->flags |= PEEP_FLAGS_PURPLE;

12
src/peep/peep.h
View File

@ -210,16 +210,16 @@ enum PEEP_STATE {
PEEP_STATE_INSPECTING = 23
};
enum PEEP_ACTION_EVENTS {
enum PEEP_ACTION_EVENTS {
PEEP_ACTION_CHECK_TIME = 0,
// If no food then check watch
PEEP_ACTION_EAT_FOOD = 1,
PEEP_ACTION_SHAKE_HEAD = 2,
PEEP_ACTION_EMPTY_POCKETS = 3,
PEEP_ACTION_EMPTY_POCKETS = 3,
PEEP_ACTION_SITTING_EAT_FOOD = 4,
PEEP_ACTION_SITTING_CHECK_WATCH = 4,
PEEP_ACTION_SITTING_LOOK_AROUND_LEFT = 5,
PEEP_ACTION_SITTING_LOOK_AROUND_RIGHT = 6,
PEEP_ACTION_SITTING_LOOK_AROUND_RIGHT = 6,
PEEP_ACTION_WOW = 7,
PEEP_ACTION_THROW_UP = 8,
PEEP_ACTION_JUMP = 9,
@ -413,14 +413,14 @@ typedef struct {
uint8 sub_state; // 0x2C
uint8 sprite_type; // 0x2D
uint8 type; // 0x2E
union{
union{
uint8 staff_type; // 0x2F
uint8 no_of_rides; // 0x2F
};
uint8 tshirt_colour; // 0x30
uint8 trousers_colour; // 0x31
uint16 destination_x; // 0x32 Location that the peep is trying to get to
uint16 destination_y; // 0x34
uint16 destination_y; // 0x34
uint8 destination_tolerence; // 0x36 How close to destination before next action/state 0 = exact
uint8 var_37;
uint8 energy; // 0x38
@ -477,7 +477,7 @@ typedef struct {
};
uint8 var_79;
uint16 time_in_queue; // 0x7A
uint8 rides_been_on[32]; // 0x7C
uint8 rides_been_on[32]; // 0x7C
// 255 bit bitmap of every ride the peep has been on see
// window_peep_rides_update for how to use.
uint32 id; // 0x9C

6
src/peep/staff.c
View File

@ -56,7 +56,7 @@ void game_command_update_staff_colour(int *eax, int *ebx, int *ecx, int *edx, in
uint8 staffType, colour;
int spriteIndex;
rct_peep *peep;
staffType = (*ebx >> 8) & 0xFF;
colour = (*edx >> 8) & 0xFF;
@ -125,7 +125,7 @@ void game_command_hire_new_staff_member(int* eax, int* ebx, int* ecx, int* edx,
sprite_remove((rct_sprite*)newPeep);
} else {
move_sprite_to_list((rct_sprite *)newPeep, SPRITE_LINKEDLIST_OFFSET_PEEP);
newPeep->sprite_identifier = 1;
newPeep->window_invalidate_flags = 0;
newPeep->action = PEEP_ACTION_NONE_2;
@ -412,7 +412,7 @@ void staff_update_greyed_patrol_areas()
{
for (int i = 0; i < 128; ++i)
RCT2_ADDRESS(RCT2_ADDRESS_STAFF_PATROL_AREAS + ((staff_type + STAFF_MAX_COUNT) * 512), uint32)[i] = 0;
for (uint16 sprite_index = RCT2_GLOBAL(RCT2_ADDRESS_SPRITES_START_PEEP, uint16); sprite_index != SPRITE_INDEX_NULL; sprite_index = peep->next)
{
peep = GET_PEEP(sprite_index);

4
src/peep/staff.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/platform/osx.c
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or

2
src/platform/shared.c
View File

@ -861,7 +861,7 @@ void platform_refresh_video()
if (gConfigGeneral.hardware_display) {
if (gRenderer == NULL)
gRenderer = SDL_CreateRenderer(gWindow, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
if (gRenderer == NULL) {
log_fatal("SDL_CreateRenderer %s", SDL_GetError());
exit(-1);

18
src/rct1.c
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@ -163,7 +163,7 @@ void rct1_import_s4(rct1_s4 *s4)
memset(edi, 0, 64); edi += 64;
} while (--edx > 0);
edi += 0xA800;
edx = 4;
do {
ebx = 32;
@ -366,7 +366,7 @@ static void rct1_load_default_objects()
}
/**
*
*
* rct2: 0x006A29B9
*/
static void rct1_fix_terrain()
@ -380,7 +380,7 @@ static void rct1_fix_terrain()
if (map_element_get_type(element) != MAP_ELEMENT_TYPE_SURFACE)
continue;
// Convert terrain
map_element_set_terrain(element, RCT1TerrainConvertTable[map_element_get_terrain(element)]);
map_element_set_terrain_edge(element, RCT1TerrainEdgeConvertTable[map_element_get_terrain_edge(element)]);
@ -423,7 +423,7 @@ static void rct1_fix_entrance_positions()
{
rct_map_element *element;
map_element_iterator it;
for (int i = 0; i < 4; i++)
RCT2_ADDRESS(RCT2_ADDRESS_PARK_ENTRANCE_X, uint16)[i] = 0x8000;
@ -534,10 +534,10 @@ static void rct1_reset_park_entrance_path_type()
static void rct1_clear_extra_sprite_entries()
{
rct_unk_sprite *sprite;
for (int i = 5000; i < MAX_SPRITES; i++) {
sprite = &(g_sprite_list[i].unknown);
memset(&g_sprite_list[i], 0, sizeof(rct_sprite));
sprite->sprite_identifier = 255;
@ -563,7 +563,7 @@ static void rct1_clear_extra_tile_entries()
for (int i = 0; i < 0x10000; i++) {
gMapElementTilePointers[i] = (rct_map_element*)-1;
}
// Get the first free map element
rct_map_element *nextFreeMapElement = gMapElements;
for (int i = 0; i < 128 * 128; i++) {

6
src/rct1.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -92,7 +92,7 @@ typedef struct {
uint8 unk_B2[18];
union {
uint8 num_inversions;
uint8 num_holes;
uint8 num_holes;
};
uint8 num_drops;
uint8 unk_C6;

22
src/rct2.c
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John, Matthias Lanzinger
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@ -137,7 +137,7 @@ int rct2_init()
}
/**
*
*
* rct2: 0x00683499
*/
int rct2_init_directories()
@ -202,7 +202,7 @@ void subsitute_path(char *dest, const char *path, const char *filename)
}
/**
*
*
* rct2: 0x00674B42
*/
int rct2_startup_checks()
@ -212,7 +212,7 @@ int rct2_startup_checks()
if (!check_files_integrity())
return 0;
return 1;
}
@ -257,7 +257,7 @@ void rct2_draw()
} else {
//game
}
gCurrentDrawCount++;
}
@ -288,7 +288,7 @@ int rct2_open_file(const char *path)
}
/**
*
*
* rct2: 0x00674C95
*/
int check_file_paths()
@ -301,7 +301,7 @@ int check_file_paths()
}
/**
*
*
* rct2: 0x00674CA5
*/
int check_file_path(int pathId)
@ -342,7 +342,7 @@ int check_file_path(int pathId)
}
/**
*
*
* rct2: 0x00674C0B
*/
int check_files_integrity()
@ -416,7 +416,7 @@ void rct2_endupdate()
}
/**
*
*
* rct2: 0x00674E6C
*/
const utf8 *get_file_path(int pathId)
@ -511,7 +511,7 @@ void get_system_info()
HDC screenHandle = GetDC(NULL);
if (screenHandle) {
RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_CAP_BPP, sint32) = GetDeviceCaps(screenHandle, BITSPIXEL);
RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_CAP_RASTER_STRETCH, sint32) = GetDeviceCaps(screenHandle, RASTERCAPS) >> 8;
RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_CAP_RASTER_STRETCH, sint32) = GetDeviceCaps(screenHandle, RASTERCAPS) >> 8;
ReleaseDC(NULL, screenHandle);
} else {
RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_CAP_BPP, sint32) = 0;

8
src/ride/ride.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -70,7 +70,7 @@ typedef struct {
vehicle_colour list[256];
} vehicle_colour_preset_list;
/**
/**
* Ride type vehicle structure.
* size: 0x65
*/
@ -219,7 +219,7 @@ typedef struct {
// bit 7: whirlpool
uint8 special_track_elements; // 0x0D5
uint8 pad_0D6[2];
// Divide this value by 29127 to get the human-readable max speed
// Divide this value by 29127 to get the human-readable max speed
// (in RCT2, display_speed = (max_speed * 9) >> 18)
sint32 max_speed; // 0x0D8
sint32 average_speed; // 0x0DC

4
src/ride/ride_data.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

98
src/ride/ride_ratings.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -195,7 +195,7 @@ static void ride_ratings_update_state_2()
if (ride->entrances[entranceIndex] == 0xFFFF)
RCT2_GLOBAL(0x0138B5CE, uint16) |= 1;
}
ride_ratings_score_close_proximity(mapElement);
trackElement.x = _rideRatingsProximityX;
@ -759,7 +759,7 @@ static uint16 ride_compute_upkeep(rct_ride *ride)
upkeep += 160;
} else if (ride->mode == RIDE_MODE_LIM_POWERED_LAUNCH) {
upkeep += 320;
} else if (ride->mode == RIDE_MODE_POWERED_LAUNCH ||
} else if (ride->mode == RIDE_MODE_POWERED_LAUNCH ||
ride->mode == RIDE_MODE_POWERED_LAUNCH_BLOCK_SECTIONED) {
upkeep += 220;
}
@ -782,7 +782,7 @@ static uint16 ride_compute_upkeep(rct_ride *ride)
static void ride_ratings_apply_adjustments(rct_ride *ride, rating_tuple *ratings)
{
rct_ride_type *rideEntry;
rideEntry = gRideTypeList[ride->subtype];
// Apply ride entry multipliers
@ -1024,7 +1024,7 @@ static rating_tuple get_special_track_elements_rating(uint8 type, rct_ride *ride
excitement += 50;
intensity += 30;
nausea += 20;
}
}
if (ride_has_waterfall(ride)) {
excitement += 55;
intensity += 30;
@ -1400,7 +1400,7 @@ static void ride_ratings_calculate_spiral_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 14;
set_unreliability_factor(ride);
@ -1417,12 +1417,12 @@ static void ride_ratings_calculate_spiral_roller_coaster(rct_ride *ride)
ride_ratings_apply_65E1C2(&ratings, ride, 15420, 32768, 35108);
ride_ratings_apply_proximity(&ratings, ride, 20130);
ride_ratings_apply_scenery(&ratings, ride, 6693);
if ((ride->inversions & 0x1F) == 0)
ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 12, 2, 2, 2);
ride_ratings_apply_max_speed_penalty(&ratings, ride, 0xA0000, 2, 2, 2);
if ((ride->inversions & 0x1F) == 0) {
ride_ratings_apply_max_negative_g_penalty(&ratings, ride, FIXED_2DP(0, 40), 2, 2, 2);
ride_ratings_apply_num_drops_penalty(&ratings, ride, 2, 2, 2, 2);
@ -1446,7 +1446,7 @@ static void ride_ratings_calculate_stand_up_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 17;
set_unreliability_factor(ride);
@ -1485,7 +1485,7 @@ static void ride_ratings_calculate_suspended_swinging_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 18;
set_unreliability_factor(ride);
@ -1526,7 +1526,7 @@ static void ride_ratings_calculate_inverted_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 17;
set_unreliability_factor(ride);
@ -1543,12 +1543,12 @@ static void ride_ratings_calculate_inverted_roller_coaster(rct_ride *ride)
ride_ratings_apply_65E1C2(&ratings, ride, 15420, 15291, 35108);
ride_ratings_apply_proximity(&ratings, ride, 15657);
ride_ratings_apply_scenery(&ratings, ride, 8366);
if ((ride->inversions & 0x1F) == 0)
ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 12, 2, 2, 2);
ride_ratings_apply_max_speed_penalty(&ratings, ride, 0xA0000, 2, 2, 2);
if ((ride->inversions & 0x1F) == 0)
ride_ratings_apply_max_negative_g_penalty(&ratings, ride, FIXED_2DP(0,30), 2, 2, 2);
@ -1570,7 +1570,7 @@ static void ride_ratings_calculate_junior_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 13;
set_unreliability_factor(ride);
@ -1683,7 +1683,7 @@ static void ride_ratings_calculate_mini_suspended_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 15;
set_unreliability_factor(ride);
@ -1755,7 +1755,7 @@ static void ride_ratings_calculate_wooden_wild_mouse(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 14;
set_unreliability_factor(ride);
@ -1797,7 +1797,7 @@ static void ride_ratings_calculate_steeplechase(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 14;
set_unreliability_factor(ride);
@ -1909,7 +1909,7 @@ static void ride_ratings_calculate_bobsleigh_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 16;
set_unreliability_factor(ride);
@ -1980,7 +1980,7 @@ static void ride_ratings_calculate_looping_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = ride_is_powered_launched(ride) ? 20 : 15;
set_unreliability_factor(ride);
@ -2002,7 +2002,7 @@ static void ride_ratings_calculate_looping_roller_coaster(rct_ride *ride)
ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 14, 2, 2, 2);
ride_ratings_apply_max_speed_penalty(&ratings, ride, 0xA0000, 2, 2, 2);
if ((ride->inversions & 0x1F) == 0) {
ride_ratings_apply_max_negative_g_penalty(&ratings, ride, FIXED_2DP(0, 10), 2, 2, 2);
ride_ratings_apply_num_drops_penalty(&ratings, ride, 2, 2, 2, 2);
@ -2026,7 +2026,7 @@ static void ride_ratings_calculate_dinghy_slide(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 13;
set_unreliability_factor(ride);
@ -2065,7 +2065,7 @@ static void ride_ratings_calculate_mine_train_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 16;
set_unreliability_factor(ride);
@ -2121,7 +2121,7 @@ static void ride_ratings_calculate_chairlift(rct_ride *ride)
ride_ratings_apply_proximity(&ratings, ride, 11183);
ride_ratings_apply_scenery(&ratings, ride, 25098);
ride_ratings_apply_first_length_penalty(&ratings, ride, 0x960000, 2, 2, 2);
ride_ratings_apply_intensity_penalty(&ratings);
ride_ratings_apply_adjustments(ride, &ratings);
@ -2149,7 +2149,7 @@ static void ride_ratings_calculate_corkscrew_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 16;
set_unreliability_factor(ride);
@ -2203,7 +2203,7 @@ static void ride_ratings_calculate_maze(rct_ride *ride)
int size = min(ride->maze_tiles, 100);
ratings.excitement += size;
ratings.intensity += size * 2;
ride_ratings_apply_scenery(&ratings, ride, 22310);
ride_ratings_apply_intensity_penalty(&ratings);
@ -2262,7 +2262,7 @@ static void ride_ratings_calculate_go_karts(rct_ride *ride)
ride_ratings_set(&ratings, RIDE_RATING(1,42), RIDE_RATING(1,73), RIDE_RATING(0,40));
ride_ratings_apply_length(&ratings, ride, 700, 32768);
if (ride->mode == RIDE_MODE_RACE && ride->num_vehicles >= 4) {
ratings.excitement += RIDE_RATING(1,40);
ratings.intensity += RIDE_RATING(0,50);
@ -2692,7 +2692,7 @@ static void ride_ratings_calculate_reverse_freefall_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 25;
set_unreliability_factor(ride);
@ -2759,7 +2759,7 @@ static void ride_ratings_calculate_vertical_drop_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 16;
set_unreliability_factor(ride);
@ -2814,10 +2814,10 @@ static void ride_ratings_calculate_twist(rct_ride *ride)
ratings.nausea += ride->rotations * 20;
ride_ratings_apply_scenery(&ratings, ride, 13943);
ride_ratings_apply_intensity_penalty(&ratings);
ride_ratings_apply_adjustments(ride, &ratings);
ride->ratings = ratings;
ride->upkeep_cost = ride_compute_upkeep(ride);
@ -2858,7 +2858,7 @@ static void ride_ratings_calculate_flying_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 17;
set_unreliability_factor(ride);
@ -2904,7 +2904,7 @@ static void ride_ratings_calculate_virginia_reel(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 19;
set_unreliability_factor(ride);
@ -3012,7 +3012,7 @@ static void ride_ratings_calculate_lay_down_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 18;
set_unreliability_factor(ride);
@ -3098,7 +3098,7 @@ static void ride_ratings_calculate_reverser_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 19;
set_unreliability_factor(ride);
@ -3146,7 +3146,7 @@ static void ride_ratings_calculate_heartline_twister_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 18;
set_unreliability_factor(ride);
@ -3292,7 +3292,7 @@ static void ride_ratings_calculate_twister_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 15;
set_unreliability_factor(ride);
@ -3338,7 +3338,7 @@ static void ride_ratings_calculate_wooden_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 19;
set_unreliability_factor(ride);
@ -3379,7 +3379,7 @@ static void ride_ratings_calculate_side_friction_roller_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 19;
set_unreliability_factor(ride);
@ -3419,7 +3419,7 @@ static void ride_ratings_calculate_wild_mouse(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 14;
set_unreliability_factor(ride);
@ -3460,7 +3460,7 @@ static void ride_ratings_calculate_multi_dimension_roller_coaster(rct_ride *ride
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 18;
set_unreliability_factor(ride);
@ -3506,7 +3506,7 @@ static void ride_ratings_calculate_giga_coaster(rct_ride *ride)
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED))
return;
ride->unreliability_factor = 14;
set_unreliability_factor(ride);
@ -3526,9 +3526,9 @@ static void ride_ratings_calculate_giga_coaster(rct_ride *ride)
if ((ride->inversions & 0x1F) == 0)
ride_ratings_apply_highest_drop_height_penalty(&ratings, ride, 16, 2, 2, 2);
ride_ratings_apply_max_speed_penalty(&ratings, ride, 0xA0000, 2, 2, 2);
if ((ride->inversions & 0x1F) == 0) {
ride_ratings_apply_max_negative_g_penalty(&ratings, ride, FIXED_2DP(0, 40), 2, 2, 2);
ride_ratings_apply_num_drops_penalty(&ratings, ride, 2, 2, 2, 2);
@ -3851,7 +3851,7 @@ static void ride_ratings_calculate_magic_carpet(rct_ride *ride)
ratings.nausea += ride->operation_option * 20;
ride_ratings_apply_scenery(&ratings, ride, 11155);
ride_ratings_apply_intensity_penalty(&ratings);
ride_ratings_apply_adjustments(ride, &ratings);
@ -3909,7 +3909,7 @@ static void ride_ratings_calculate_river_rafts(rct_ride *ride)
ride_ratings_apply_drops(&ratings, ride, 78643, 93622, 62259);
ride_ratings_apply_proximity(&ratings, ride, 13420);
ride_ratings_apply_scenery(&ratings, ride, 11155);
ride_ratings_apply_intensity_penalty(&ratings);
ride_ratings_apply_adjustments(ride, &ratings);
@ -3941,7 +3941,7 @@ static void ride_ratings_calculate_enterprise(rct_ride *ride)
ratings.nausea += ride->operation_option * 16;
ride_ratings_apply_scenery(&ratings, ride, 19521);
ride_ratings_apply_intensity_penalty(&ratings);
ride_ratings_apply_adjustments(ride, &ratings);

4
src/ride/ride_ratings.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

6
src/ride/station.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -222,7 +222,7 @@ static void ride_update_station_race(rct_ride *ride, int stationIndex)
return;
}
}
// Begin the race
ride_race_init_vehicle_speeds(ride);
ride->lifecycle_flags |= RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING;

4
src/ride/station.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

6
src/ride/track.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -129,7 +129,7 @@ typedef struct {
uint32 flags; // 0x02
};
union{
// After loading the track this is converted to
// After loading the track this is converted to
// a flags register
uint8 ride_mode; // 0x06
uint8 track_flags; // 0x06

138
src/ride/track_data.c
View File

@ -4878,75 +4878,75 @@ const uint8 TrackPieceLengths[256] = {
100, // TRACK_ELEM_RIGHT_LARGE_HALF_LOOP_UP
100, // TRACK_ELEM_RIGHT_LARGE_HALF_LOOP_DOWN
100, // TRACK_ELEM_LEFT_LARGE_HALF_LOOP_DOWN
96, //
96, //
96, //
96, //
64, //
64, //
64, //
64, //
64, //
64, //
16, //
16, //
64, //
64, //
32, //
32, //
32, //
32, //
32, //
80, //
80, //
80, //
64, //
64, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
80, //
80, //
80, //
96, //
96, //
96, //
96, //
64, //
64, //
64, //
64, //
64, //
64, //
16, //
16, //
64, //
64, //
32, //
32, //
32, //
32, //
32, //
80, //
80, //
80, //
64, //
64, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
32, //
80, //
80, //
80, //
};
// rct2: 0x00998C95

14
src/ride/vehicle.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -320,7 +320,7 @@ void vehicle_sounds_update()
if (sprite->vehicle.sound1_id == (uint8)-1) {
if (vehicle_sound->sound1_id != (uint16)-1) {
vehicle_sound->sound1_id = -1;
Mixer_Stop_Channel(vehicle_sound->sound1_channel);
Mixer_Stop_Channel(vehicle_sound->sound1_channel);
}
} else {
if (vehicle_sound->sound1_id == (uint16)-1) {
@ -424,7 +424,7 @@ void vehicle_sounds_update()
}
/**
*
*
* rct2: 0x006D4204
*/
void vehicle_update_all()
@ -449,7 +449,7 @@ void vehicle_update_all()
}
/**
*
*
* rct2: 0x006D77F2
*/
static void vehicle_update(rct_vehicle *vehicle)
@ -458,7 +458,7 @@ static void vehicle_update(rct_vehicle *vehicle)
}
/**
*
*
* rct2: 0x006D73D0
* ax: verticalG
* dx: lateralG
@ -470,7 +470,7 @@ void vehicle_get_g_forces(rct_vehicle *vehicle, int *verticalG, int *lateralG)
esi = (int)vehicle;
RCT2_CALLFUNC_X(0x006D73D0, &eax, &ebx, &ecx, &edx, &esi, &edi, &ebp);
if (verticalG != NULL) *verticalG = (sint16)(eax & 0xFFFF);
if (lateralG != NULL) *lateralG = (sint16)(edx & 0xFFFF);
}

4
src/ride/vehicle.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

10
src/scenario_list.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -43,7 +43,7 @@ rct_scenario_basic *get_scenario_by_filename(const char *filename)
}
/**
*
*
* rct2: 0x006775A8
*/
void scenario_load_list()
@ -161,7 +161,7 @@ static void scenario_scores_get_path(utf8 *outPath)
}
/**
*
*
* rct2: 0x006775A8
*/
static int scenario_scores_load()
@ -217,7 +217,7 @@ static int scenario_scores_load()
}
/**
*
*
* rct2: 0x00677B50
*/
int scenario_scores_save()

6
src/sprites.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -32,7 +32,7 @@ enum {
SPR_HOT_AND_DRY = 3292,
SPR_COLD = 3293,
// This is the start of every character there are
// This is the start of every character there are
// 224 characters per font (first 32 are control codes hence why it doesn't go to 255)
// 4 fonts
// = 896 sprites

6
src/title.h
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Copyright (c) 2014 Ted John
* OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
*
*
* This file is part of OpenRCT2.
*
*
* OpenRCT2 is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#ifndef _TITLE_H_
#define _TITLE_H_

4
src/tutorial.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/tutorial.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/util/util.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/util/util.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

12
src/windows/about.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -77,7 +77,7 @@ static rct_window_event_list window_about_events = {
};
/**
*
*
* rct2: 0x0066D2AC
*/
void window_about_open()
@ -106,7 +106,7 @@ void window_about_open()
}
/**
*
*
* rct2: 0x0066D4D5
*/
static void window_about_mouseup(rct_window *w, int widgetIndex)
@ -125,7 +125,7 @@ static void window_about_mouseup(rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x0066D321
*/
static void window_about_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -140,7 +140,7 @@ static void window_about_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Version
RCT2_GLOBAL(0x009C383C, uint8) = 49;
gfx_draw_string_centred(dpi, STR_VERSION_X, x, y, 0, (void*)0x009E2D28);
// Credits
RCT2_GLOBAL(0x009C383C, uint8) = 48;
y += 10;

32
src/windows/banner.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -75,8 +75,8 @@ static rct_window_event_list window_banner_events = {
NULL,
window_banner_mouseup,
NULL,
window_banner_mousedown,
window_banner_dropdown,
window_banner_mousedown,
window_banner_dropdown,
NULL,
NULL,
NULL,
@ -133,7 +133,7 @@ void window_banner_open(rct_windownumber number)
int view_x = gBanners[w->number].x << 5;
int view_y = gBanners[w->number].y << 5;
rct_map_element* map_element = map_get_first_element_at(view_x / 32, view_y / 32);
while(1) {
if (
@ -220,25 +220,25 @@ static void window_banner_mousedown(int widgetIndex, rct_window*w, rct_widget* w
window_dropdown_show_colour(w, widget, w->colours[1] | 0x80, banner->colour);
break;
case WIDX_TEXT_COLOR_DROPDOWN_BUTTON:
for( int i = 0; i < 13; ++i){
gDropdownItemsFormat[i] = 1142;
gDropdownItemsArgs[i] = 2997 + i;
}
//Switch to the dropdown box widget.
widget--;
window_dropdown_show_text_custom_width(
widget->left + w->x,
widget->top + w->y,
widget->left + w->x,
widget->top + w->y,
widget->bottom - widget->top + 1,
w->colours[1],
w->colours[1],
DROPDOWN_FLAG_STAY_OPEN,
13,
13,
widget->right - widget->left - 3);
dropdown_set_checked(banner->text_colour - 1, true);
break;
}
@ -246,7 +246,7 @@ static void window_banner_mousedown(int widgetIndex, rct_window*w, rct_widget* w
/* rct2: 0x6ba517 */
static void window_banner_dropdown(rct_window *w, int widgetIndex, int dropdownIndex)
{
{
rct_banner* banner = &gBanners[w->number];
switch(widgetIndex){
@ -323,16 +323,16 @@ static void window_banner_invalidate(rct_window *w)
rct_scenery_entry* sceneryEntry = g_bannerSceneryEntries[banner->type];
if (sceneryEntry->banner.flags & 1) colour_btn->type = WWT_COLORBTN;
w->pressed_widgets &= ~(1ULL<<WIDX_BANNER_NO_ENTRY);
w->disabled_widgets &= ~(
(1ULL<<WIDX_BANNER_TEXT)|
(1ULL<<WIDX_TEXT_COLOR_DROPDOWN)|
(1ULL<<WIDX_TEXT_COLOR_DROPDOWN_BUTTON));
if (banner->flags & BANNER_FLAG_NO_ENTRY){
w->pressed_widgets |= (1ULL<<WIDX_BANNER_NO_ENTRY);
w->disabled_widgets |=
w->disabled_widgets |=
(1ULL<<WIDX_BANNER_TEXT)|
(1ULL<<WIDX_TEXT_COLOR_DROPDOWN)|
(1ULL<<WIDX_TEXT_COLOR_DROPDOWN_BUTTON);

10
src/windows/cheats.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -1131,7 +1131,7 @@ static void window_cheats_draw_tab_images(rct_drawpixelinfo *dpi, rct_window *w)
sprite_idx += (w->frame_no / 2) % 8;
gfx_draw_sprite(dpi, sprite_idx, w->x + w->widgets[WIDX_TAB_1].left, w->y + w->widgets[WIDX_TAB_1].top, 0);
}
// Guests tab
if (!(w->disabled_widgets & (1 << WIDX_TAB_2))) {
sprite_idx = 5568;
@ -1159,9 +1159,9 @@ static void window_cheats_set_page(rct_window *w, int page)
{
w->page = page;
w->frame_no = 0;
w->enabled_widgets = window_cheats_page_enabled_widgets[page];
w->pressed_widgets = 0;
w->event_handlers = window_cheats_page_events[page];

10
src/windows/clear_scenery.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -97,7 +97,7 @@ static rct_window_event_list window_clear_scenery_events = {
};
/**
*
*
* rct2: 0x0068E0A7
*/
void window_clear_scenery_open()
@ -221,11 +221,11 @@ static void window_clear_scenery_invalidate(rct_window *w)
// Set the preview image button to be pressed down
w->pressed_widgets = (1 << WIDX_PREVIEW) |
(gClearSmallScenery ? (1 << WIDX_SMALL_SCENERY) : 0) |
(gClearLargeScenery ? (1 << WIDX_LARGE_SCENERY) : 0) |
(gClearLargeScenery ? (1 << WIDX_LARGE_SCENERY) : 0) |
(gClearFootpath ? (1 << WIDX_FOOTPATH) : 0);
// Update the preview image (for tool sizes up to 7)
window_clear_scenery_widgets[WIDX_PREVIEW].image = RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) <= 7 ?
window_clear_scenery_widgets[WIDX_PREVIEW].image = RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) <= 7 ?
SPR_LAND_TOOL_SIZE_0 + RCT2_GLOBAL(RCT2_ADDRESS_LAND_TOOL_SIZE, sint16) : 0xFFFFFFFF;
}

12
src/windows/dropdown.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -170,7 +170,7 @@ void window_dropdown_show_text_custom_width(int x, int y, int extray, uint8 colo
_dropdown_item_height = 10;
if (flags & 0x40)
_dropdown_item_height = flags & 0x3F;
// Set the widgets
gDropdownNumItems = num_items;
_dropdown_num_rows = num_items;
@ -314,7 +314,7 @@ static void window_dropdown_paint(rct_window *w, rct_drawpixelinfo *dpi)
*((char*)(0x00141FC4B + (w->colours[0] * 8))));
}
} else {
//
//
if (i == gDropdownHighlightedIndex) {
l = w->x + 2 + (cell_x * _dropdown_item_width);
t = w->y + 2 + (cell_y * _dropdown_item_height);
@ -366,7 +366,7 @@ static void window_dropdown_paint(rct_window *w, rct_drawpixelinfo *dpi)
}
}
/* New function based on 6e914e
/* New function based on 6e914e
* returns -1 if index is invalid
*/
int dropdown_index_from_point(int x, int y, rct_window *w)
@ -408,7 +408,7 @@ void window_dropdown_show_colour_available(rct_window *w, rct_widget *widget, ui
uint32 availableColours)
{
int i, numItems;
// Count number of available colours
numItems = 0;
for (i = 0; i < 32; i++)

4
src/windows/dropdown.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

14
src/windows/editor_bottom_toolbar.c
View File

@ -109,7 +109,7 @@ static EMPTY_ARGS_VOID_POINTER *previous_button_mouseup_events[] = {
};
static EMPTY_ARGS_VOID_POINTER *next_button_mouseup_events[] = {
window_editor_bottom_toolbar_jump_forward_from_object_selection,
window_editor_bottom_toolbar_jump_forward_from_object_selection,
window_editor_bottom_toolbar_jump_forward_to_invention_list_set_up,
window_editor_bottom_toolbar_jump_forward_to_options_selection,
window_editor_bottom_toolbar_jump_forward_to_objective_selection,
@ -371,7 +371,7 @@ void window_editor_bottom_toolbar_jump_forward_to_save_scenario()
return;
}
//
//
s6Info->editor_step = 255;
// Ensure path has .SC6 extension
@ -467,16 +467,16 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (g_editor_step == EDITOR_STEP_OBJECT_SELECTION) {
drawNextButton = true;
}
}
else if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER) {
drawPreviousButton = true;
}
}
else if (RCT2_GLOBAL(0x13573C8, uint16) != 0x2710) {
drawNextButton = true;
}
else if (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_18) {
drawNextButton = true;
}
}
else {
drawPreviousButton = true;
}
@ -502,7 +502,7 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi)
window_draw_widgets(w, dpi);
if (!(RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_MANAGER)) {
if (drawPreviousButton) {
gfx_fill_rect_inset(dpi,
@ -566,7 +566,7 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi)
short textX = (window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].left +
window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].right - 30) / 2 + w->x;
short textY = window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].top + 6 + w->y;
short stringId = STR_OBJECT_SELECTION_STEP + g_editor_step + 1;
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_TRACK_DESIGNER)
stringId = STR_ROLLERCOASTER_DESIGNER_STEP;

18
src/windows/editor_inventions_list.c
View File

@ -164,7 +164,7 @@ static int research_item_is_always_researched(rct_research_item *researchItem)
return (researchItem->entryIndex & (RESEARCH_ENTRY_FLAG_RIDE_ALWAYS_RESEARCHED | RESEARCH_ENTRY_FLAG_SCENERY_SET_ALWAYS_RESEARCHED)) != 0;
}
/* rct2: 0x0068596F
/* rct2: 0x0068596F
* Sets rides that are in use to be always researched
*/
static void research_rides_setup(){
@ -239,11 +239,11 @@ static void research_rides_setup(){
}
}
/* rct2: 0x0068590C
/* rct2: 0x0068590C
* Sets the critical scenery sets to always researched
*/
static void research_scenery_sets_setup(){
for (rct_object_entry* object = RCT2_ADDRESS(0x0098DA74, rct_object_entry);
(object->flags & 0xFF) != 0xFF;
object++){
@ -284,8 +284,8 @@ static void research_always_researched_setup()
* rct2: 0x00685A79
*/
static void sub_685A79()
{
for (rct_research_item* research = gResearchItems;
{
for (rct_research_item* research = gResearchItems;
research->entryIndex != RESEARCHED_ITEMS_END_2;
research++){
@ -304,7 +304,7 @@ static rct_string_id research_item_get_name(uint32 researchItem)
{
rct_ride_type *rideEntry;
rct_scenery_set_entry *sceneryEntry;
if (researchItem < 0x10000) {
sceneryEntry = g_scenerySetEntries[researchItem & 0xFF];
if (sceneryEntry == NULL || sceneryEntry == (rct_scenery_set_entry*)0xFFFFFFFF)
@ -624,7 +624,7 @@ static void window_editor_inventions_list_scrollgetheight(rct_window *w, int scr
// Count / skip pre-researched items
for (researchItem = gResearchItems; researchItem->entryIndex != RESEARCHED_ITEMS_SEPARATOR; researchItem++)
*height += 10;
if (scrollIndex == 1) {
researchItem++;
@ -736,7 +736,7 @@ static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo
int x, y, width;
window_draw_widgets(w, dpi);
// Tab image
x = w->x + w->widgets[WIDX_TAB_1].left;
y = w->y + w->widgets[WIDX_TAB_1].top;
@ -831,7 +831,7 @@ static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpix
// Since this is now a do while need to conteract the +10
itemY = -10;
do{
do{
itemY += 10;
if (itemY + 10 < dpi->y || itemY >= dpi->y + dpi->height)
continue;

46
src/windows/editor_object_selection.c
View File

@ -50,7 +50,7 @@ enum {
FILTER_RIDE_WATER = (1 << 9),
FILTER_RIDE_STALL = (1 << 10),
FILTER_ALL = 0x7EF,
} FILTER_FLAGS;
@ -628,8 +628,8 @@ static void setup_in_use_selection_flags(){
uint8 entry_type, entry_index;
if (find_object_in_entry_group(installedObject, &entry_type, &entry_index)){
if (RCT2_ADDRESS(0x0098DA38, uint8*)[entry_type][entry_index] & (1 << 0)){
*selection_flags |=
OBJECT_SELECTION_FLAG_IN_USE |
*selection_flags |=
OBJECT_SELECTION_FLAG_IN_USE |
OBJECT_SELECTION_FLAG_SELECTED;
}
if (RCT2_ADDRESS(0x0098DA38, uint8*)[entry_type][entry_index] & (1 << 1)){
@ -733,7 +733,7 @@ void unload_unselected_objects(){
}
/**
*
*
* rct2: 0x006AB199
*/
static void window_editor_object_selection_close(rct_window *w)
@ -765,7 +765,7 @@ static void window_editor_object_selection_close(rct_window *w)
}
/**
*
*
* rct2: 0x006AAFAB
*/
static void window_editor_object_selection_mouseup(rct_window *w, int widgetIndex)
@ -910,7 +910,7 @@ void window_editor_object_selection_mousedown(int widgetIndex, rct_window*w, rct
gDropdownItemsChecked = _filter_flags & 0xF;
break;
}
}
@ -935,7 +935,7 @@ static void window_editor_object_selection_dropdown(rct_window *w, int widgetInd
}
/**
*
*
* rct2: 0x006AB031
*/
static void window_editor_object_selection_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height)
@ -944,7 +944,7 @@ static void window_editor_object_selection_scrollgetsize(rct_window *w, int scro
}
/**
*
*
* rct2: 0x006AB0B6
*/
static void window_editor_object_selection_scroll_mousedown(rct_window *w, int scrollIndex, int x, int y)
@ -999,7 +999,7 @@ static void window_editor_object_selection_scroll_mousedown(rct_window *w, int s
}
/**
*
*
* rct2: 0x006AB079
*/
static void window_editor_object_selection_scroll_mouseover(rct_window *w, int scrollIndex, int x, int y)
@ -1027,7 +1027,7 @@ static void window_editor_object_selection_scroll_mouseover(rct_window *w, int s
}
/**
*
*
* rct2: 0x006AB058
*/
static void window_editor_object_selection_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId)
@ -1054,7 +1054,7 @@ static void window_editor_object_selection_tooltip(rct_window* w, int widgetInde
}
/**
*
*
* rct2: 0x006AA9FD
*/
static void window_editor_object_selection_invalidate(rct_window *w)
@ -1180,14 +1180,14 @@ static void window_editor_object_selection_invalidate(rct_window *w)
(1 << WIDX_FILTER_RIDE_TAB_WATER) | (1 << WIDX_FILTER_RIDE_TAB_STALL));
for (int i = WIDX_FILTER_RIDE_TAB_FRAME; i <= WIDX_FILTER_RIDE_TAB_STALL; i++)
w->widgets[i].type = WWT_EMPTY;
w->widgets[WIDX_LIST_SORT_TYPE].type = WWT_EMPTY;
w->widgets[WIDX_LIST_SORT_RIDE].type = WWT_EMPTY;
}
}
/**
*
*
* rct2: 0x006AAB56
*/
static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -1363,7 +1363,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
strcpy(stringBuffer, name);
}
gfx_draw_string_centred_clipped(dpi, stringId, NULL, 0, x, y, width);
// Draw description of object
x = w->x + w->widgets[WIDX_LIST].right + 4;
y += 15;
@ -1379,7 +1379,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
}
gfx_draw_string_right(dpi, stringId, NULL, 2, w->x + w->width - 5, w->y + w->height - 3 - 12 - 14);
//
//
if (w->selected_tab == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS) {
y = w->y + w->height - 3 - 12 - 14 - 14;
@ -1404,7 +1404,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
}
/**
*
*
* rct2: 0x006AADA3
*/
static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex)
@ -1651,7 +1651,7 @@ void reset_required_object_flags(){
set_required_object_flags(required_object);
required_object++;
}
}
selection_flags++;
@ -1659,9 +1659,9 @@ void reset_required_object_flags(){
}
}
/*
/*
* Master objects are objects that are not
* optional / required dependants of an
* optional / required dependants of an
* object.
*/
void set_object_selection_error(uint8 is_master_object, rct_string_id error_msg){
@ -1814,7 +1814,7 @@ static int window_editor_object_selection_select_object(uint8 bh, int flags, rct
// Skip size of chunk
pos += 4;
uint8 num_required_objects = *pos++;
uint8 num_required_objects = *pos++;
rct_object_entry* required_objects = (rct_object_entry*)pos;
for (; num_required_objects != 0; num_required_objects--){
if (!window_editor_object_selection_select_object(++bh, flags, required_objects)){
@ -1837,7 +1837,7 @@ static int window_editor_object_selection_select_object(uint8 bh, int flags, rct
}
theme_object++;
}
if (bh != 0 && !(flags&(1 << 1))){
uint32* arguments = RCT2_ADDRESS(0x0013CE952, uint32);
object_create_identifier_name((char*)0x009BC95A, installedObject);
@ -1888,7 +1888,7 @@ static int get_object_from_object_selection(uint8 object_type, int y, uint8 *obj
}
/**
*
*
* rct2: 0x006D33E2
*/
static void window_editor_object_selection_manage_tracks()
@ -1927,7 +1927,7 @@ static void window_editor_object_selection_manage_tracks()
}
/**
*
*
* rct2: 0x006ABBBE
*/
static void editor_load_selected_objects()

6
src/windows/editor_objective_options.c
View File

@ -506,7 +506,7 @@ static void window_editor_objective_options_show_climate_dropdown(rct_window *w)
{
int i;
rct_widget *dropdownWidget;
dropdownWidget = &w->widgets[WIDX_CLIMATE];
for (i = 0; i < 4; i++) {
@ -530,7 +530,7 @@ static void window_editor_objective_options_show_category_dropdown(rct_window *w
rct_s6_info *s6Info = (rct_s6_info*)0x00141F570;
int i;
rct_widget *dropdownWidget;
dropdownWidget = &w->widgets[WIDX_CATEGORY];
for (i = 0; i < 5; i++) {
@ -1224,7 +1224,7 @@ static void window_editor_objective_options_update_disabled_widgets(rct_window *
numRides++;
}
}
if (numRides == 0) {
w->disabled_widgets &= ~(1 << WIDX_TAB_2);
} else {

10
src/windows/editor_scenario_options.c
View File

@ -830,7 +830,7 @@ static void window_editor_scenario_options_guests_invalidate(rct_window *w)
} else {
w->widgets[WIDX_CASH_PER_GUEST].type = WWT_SPINNER;
w->widgets[WIDX_CASH_PER_GUEST_INCREASE].type = WWT_DROPDOWN_BUTTON;
w->widgets[WIDX_CASH_PER_GUEST_DECREASE].type = WWT_DROPDOWN_BUTTON;
w->widgets[WIDX_CASH_PER_GUEST_DECREASE].type = WWT_DROPDOWN_BUTTON;
}
// Guests prefer less intense rides checkbox
@ -874,7 +874,7 @@ static void window_editor_scenario_options_guests_paint(rct_window *w, rct_drawp
arg = RCT2_GLOBAL(RCT2_ADDRESS_GUEST_INITIAL_CASH, money16);
gfx_draw_string_left(dpi, 3246, &arg, 0, x, y);
}
// Guest initial happiness label
x = w->x + 8;
y = w->y + w->widgets[WIDX_GUEST_INITIAL_HAPPINESS].top;
@ -1177,7 +1177,7 @@ static void window_editor_scenario_options_park_paint(rct_window *w, rct_drawpix
x = w->x + 8;
y = w->y + w->widgets[WIDX_LAND_COST].top;
gfx_draw_string_left(dpi, 3277, NULL, 0, x, y);
// Cost to buy land value
x = w->x + w->widgets[WIDX_LAND_COST].left + 1;
y = w->y + w->widgets[WIDX_LAND_COST].top;
@ -1190,7 +1190,7 @@ static void window_editor_scenario_options_park_paint(rct_window *w, rct_drawpix
x = w->x + 8;
y = w->y + w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST].top;
gfx_draw_string_left(dpi, 3278, NULL, 0, x, y);
// Cost to buy construction rights value
x = w->x + w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST].left + 1;
y = w->y + w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST].top;
@ -1208,7 +1208,7 @@ static void window_editor_scenario_options_park_paint(rct_window *w, rct_drawpix
stringId = RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_PARK_FREE_ENTRY ? 3279 : 3280;
gfx_draw_string_left(dpi, 1193, &stringId, 0, x, y);
}
if (w->widgets[WIDX_ENTRY_PRICE].type != WWT_EMPTY) {
// Entry price label
x = w->x + w->widgets[WIDX_PAY_FOR_PARK_OR_RIDES].right + 8;

12
src/windows/error.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -72,7 +72,7 @@ static char _window_error_text[512];
static uint16 _window_error_num_lines;
/**
*
*
* rct2: 0x0066792F
*
* bx: title
@ -133,7 +133,7 @@ void window_error_open(rct_string_id title, rct_string_id message)
y = y - height - 40;
y = min(y, maxY);
}
w = window_create(x, y, width, height, &window_error_events, WC_ERROR, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_RESIZABLE);
w->widgets = window_error_widgets;
w->error.var_480 = 0;
@ -142,7 +142,7 @@ void window_error_open(rct_string_id title, rct_string_id message)
}
/**
*
*
* rct2: 0x00667BFE
*/
static void window_error_unknown5(rct_window *w)
@ -153,7 +153,7 @@ static void window_error_unknown5(rct_window *w)
}
/**
*
*
* rct2: 0x00667AA3
*/
static void window_error_paint(rct_window *w, rct_drawpixelinfo *dpi)

4
src/windows/error.h
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

58
src/windows/finances.c
View File

@ -627,7 +627,7 @@ static void window_finances_summary_update(rct_window *w)
}
/**
*
*
* rct2: 0x0069C732
*/
static void window_finances_summary_invalidate(rct_window *w)
@ -644,7 +644,7 @@ static void window_finances_summary_invalidate(rct_window *w)
}
/**
*
*
* rct2: 0x0069C771
*/
static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -693,7 +693,7 @@ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi)
y - 1
);
y += 14;
// Month expenditures
money32 profit = 0;
money32 *expenditures = &RCT2_ADDRESS(RCT2_ADDRESS_EXPENDITURE_TABLE, money32)[i * 14];
@ -728,7 +728,7 @@ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi)
x += 80;
}
// Horizontal rule below expenditure / income table
gfx_fill_rect_inset(dpi, w->x + 8, w->y + 223, w->x + 8 + 513, w->y + 223 + 1, w->colours[1], 0x20);
@ -765,7 +765,7 @@ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi)
#pragma region Financial graph page
/**
*
*
* rct2: 0x0069CF70
*/
static void window_finances_financial_graph_mouseup(rct_window *w, int widgetIndex)
@ -777,7 +777,7 @@ static void window_finances_financial_graph_mouseup(rct_window *w, int widgetInd
}
/**
*
*
* rct2: 0x0069CF8B
*/
static void window_finances_financial_graph_update(rct_window *w)
@ -789,7 +789,7 @@ static void window_finances_financial_graph_update(rct_window *w)
}
/**
*
*
* rct2: 0x0069CBDB
*/
static void window_finances_financial_graph_invalidate(rct_window *w)
@ -805,7 +805,7 @@ static void window_finances_financial_graph_invalidate(rct_window *w)
}
/**
*
*
* rct2: 0x0069CC10
*/
static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -875,7 +875,7 @@ static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelin
#pragma region Value graph page
/**
*
*
* rct2: 0x0069D338
*/
static void window_finances_park_value_graph_mouseup(rct_window *w, int widgetIndex)
@ -887,7 +887,7 @@ static void window_finances_park_value_graph_mouseup(rct_window *w, int widgetIn
}
/**
*
*
* rct2: 0x0069D353
*/
static void window_finances_park_value_graph_update(rct_window *w)
@ -899,7 +899,7 @@ static void window_finances_park_value_graph_update(rct_window *w)
}
/**
*
*
* rct2: 0x0069CFC0
*/
static void window_finances_park_value_graph_invalidate(rct_window *w)
@ -915,7 +915,7 @@ static void window_finances_park_value_graph_invalidate(rct_window *w)
}
/**
*
*
* rct2: 0x0069CFF5
*/
static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -981,7 +981,7 @@ static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixeli
#pragma region Profit graph page
/**
*
*
* rct2: 0x0069D715
*/
static void window_finances_profit_graph_mouseup(rct_window *w, int widgetIndex)
@ -993,7 +993,7 @@ static void window_finances_profit_graph_mouseup(rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x0069D730
*/
static void window_finances_profit_graph_update(rct_window *w)
@ -1005,7 +1005,7 @@ static void window_finances_profit_graph_update(rct_window *w)
}
/**
*
*
* rct2: 0x0069D388
*/
static void window_finances_profit_graph_invalidate(rct_window *w)
@ -1021,7 +1021,7 @@ static void window_finances_profit_graph_invalidate(rct_window *w)
}
/**
*
*
* rct2: 0x0069D3BD
*/
static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -1087,7 +1087,7 @@ static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo
#pragma region Marketing page
/**
*
*
* rct2: 0x0069D9F9
*/
static void window_finances_marketing_mouseup(rct_window *w, int widgetIndex)
@ -1102,7 +1102,7 @@ static void window_finances_marketing_mouseup(rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x0069DA2F
*/
static void window_finances_marketing_update(rct_window *w)
@ -1114,7 +1114,7 @@ static void window_finances_marketing_update(rct_window *w)
}
/**
*
*
* rct2: 0x0069D765
*/
static void window_finances_marketing_invalidate(rct_window *w)
@ -1162,7 +1162,7 @@ static void window_finances_marketing_invalidate(rct_window *w)
}
/**
*
*
* rct2: 0x0069D834
*/
static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -1236,7 +1236,7 @@ static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dp
#pragma region Research page
/**
*
*
* rct2: 0x0069DB3F
*/
static void window_finances_research_mouseup(rct_window *w, int widgetIndex)
@ -1270,14 +1270,14 @@ static void window_finances_research_mouseup(rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x0069DB66
*/
static void window_finances_research_mousedown(int widgetIndex, rct_window *w, rct_widget* widget)
{
rct_widget *dropdownWidget;
int i;
if (widgetIndex != WIDX_RESEARCH_FUNDING_DROPDOWN_BUTTON)
return;
@ -1302,7 +1302,7 @@ static void window_finances_research_mousedown(int widgetIndex, rct_window *w, r
}
/**
*
*
* rct2: 0x0069DB6D
*/
static void window_finances_research_dropdown(rct_window *w, int widgetIndex, int dropdownIndex)
@ -1314,7 +1314,7 @@ static void window_finances_research_dropdown(rct_window *w, int widgetIndex, in
}
/**
*
*
* rct2: 0x0069DC23
*/
static void window_finances_research_update(rct_window *w)
@ -1326,7 +1326,7 @@ static void window_finances_research_update(rct_window *w)
}
/**
*
*
* rct2: 0x0069DA64
*/
static void window_finances_research_invalidate(rct_window *w)
@ -1347,7 +1347,7 @@ static void window_finances_research_invalidate(rct_window *w)
// Current funding
window_finances_research_widgets[WIDX_RESEARCH_FUNDING].image = STR_NO_FUNDING + currentResearchLevel;
// Checkboxes
int activeResearchTypes = RCT2_GLOBAL(RCT2_ADDRESS_ACTIVE_RESEARCH_TYPES, uint16);
int uncompletedResearchTypes = gResearchUncompletedCategories;
@ -1372,7 +1372,7 @@ static void window_finances_research_invalidate(rct_window *w)
}
/**
*
*
* rct2: 0x0069DAF0
*/
static void window_finances_research_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -1406,7 +1406,7 @@ static void window_finances_set_page(rct_window *w, int page)
w->widgets = window_finances_page_widgets[page];
w->disabled_widgets = 0;
w->pressed_widgets = 0;
window_invalidate(w);
if (w->page == WINDOW_FINANCES_PAGE_RESEARCH) {
w->width = 320;

58
src/windows/footpath.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -162,7 +162,7 @@ static void window_footpath_set_enabled_and_pressed_widgets();
static void footpath_get_next_path_info(int *type, int *x, int *y, int *z, int *slope);
/**
*
*
* rct2: 0x006A7C43
*/
void window_footpath_open()
@ -222,7 +222,7 @@ void window_footpath_open()
}
/**
*
*
* rct2: 0x006A852F
*/
static void window_footpath_close(rct_window *w)
@ -236,7 +236,7 @@ static void window_footpath_close(rct_window *w)
}
/**
*
*
* rct2: 0x006A7E92
*/
static void window_footpath_mouseup(rct_window *w, int widgetIndex)
@ -285,7 +285,7 @@ static void window_footpath_mouseup(rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x006A7EC5
*/
static void window_footpath_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
@ -322,7 +322,7 @@ static void window_footpath_mousedown(int widgetIndex, rct_window*w, rct_widget*
}
/**
*
*
* rct2: 0x006A7F18
*/
static void window_footpath_dropdown(rct_window *w, int widgetIndex, int dropdownIndex)
@ -336,7 +336,7 @@ static void window_footpath_dropdown(rct_window *w, int widgetIndex, int dropdow
RCT2_GLOBAL(RCT2_ADDRESS_SELECTED_PATH_TYPE, uint8) = SELECTED_PATH_TYPE_QUEUE;
else
return;
// Get path id
pathId = dropdownIndex;
if (pathId == -1) {
@ -372,7 +372,7 @@ static void window_footpath_dropdown(rct_window *w, int widgetIndex, int dropdow
}
/**
*
*
* rct2: 0x006A8032
*/
static void window_footpath_toolupdate(rct_window* w, int widgetIndex, int x, int y)
@ -385,7 +385,7 @@ static void window_footpath_toolupdate(rct_window* w, int widgetIndex, int x, in
}
/**
*
*
* rct2: 0x006A8047
*/
static void window_footpath_tooldown(rct_window* w, int widgetIndex, int x, int y)
@ -397,7 +397,7 @@ static void window_footpath_tooldown(rct_window* w, int widgetIndex, int x, int
}
/**
*
*
* rct2: 0x006A8067
*/
static void window_footpath_tooldrag(rct_window* w, int widgetIndex, int x, int y)
@ -408,7 +408,7 @@ static void window_footpath_tooldrag(rct_window* w, int widgetIndex, int x, int
}
/**
*
*
* rct2: 0x006A8066
*/
static void window_footpath_toolup(rct_window* w, int widgetIndex, int x, int y)
@ -420,7 +420,7 @@ static void window_footpath_toolup(rct_window* w, int widgetIndex, int x, int y)
}
/**
*
*
* rct2: 0x006A7760
*/
static void window_footpath_update_provisional_path_for_bridge_mode(rct_window *w)
@ -455,7 +455,7 @@ static void window_footpath_update_provisional_path_for_bridge_mode(rct_window *
}
/**
*
*
* rct2: 0x006A84BB
*/
static void window_footpath_update(rct_window *w)
@ -482,7 +482,7 @@ static void window_footpath_update(rct_window *w)
}
/**
*
*
* rct2: 0x006A7D1C
*/
static void window_footpath_invalidate(rct_window *w)
@ -491,7 +491,7 @@ static void window_footpath_invalidate(rct_window *w)
rct_path_type *pathType;
colour_scheme_update(w);
// Press / unpress footpath and queue type buttons
w->pressed_widgets &= ~(1 << WIDX_FOOTPATH_TYPE);
w->pressed_widgets &= ~(1 << WIDX_QUEUELINE_TYPE);
@ -517,7 +517,7 @@ static void window_footpath_invalidate(rct_window *w)
window_footpath_widgets[WIDX_QUEUELINE_TYPE].type = WWT_FLATBTN;
} else {
window_footpath_widgets[WIDX_QUEUELINE_TYPE].type = WWT_EMPTY;
}
}
// Disable queue line button if in Scenario Editor
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) & SCREEN_FLAGS_SCENARIO_EDITOR)
@ -525,7 +525,7 @@ static void window_footpath_invalidate(rct_window *w)
}
/**
*
*
* rct2: 0x006A7D8B
*/
static void window_footpath_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -570,7 +570,7 @@ static void window_footpath_paint(rct_window *w, rct_drawpixelinfo *dpi)
}
/**
*
*
* rct2: 0x006A7F88
*/
static void window_footpath_show_footpath_types_dialog(rct_window *w, rct_widget *widget, int showQueues)
@ -636,7 +636,7 @@ static void window_footpath_mousedown_slope(int slope)
}
/**
*
*
* rct2: 0x006A81FB
*/
static void window_footpath_set_provisional_path_at_point(int x, int y)
@ -724,7 +724,7 @@ static void window_footpath_set_selection_start_bridge_at_point(int screenX, int
}
/**
*
*
* rct2: 0x006A82C5
*/
static void window_footpath_place_path_at_point(int x, int y)
@ -767,7 +767,7 @@ static void window_footpath_place_path_at_point(int x, int y)
}
/**
*
*
* rct2: 0x006A840F
*/
static void window_footpath_start_bridge_at_point(int screenX, int screenY)
@ -800,7 +800,7 @@ static void window_footpath_start_bridge_at_point(int screenX, int screenY)
}
}
}
tool_cancel();
RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCT_PATH_FROM_X, uint16) = x;
RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCT_PATH_FROM_Y, uint16) = y;
@ -878,7 +878,7 @@ static void window_footpath_construct()
}
/**
*
*
* rct2: 0x006A78EF
*/
static void footpath_remove_map_element(rct_map_element *mapElement)
@ -929,7 +929,7 @@ static void footpath_remove_map_element(rct_map_element *mapElement)
}
/**
*
*
* rct2: 0x006A7873
*/
static rct_map_element *footpath_get_map_element_to_remove()
@ -958,7 +958,7 @@ static rct_map_element *footpath_get_map_element_to_remove()
if (!(mapElement->properties.path.type & 4))
if ((mapElement->properties.path.type & 3) == RCT2_GLOBAL(RCT2_ADDRESS_CONSTRUCT_PATH_DIRECTION, uint8))
continue;
return mapElement;
}
}
@ -968,7 +968,7 @@ static rct_map_element *footpath_get_map_element_to_remove()
}
/**
*
*
* rct2: 0x006A7863
*/
static void window_footpath_remove()
@ -986,7 +986,7 @@ static void window_footpath_remove()
}
/**
*
*
* rct2: 0x006A855C
*/
static void window_footpath_set_enabled_and_pressed_widgets()
@ -1061,7 +1061,7 @@ static void window_footpath_set_enabled_and_pressed_widgets()
}
/**
*
*
* rct2: 0x006A7B20
*/
static void footpath_get_next_path_info(int *type, int *x, int *y, int *z, int *slope)

18
src/windows/game_bottom_toolbar.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -158,7 +158,7 @@ void window_game_bottom_toolbar_open()
}
/**
*
*
* rct2: 0x0066C588
*/
static void window_game_bottom_toolbar_mouseup(rct_window *w, int widgetIndex)
@ -225,7 +225,7 @@ static void window_game_bottom_toolbar_tooltip(rct_window* w, int widgetIndex, r
case WIDX_DATE:
month = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_YEAR, sint16) & 7;
day = ((RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_TICKS, uint16) * days_in_month[month]) >> 16) & 0xFF;
RCT2_GLOBAL(0x013CE952, short) = STR_DATE_DAY_1 + day;
RCT2_GLOBAL(0x013CE954, short) = STR_MONTH_MARCH + month;
break;
@ -233,7 +233,7 @@ static void window_game_bottom_toolbar_tooltip(rct_window* w, int widgetIndex, r
}
/**
*
*
* rct2: 0x0066BBA0
*/
static void window_game_bottom_toolbar_invalidate(rct_window *w)
@ -314,7 +314,7 @@ static void window_game_bottom_toolbar_invalidate(rct_window *w)
}
/**
*
*
* rct2: 0x0066BB79
*/
void window_game_bottom_toolbar_invalidate_news_item()
@ -325,7 +325,7 @@ void window_game_bottom_toolbar_invalidate_news_item()
}
/**
*
*
* rct2: 0x0066BC87
*/
static void window_game_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -411,7 +411,7 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, r
}
/**
*
*
* rct2: 0x0066C76C
*/
static void window_game_bottom_toolbar_draw_park_rating(rct_drawpixelinfo *dpi, rct_window *w, int colour, int x, int y, uint8 factor)
@ -493,7 +493,7 @@ static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi,
}
/**
*
*
* rct2: 0x0066BFA5
*/
static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo *dpi, rct_window *w)

48
src/windows/guest_list.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -138,7 +138,7 @@ static void window_guest_list_find_groups();
static void get_arguments_from_peep(rct_peep *peep, uint32 *argument_1, uint32* argument_2);
/**
*
*
* rct2: 0x006992E3
*/
void window_guest_list_open()
@ -267,7 +267,7 @@ void window_guest_list_open_with_filter(int type, int index)
}
/**
*
*
* rct2: 0x00699AAF
*/
static void window_guest_list_mouseup(rct_window *w, int widgetIndex)
@ -292,7 +292,7 @@ static void window_guest_list_mouseup(rct_window *w, int widgetIndex)
}
/**
*
*
* rct2: 0x00699EA3
*/
static void window_guest_list_resize(rct_window *w)
@ -310,7 +310,7 @@ static void window_guest_list_resize(rct_window *w)
}
/**
*
*
* rct2: 0x00699AC4
*/
static void window_guest_list_mousedown(int widgetIndex, rct_window*w, rct_widget* widget)
@ -378,7 +378,7 @@ static void window_guest_list_mousedown(int widgetIndex, rct_window*w, rct_widge
}
/**
*
*
* rct2: 0x00699AE1
*/
static void window_guest_list_dropdown(rct_window *w, int widgetIndex, int dropdownIndex)
@ -400,7 +400,7 @@ static void window_guest_list_dropdown(rct_window *w, int widgetIndex, int dropd
}
/**
*
*
* rct2: 0x00699E54
*/
static void window_guest_list_update(rct_window *w)
@ -414,7 +414,7 @@ static void window_guest_list_update(rct_window *w)
}
/**
*
*
* rct2: 0x00699C55
*/
static void window_guest_list_scrollgetsize(rct_window *w, int scrollIndex, int *width, int *height)
@ -474,7 +474,7 @@ static void window_guest_list_scrollgetsize(rct_window *w, int scrollIndex, int
}
/**
*
*
* rct2: 0x00699D7D
*/
static void window_guest_list_scrollmousedown(rct_window *w, int scrollIndex, int x, int y)
@ -498,7 +498,7 @@ static void window_guest_list_scrollmousedown(rct_window *w, int scrollIndex, in
if (i == 0) {
// Open guest window
window_guest_open(peep);
break;
} else {
i--;
@ -521,7 +521,7 @@ static void window_guest_list_scrollmousedown(rct_window *w, int scrollIndex, in
}
/**
*
*
* rct2: 0x00699D3B
*/
static void window_guest_list_scrollmouseover(rct_window *w, int scrollIndex, int x, int y)
@ -537,7 +537,7 @@ static void window_guest_list_scrollmouseover(rct_window *w, int scrollIndex, in
}
/**
*
*
* rct2: 0x00699E4A
*/
static void window_guest_list_tooltip(rct_window* w, int widgetIndex, rct_string_id *stringId)
@ -546,7 +546,7 @@ static void window_guest_list_tooltip(rct_window* w, int widgetIndex, rct_string
}
/**
*
*
* rct2: 0x00699511
*/
static void window_guest_list_invalidate(rct_window *w)
@ -576,7 +576,7 @@ static void window_guest_list_invalidate(rct_window *w)
}
/**
*
*
* rct2: 0x006995CC
*/
static void window_guest_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
@ -632,7 +632,7 @@ static void window_guest_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
}
/**
*
*
* rct2: 0x00699701
*/
static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex)
@ -664,7 +664,7 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
if (_window_guest_list_tracking_only && !(peep->flags & PEEP_FLAGS_TRACKING))
continue;
//
//
if (y + 11 >= -0x7FFF && y + 11 > dpi->y && y < 0x7FFF) {
// Check if y is beyond the scroll control
if (y > dpi->y + dpi->height)
@ -690,9 +690,9 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
// Tracking icon
if (peep->flags & PEEP_FLAGS_TRACKING)
gfx_draw_sprite(dpi, 5129, 112, y, 0);
// Action
get_arguments_from_action(peep, &argument_1, &argument_2);
RCT2_GLOBAL(0x013CE952, uint32) = argument_1;
@ -709,7 +709,7 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
continue;
if (thought->var_2 > 5)
break;
get_arguments_from_thought(peep->thoughts[j], &argument_1, &argument_2);
RCT2_GLOBAL(0x013CE952, uint32) = argument_1;
@ -789,7 +789,7 @@ static int window_guest_list_is_peep_in_filter(rct_peep* peep)
return 1;
}
/**
/**
* rct2:0x0069B7EA
* Calculates a hash value (arguments) for comparing peep actions/thoughts
* peep (esi)
@ -817,7 +817,7 @@ static void get_arguments_from_peep(rct_peep *peep, uint32 *argument_1, uint32*
}
/**
*
*
* rct2: 0x0069B5AE
*/
static void window_guest_list_find_groups()
@ -854,11 +854,11 @@ static void window_guest_list_find_groups()
_window_guest_list_num_groups++;
_window_guest_list_groups_num_guests[groupIndex] = 1;
peep->var_0C &= ~(1 << 8);
get_arguments_from_peep( peep, &_window_guest_list_groups_argument_1[groupIndex], &_window_guest_list_groups_argument_2[groupIndex]);
RCT2_GLOBAL(0x00F1EDF6, uint32) = _window_guest_list_groups_argument_1[groupIndex];
RCT2_GLOBAL(0x00F1EDFA, uint32) = _window_guest_list_groups_argument_2[groupIndex];
RCT2_ADDRESS(0x00F1AF26, uint8)[groupIndex] = groupIndex;
faceIndex = groupIndex * 56;
_window_guest_list_groups_guest_faces[faceIndex++] = get_peep_face_sprite_small(peep) - 5486;

4
src/windows/install_track.c
View File

@ -270,7 +270,7 @@ static void window_install_track_invalidate(rct_window *w)
else
w->pressed_widgets &= ~(1 << WIDX_TOGGLE_SCENERY);
if (w->track_list.var_482 != 0xFFFF) {
if (w->track_list.var_482 != 0xFFFF) {
w->disabled_widgets &= ~(1 << WIDX_TRACK_PREVIEW);
}
else {
@ -326,7 +326,7 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi)
y = w->y + widget->bottom - 12;
RCT2_GLOBAL(0x00F44153, uint8) = 0;
// Warnings
if (track_td6->track_flags & 1) {
RCT2_GLOBAL(0x00F44153, uint8) = 1;

4
src/windows/land.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

4
src/windows/land_rights.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/

8
src/windows/loadsave.c
View File

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
#include <time.h>
#include <time.h>
#include "../addresses.h"
#include "../config.h"
#include "../game.h"
@ -399,7 +399,7 @@ static void window_loadsave_scrollmouseover(rct_window *w, int scrollIndex, int
selectedItem = y / 10;
if (selectedItem >= w->no_list_items)
return;
w->selected_list_item = selectedItem;
window_invalidate(w);
@ -530,13 +530,13 @@ static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, i
char *templateString;
gfx_fill_rect(dpi, dpi->x, dpi->y, dpi->x + dpi->width - 1, dpi->y + dpi->height - 1, RCT2_ADDRESS(0x0141FC48,uint8)[w->colours[1] * 8]);
templateString = (char*)language_get_string(templateStringId);
for (i = 0; i < w->no_list_items; i++) {
y = i * 10;
if (y > dpi->y + dpi->height)
break;
if (y + 10 < dpi->y)
continue;

6
src/windows/main.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -92,7 +92,7 @@ void window_main_open()
/**
*
* rct2: 0x66CCAE
* rct2: 0x66CCAE
* This function immediately jumps to 0x00685BE1 this is the second function
* decompiled.
*/

30
src/windows/map.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -847,7 +847,7 @@ static void window_map_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int sc
window_map_paint_peep_overlay(dpi);
else
window_map_paint_train_overlay(dpi);
window_map_paint_hud_rectangle(dpi);
}
@ -855,7 +855,7 @@ static void window_map_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int sc
*
* rct2: 0x0068CA6C
*/
static void window_map_init_map()
static void window_map_init_map()
{
memset(RCT2_GLOBAL(RCT2_ADDRESS_MAP_IMAGE_DATA, void*), 0x0A0A0A0A, 256 * 256 * sizeof(uint32));
RCT2_GLOBAL(0x00F1AD6C, uint32) = 0;
@ -887,7 +887,7 @@ static void window_map_center_on_view_point()
dx = ((w->viewport->view_height >> 1) + w->viewport->view_y) >> 4;
cx += offset.x;
dx += offset.y;
// calculate width and height of minimap
ax = w_map->widgets[WIDX_MAP].right - w_map->widgets[WIDX_MAP].left - 11;
@ -1078,7 +1078,7 @@ static void window_map_paint_train_overlay(rct_drawpixelinfo *dpi)
/**
* The call to gfx_fill_rect was originally wrapped in sub_68DABD which made sure that arguments were ordered correctly,
* but it doesn't look like it's ever necessary here so the call was removed.
*
*
* rct2: 0x0068D8CE
*/
static void window_map_paint_hud_rectangle(rct_drawpixelinfo *dpi)
@ -1115,7 +1115,7 @@ static void window_map_paint_hud_rectangle(rct_drawpixelinfo *dpi)
}
/**
*
*
* rct2: 0x0068D24E
*/
static void window_map_set_land_rights_tool_update(int x, int y)
@ -1148,7 +1148,7 @@ static void window_map_set_land_rights_tool_update(int x, int y)
}
/**
*
*
* rct2: 0x00666EEF
*/
void sub_666EEF(int x, int y, sint16 *mapX, sint16 *mapY, sint16 *mapZ, int *direction)
@ -1174,7 +1174,7 @@ void sub_666EEF(int x, int y, sint16 *mapX, sint16 *mapY, sint16 *mapZ, int *dir
}
/**
*
*
* rct2: 0x00666FD0
*/
static void window_map_place_park_entrance_tool_update(int x, int y)
@ -1218,7 +1218,7 @@ static void window_map_place_park_entrance_tool_update(int x, int y)
}
/**
*
*
* rct2: 0x0068D4E9
*/
static void window_map_set_peep_spawn_tool_update(int x, int y)
@ -1256,7 +1256,7 @@ static void window_map_set_peep_spawn_tool_update(int x, int y)
}
/**
*
*
* rct2: 0x006670A4
*/
static void window_map_place_park_entrance_tool_down(int x, int y)
@ -1293,7 +1293,7 @@ static void window_map_place_park_entrance_tool_down(int x, int y)
}
/**
*
*
* rct2: 0x0068D573
*/
static void window_map_set_peep_spawn_tool_down(int x, int y)
@ -1327,7 +1327,7 @@ static void window_map_set_peep_spawn_tool_down(int x, int y)
}
/**
*
*
* rct2: 0x0068D641
*/
static void map_window_increase_map_size()
@ -1348,7 +1348,7 @@ static void map_window_increase_map_size()
}
/**
*
*
* rct2: 0x0068D6B4
*/
static void map_window_decrease_map_size()
@ -1596,7 +1596,7 @@ static void map_window_set_pixels(rct_window *w)
{
uint16 colour, *destination;
int x, y, dx, dy;
destination = (uint16*)((RCT2_GLOBAL(0x00F1AD6C, uint32) * 511) + RCT2_GLOBAL(0x00F1AD68, uint32) + 255);
switch (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint8)) {
case 0:

12
src/windows/map_tooltip.c
View File

@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@ -63,7 +63,7 @@ static rct_window_event_list window_map_tooltip_events = {
NULL
};
#define MAP_TOOLTIP_ARGS
#define MAP_TOOLTIP_ARGS
static int _lastCursorX;
static int _lastCursorY;
@ -105,7 +105,7 @@ void window_map_tooltip_update_visibility()
}
/**
*
*
* rct2: 0x006A7C43
*/
static void window_map_tooltip_open()
@ -134,7 +134,7 @@ static void window_map_tooltip_open()
}
/**
*
*
* rct2: 0x006EE8CE
*/
static void window_map_tooltip_update(rct_window *w)
@ -143,7 +143,7 @@ static void window_map_tooltip_update(rct_window *w)
}
/**
*
*
* rct2: 0x006EE894
*/
static void window_map_tooltip_paint(rct_window *w, rct_drawpixelinfo *dpi)

Some files were not shown because too many files have changed in this diff Show More