mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,861 Commits 7 Branches 39 Tags 347 MiB
Commit Graph

10607 Commits

Author SHA1 Message Date
Michael Steenbeek 857e64590d Name some rct(1)_peep fields 2018-01-09 10:35:07 +01:00
Michael Steenbeek 647f085098
Merge pull request #6925 from AaronVanGeffen/widgets/cleanup-1 
Clean up and name remaining widgets
 2018-01-09 09:52:15 +01:00
Michał Janiszewski e602162fdb Include openrct2-cli in default `all` target 2018-01-08 13:15:11 +01:00
Michał Janiszewski 6b06ada801 Fix Android compilation 2018-01-08 10:03:31 +01:00
Aaron van Geffen c9b48beea0 Replace WWT_CLOSEBOX with WWT_BUTTON where not used as a close button. 2018-01-08 00:02:25 +01:00
Aaron van Geffen aa885c661e Always apply vertical alignment to button texts. 
This has no effect on the appearance as of this commit, yet.
 2018-01-08 00:01:45 +01:00
Aaron van Geffen bbef07f514 Refactor widget_text_unknown into widget_text_centred. 2018-01-08 00:01:45 +01:00
Aaron van Geffen e61194961f Rename WWT_25 to WWT_PLACEHOLDER. 
This is only used in the bottom toolbar as a placeholder,
while still capturing events.
 2018-01-08 00:01:45 +01:00
Aaron van Geffen 12e3e171f1 Refactor WWT_24 into WWT_LABEL. 2018-01-08 00:01:45 +01:00
Aaron van Geffen ecc1cfed2a Rename WWT_DROPDOWN_BUTTON to WWT_BUTTON. 
The previous name implied an exclusive association with dropdowns.
While used to display the dropdown triangle button, this is not an
exclusive use.
 2018-01-08 00:01:32 +01:00
Aaron van Geffen 7b4c71ff68 Remove unused WWT_4, WWT_5, WWT_11, WWT_18. 2018-01-07 23:54:51 +01:00
Aaron van Geffen 8ad1bc9b86 Rename WWT_14 to WWT_LABEL. 
This is used for left-aligned label text.
 2018-01-07 23:54:51 +01:00
Aaron van Geffen fad8494ccc Rename WWT_12 to WWT_LABEL_CENTRED. 
This is used for centred textual labels.
 2018-01-07 23:54:51 +01:00
Aaron van Geffen 9a2d3b226c Rename WWT_13 to WWT_TABLE_HEADER. 
This is used for left-aligned header buttons for data tables.
 2018-01-07 23:54:51 +01:00
Aaron van Geffen c023f6a3f7 Moved console command, window invalidation, fix help. 2018-01-07 23:53:47 +01:00
Aaron van Geffen bf1bb33b86 Properly invalidate widgets after using date spinners. 2018-01-07 23:53:47 +01:00
Harrison Gentry 752d9bc89d Add cheat and console command to set game date. 
Run "date" command on cmdline to set date.

Ex:
$ date 0004 06 13
sets date to June 13th, year 4
 2018-01-07 23:53:47 +01:00
Gymnasiast 2ecbac1550 Fix #6972: Last development field is identical to progress field 2018-01-07 22:28:08 +01:00
Michał Janiszewski 77c4fa00bc Use nullptr instead of NULL in C++ 2018-01-07 21:43:37 +01:00
Michał Janiszewski 2c8528798f Use explicit boolean values, compare with nullptr 2018-01-07 21:38:02 +01:00
Michael Steenbeek 7d5de63484 Refactor rct_research_item, refactor access to rct_research_item 
This takes away a lot of the bitshift and bit mask trickery previously used.
 2018-01-07 15:33:44 +01:00
Richard Jenkins 59439b778b Fix #6919: Shops don't connect to newly-placed paths 2018-01-07 13:40:37 +01:00
Ted John c3eab7ead6 Refactor window.c to C++ 2018-01-07 12:39:58 +01:00
Ted John 83d1b6eb8f Refactor widget.c to C++ 2018-01-07 12:39:58 +01:00
Ted John f18595a1c1 Refactor viewport.c to C++ 2018-01-07 12:39:58 +01:00
Ted John 0b84c7bb43 Refactor viewport_interaction.c to C++ 2018-01-07 12:39:58 +01:00
Ted John c974daf467 Refactor console.c to C++ 2018-01-07 12:39:58 +01:00
Ted John 630a5065db Refactor colour.c to C++ 2018-01-07 12:39:58 +01:00
Ted John b781291b58 Refactor chat.c to C++ 2018-01-07 12:39:58 +01:00
ZehMatt df9854813f Use templates for bounding box test, better branch prediction 2018-01-07 02:18:12 +00:00
ZehMatt d25c46ef93 Refactor image cache to fixed size. 2018-01-07 02:18:12 +00:00
TELK d0ec5e95f8 Add park and company value to console 'get' command 
This allows getting the park and company value in scenario that don't display them such as Bumbly Bazaar.
 2018-01-06 22:00:28 +01:00
Michael Steenbeek c3e79b1948 Fix Amity Airport coordinate adjustment 2018-01-06 21:46:18 +01:00
Richard Jenkins c966faf9c2 Fix #6242: Scenery invalidated when there is no visual change 2018-01-06 19:20:39 +00:00
Michael Steenbeek 755add6c9a
Compile localisation folder as C++ 2018-01-06 18:32:25 +01:00
Michael Steenbeek 1fa25739fb
Fix #5398: Mini Maze.TD4 causes weird behaviour and crashes 2018-01-06 18:26:28 +01:00
Aaron van Geffen 15a4f67f14 Restore tab-specific widget dimensions for Finances window. 2018-01-06 16:42:48 +00:00
rwjuk 285fc9d11c network version bump 2018-01-06 13:49:29 +00:00
Richard Jenkins 9bb7b66157 Fix #6948 & #6949: Removing or trying to build a ride freezes game 2018-01-06 13:49:29 +00:00
Michael Steenbeek 0430cfb6db Fix #6963: Demolishing ride 0 causes freezes 2018-01-06 14:46:02 +01:00
duncanspumpkin 9e30bfe313 Fix #6954. Readd Error Message for too many rides 
Removed during refactor of game actions
 2018-01-06 07:48:37 +00:00
Michał Janiszewski 94946ce13b Use min/max instead of clamp for limiting tree count in RMG 
Call to `clamp` may not guarantee correct result when `high` < `low`,
use calls to `max()` and `min()` explicitly instead.
 2018-01-05 23:44:59 +00:00
Michael Steenbeek 3882715c38 Fix Xcode project 2018-01-05 23:04:52 +01:00
Ted John 3dcbebcf68 Refactor drawing.c to C++ 2018-01-05 22:57:57 +01:00
Ted John 144dbf431c Refactor ttf.c to C++ 2018-01-05 22:57:55 +01:00
Ted John 0c3c998177 Refactor lightfx.c to C++ 2018-01-05 22:57:55 +01:00
Ted John 559ec8a404 Refactor font.c to C++ 2018-01-05 22:57:54 +01:00
Ted John 36d4e7753f Refactor scrolling_text.c to C++ 2018-01-05 19:58:15 +00:00
Ted John cb468cadb6 Refactor string.c to C++ 2018-01-05 19:58:15 +00:00
Ted John 90b63b09f8 Refactor rect.c to C++ 2018-01-05 19:58:15 +00:00
Ted John ad406e5ae0 Refactor line.c to C++ 2018-01-05 19:58:15 +00:00
Michael Steenbeek 6450cce829 Fix compilation on Xcode 2018-01-05 19:58:05 +01:00
Ted John 02c58a6c5a Remove custom base Exception class 2018-01-05 18:11:47 +00:00
Harrison Gentry 5862cd9d40 Fix guest counter to say '1 guest' instead of '1 guests' 2018-01-05 08:58:17 +01:00
Tyler Ruckinger 26c35b5c28 Fix consecutive thoughts removal on ride demolish (#6937) 
* Fix consecutive thoughts removal on ride demolish

* Update contributors.md

* Update changelog

* Update network version
 2018-01-05 06:49:05 +00:00
Aaron van Geffen 81905fc161 Vertically align widgets in lower-left bottom toolbar. 2018-01-05 00:44:59 +01:00
Duncan 12dde3a589
Refactor of Vehicle Sound Functions (#6907) 
* Refactor vehicle_update_sound_params

Named known params.
Changed function structure to use more return statements to prevent multiple nested ifs.
Used core memory functions instead of hand rolled version.
Added more comments.
Named sub_6BC2F3.
Added comment on likely source of corruption of sound.

* Refactor vehicle_sounds_update

Split the function up into multiple functions.
Rework code to remove GoTos.

* Label params. Refactor slightly the restraint code to use bools
 2018-01-04 21:38:27 +00:00
Hielke Morsink 512dc2c721 Fix #6923: hovering over queues turns them into regular paths 2018-01-04 21:23:56 +01:00
Michael Steenbeek 31bf792538 Refactor research - spike 1 
This involves refactoring gResearchedRideTypes and gResearchedRideEntries
and the functions involved.

Also renames some functions in order to better express what they do.
 2018-01-04 17:44:51 +01:00
Michał Janiszewski c7417e11a4 Use `bool` type for boolean logic 2018-01-04 15:40:52 +01:00
Hielke Morsink 3dd98c7aa2 Apply coding style 2018-01-04 07:58:31 +01:00
Hielke Morsink a6e4c1d677 Remove undefined function declaration 2018-01-04 07:58:31 +01:00
Hielke Morsink 7d37798f19 Reduce duplicated code in finances window 
All of the pages share some common widgets (title, close button, background, tabs). To
reduce code duplication here, I've moved those values to a define that then gets used
for each of the pages.
The same thing applies to enabled widgets. One additional change is that left bitshifts
from `1` have been changed to `1ULL`.
 2018-01-04 07:58:31 +01:00
Aaron van Geffen 0138df5dd8 Centre overall viewports on geometric centre. 2018-01-04 07:57:27 +01:00
Aaron van Geffen 92bcc5f579 For overall views, show small rides zoomed in all the way. 2018-01-04 07:57:27 +01:00
Michał Janiszewski 17354122d4 Remove deprecated comment 2018-01-04 07:36:54 +01:00
Michał Janiszewski 33a94fe1bb Use C++ headers in C++ code 2018-01-04 07:36:54 +01:00
Michał Janiszewski b2bc974fe7
Use nullptr where possible 2018-01-04 06:58:44 +01:00
Michał Janiszewski 4d0c88fb94 Mark constructors explicit (#6928) 2018-01-04 01:12:34 +00:00
Tobias Kohlbau 7aeb3e11b3 Fix #5562: fix continous reopening of log files 
Every logging opens a new file handle which should be avoided
for performance reasons.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2018-01-04 00:01:43 +01:00
Michael Steenbeek 91589f57c6 Compile map.c as C++ 2018-01-03 20:40:51 +01:00
Ted John 0cbc8bea10 Fix compile of Scenario.cpp 2018-01-03 15:07:17 +01:00
Ted John 49f5611bd1 Rename scenario.c|h to cpp 2018-01-03 15:07:17 +01:00
Hielke Morsink eb4a8924d1 Refactor and clean up footpath-related code 
This commit corrects some misused defines, and gave them clearer names.
For example, the slope mask was only useful for surface elements, so now
"SURFACE" is in its name. I also replaced any hard coded values that I
could find and knew their purpose off.
 2018-01-03 10:57:37 +01:00
Michael Steenbeek d25856d59c Make tile element type strings in the Tile Inspector translatable 2018-01-03 10:21:53 +01:00
Michael Steenbeek 347ff702d0 Refactor objects 2018-01-03 10:16:51 +01:00
Aaron van Geffen da519c9b32 Add extra padding to label text in guest window. 2018-01-03 10:09:21 +01:00
Michael Steenbeek 3b06f92c0a
Merge pull request #5964 from janisozaur/sse4.1 2018-01-02 22:27:17 +01:00
Michał Janiszewski 7f5e3a3a64
Sink some variables 2018-01-02 22:03:10 +01:00
Michał Janiszewski 68881fbbc7 Call core_init() on paths that need it 2018-01-02 19:53:51 +01:00
Michael Steenbeek 1bc711e266
Fix #5761: Mini coaster doesn't appear despite being selected (#6909) 2018-01-02 19:40:08 +01:00
Ted John d14dce2b95 Prevent invalid chunk message when loading SC4 
Exception messages were being logged when classifying the file type. This is generally unwanted as it will happen in normal cicumstances.
 2018-01-02 18:23:14 +00:00
Michael Steenbeek b38123924a Fix object override size (#6901) 2018-01-02 17:51:29 +00:00
Michael Steenbeek c5e966292b Fix #3171: Guests entering from the corner of the tile in Amity Airfield 2018-01-02 16:07:39 +01:00
Tobias Kohlbau 9da4305a9c Fix #5224: Close multiplayer window when server closes 
Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2018-01-02 13:04:53 +01:00
Tobias Kohlbau a726f6decd Multiplayer: save manually added servers 
Adding a server via "Add Server" should handle them
as favorites as otherwise the list is not saved locally and
each server is lost after game restart.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2018-01-02 13:04:08 +01:00
Michał Janiszewski 7f7054049d Read commandline before initialising other features 
This allows setting options that may affect future feature detection,
but also allows for configuring verbosity levels early.
 2018-01-01 23:51:43 +01:00
Michał Janiszewski 2a4680035f Update Android project to enable SSE4.1 2018-01-01 23:49:09 +01:00
Michał Janiszewski 566991897e Add compile guard to not miss SSE4.1 2018-01-01 23:49:09 +01:00
Michał Janiszewski 1fdc8ef49e Move definition of OPENRCT2_X86 macro 2018-01-01 23:49:09 +01:00
Michał Janiszewski 54394d3a21 Enable SSE4.1 for file implementing it 2018-01-01 23:49:09 +01:00
Michał Janiszewski 645b36169d Move SSE4.1 code to its own file, detect SSE4.1 in runtime 2018-01-01 23:49:09 +01:00
Michał Janiszewski c04e720f9f Hide mask_sse4_1 completely on non-SSE builds 2018-01-01 23:49:09 +01:00
Michał Janiszewski b30fb66878 Add SSE4.1 implementation of masking 2018-01-01 23:49:09 +01:00
Michał Janiszewski b1a78c8f24
Fix a compilation issue with older compilers 2018-01-01 22:55:00 +01:00
Michał Janiszewski 1cd7f99d2d
Fix Ride.cpp compilation issues 2018-01-01 22:16:16 +01:00
Gymnasiast 1626f86acc Compile park.c as C++ 2018-01-01 01:18:12 +01:00
Gymnasiast 6f7dfb00aa Fix duplicated line 2018-01-01 01:01:12 +01:00
Gymnasiast dc68946649 Remove unneeded C transfer functions from RideGroupManager 2017-12-31 21:15:34 +01:00
Gymnasiast 2a6f2c1763 Fix #6114: Crash when using a non-LL CSG1.DAT 
The game will now check for the number of entries in CSG1.DAT. If it's too few, it will now no longer try using its sprites, but print out a warning instead.
 2017-12-31 21:03:40 +01:00
Gymnasiast 6e281e2061 Move music tune id list out of Ride.cpp for now 2017-12-31 20:43:17 +01:00
Gymnasiast 23d70a4ac9 Compile ride.c as C++ 2017-12-31 20:43:17 +01:00
Aaron van Geffen e405867dae Add tooltip to explain why sprite selection is disabled. 2017-12-31 20:03:09 +01:00
Robert Jordan 907f18fd69 Fix: Following canceling 
Stop previewing sequence now unfollows the current sprite.
Using the arrow keys in-game cancels following.
Resizing the window no longer cancels following.
 2017-12-31 20:03:09 +01:00
Robert Jordan 298420fd1e Finalize follow sprite command 
Added new smart follow variable to window to more intuitively follow
sprites that may not be directly followable at all times.
Follow sprite is now canceled when dragging the screen but not
scrolling. This is only relevant when testing title sequences in game.
Select sprite button is now disabled in the title menu.
Sprites are now identified based on their name. Excess identification
information is not given as it'd clutter up the screen and is not
necissary with the viewbox in the command editor.
 2017-12-31 20:03:09 +01:00
Hielke Morsink 1443216ba0 Replace number with small viewport 2017-12-31 20:03:09 +01:00
Hielke Morsink 943747056e Add window settings and save support for follow sprite command 2017-12-31 20:03:09 +01:00
Hielke Morsink 500b0d09aa Add follow sprite command to title sequence 2017-12-31 20:03:09 +01:00
Gymnasiast 559a5c662a Fix import of RCT1 mazes 2017-12-31 19:54:50 +01:00
Gymnasiast a435fd7434 Fix #6833: shops and maze in corrupted file not imported correctly 2017-12-31 18:56:17 +01:00
Hielke Morsink db7efda880 Fix #6845: Logo artifacts when changing scale. 
This correctly invalidates the areas with logo and version text.
 2017-12-31 13:14:03 +01:00
Tobias Kohlbau 7a8c5c2842 multiplayer: Adds option to pause server 
OpenRCT2 does not provide a simple function to pause a server
while no client is connected. This patch adds a so called
"pause_server_if_no_clients" flag within network section of
config.ini. By default this flag is set to false to be backward
compatible with running servers. After setting this flag to
true the game is paused on launch and gets unpaused on first
connection.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
 2017-12-31 12:55:07 +01:00
Robert Jordan 92fc010b9a Feature: "Load Scenario" title sequence command 
New command goes by LOADSC in script files and in the enumeration.
Scenarios are stored using the internal also used for localisation.
Scenarios selected can only be scenarios to originally come with one of
the games or expansions.
Modified Scenario Select window to have a mode just for title editor
scenario selection.
 2017-12-31 12:42:40 +01:00
Hielke Morsink 4459eb09b9 Fix invalid entries in surface boundries table 2017-12-30 13:55:39 +01:00
rwjuk 1736a08b04 Fix potential access violation when setting park name 2017-12-29 21:56:07 +01:00
Hielke Morsink d2f732bbb6 Fix garbage in buffer 2017-12-29 12:33:34 +00:00
rwjuk 50f16b6600 Fix #6388: Con. rights wrongly shown as available on some RCT1 parks 
I am an idiot
 2017-12-29 08:43:26 +01:00
rwjuk 29c604d850 Fix #6846: Ride overview window zoom level set too high 2017-12-28 08:55:13 +01:00
Hielke Morsink 32cc3082b2 Remove check that would never pass 
`safe_strcpy` already takes the null terminator into
account, making the check useless. If the string was too
long, `safe_strcpy` already prints a warning anyway.

Two small fixups included:
 - Sorting includes
 - Comparing char with `\0` instead of 0
 2017-12-27 23:11:04 +01:00
Hielke Morsink acc33aa47e Remove duplicated code in text window 
The two functions for opening were almost identical. The only
difference was that one was passed a string ID and the other a
raw string. The one taking the string ID now converts it to a
raw string, and then calls the other functions.

This also makes the utf8 string const and replaces some C-string
code with String::Set.
 2017-12-27 16:19:46 +00:00
Tomas Dittmann a9aaaf17a3 log exceptionmessage instead of custom string. 2017-12-27 14:32:19 +00:00
Tomas Dittmann b7d26665d6 Add console output for handled exceptions. 2017-12-27 14:32:19 +00:00
Tomas Dittmann f9e0865f31 use unique_ptr to prevent memoryleaks. 2017-12-27 14:32:19 +00:00
Tomas Dittmann c22dac0a29 add missing exception handling. 
LoadParkFromStream() now handles exceptions from parkImporter->LoadFromStream().
 2017-12-27 14:32:19 +00:00
Tomas Dittmann 51bbfb084f add missing exception handling. 
Every TryClassifyAsX()-method now has exceptionhandling.
 2017-12-27 14:32:19 +00:00
Aaron van Geffen a5ae503f0a Take font line height into account for bottom toolbar 2017-12-27 14:54:09 +01:00
Aaron van Geffen 759c51bbad Fix #6869: incorrect Map button appearance in Guest List. 
* Fixes the map button overlapping with the new search icon.

* Fixes the map button not being repositioned when the window is resized.
 2017-12-27 14:51:17 +01:00
Michał Janiszewski ad687a7ecf Remove use of problematic __DATE__ and __TIME__ 
Replace with a placeholder to be filled by external tools
 2017-12-27 14:50:42 +01:00
Aaron van Geffen 4455925fcb Move braces to follow code style. 2017-12-27 13:18:24 +01:00
Aaron van Geffen 10ed48611c Refactor bottom toolbar: hex to dec, apply macro. 
This was one of the few windows that had its widget positions defined in
hexadecimals rather than decimals.

The logic was further obscured by using a macro to offset an experimental
change to accomodate longer dates. This change has been widely embraced,
so this patch applied said macro to improve legibility.
 2017-12-27 13:18:07 +01:00
Michael Steenbeek 6d5dd061d7 Fix crash when opening object selection 2017-12-27 13:17:09 +01:00
Michał Janiszewski 8fdec42ff9 Remove redundant declarations 2017-12-26 22:16:03 +01:00
Michał Janiszewski c4c5439943 Add missing include guards 2017-12-26 22:16:03 +01:00
Michał Janiszewski b574c23172 Fix function declaration 2017-12-26 18:09:00 +01:00
Michał Janiszewski 8089cadc40 Reduce code duplication 2017-12-26 18:08:56 +01:00
Hielke Morsink 5396883a86 Make map_can_construct_at check for clearance cheat 2017-12-26 16:16:06 +01:00
Hielke Morsink 4ec213f680 Allow building through water with clearance disabled 2017-12-26 16:16:06 +01:00
Michał Janiszewski fe55ed6f64 Add missing include guards 2017-12-26 11:44:41 +01:00
Marijn van der Werf a29c4f49a0 Add function description 2017-12-25 15:06:06 +01:00
Marijn van der Werf 6251577305 Refactor direct access to window list 2017-12-25 15:06:06 +01:00
Marijn van der Werf 6493427011 Clean up window classification comparison 2017-12-25 15:06:06 +01:00
Marijn van der Werf 0048ef091f Refactor direct access to window list 2017-12-25 15:06:06 +01:00
Park Joon-Kyu bbf5571c17 Allow filtering guests by name (#6633) 2017-12-25 12:17:37 +01:00
Aaron van Geffen d768a467b7 Implement std::string variant of TrimStart; add tests. 
This also makes String::TrimStart handle all-whitespace strings.
 2017-12-25 00:30:21 +01:00
Aaron van Geffen 4bc2ad18c4 Trim ideographic spaces as well. 2017-12-25 00:30:21 +01:00
Aaron van Geffen 6c26009f19 Fix #6097: String::Trim wasn't taking multibyte chars into account. 
Extends StringTest with multibyte tests.
NB: ストリング is a katakana transcription of 'string'.
 2017-12-25 00:30:21 +01:00
Aaron van Geffen 54e6ffdbdd Fix #6860: Intensity and nausea ratings are too high in build menu. 2017-12-23 00:13:33 +00:00
Michael Steenbeek c846d98516 Fix English descriptions of path additions and banners 2017-12-22 16:59:11 +01:00
Michael Steenbeek 2e79aaf54c Fold vehicle name into regular name 2017-12-22 15:28:41 +01:00
Aaron van Geffen 558cc07cb0 Implement CP949 to UTF-8 conversion for Korean. 2017-12-22 14:51:21 +01:00
Aaron van Geffen 0232bb5add Implement CP932 to UTF-8 conversion for Japanese. 2017-12-22 14:51:21 +01:00
Michał Janiszewski dd0dc4427b
Add nullptr checks to vehicle_get_vehicle_entry results 
This satisfies PIC builds in release mode.
 2017-12-22 10:09:30 +01:00
Aaron van Geffen 1e7fe352fb Adjust Twitch options to make room for CJK glyphs. 2017-12-22 08:03:03 +01:00
Aaron van Geffen 9e686197aa Audio tab: widen label for 'focus loss' option. 
The string used in e.g. the German translation is much longer than its
English counterpart, which led to flickering of the label.
 2017-12-22 08:03:03 +01:00
Aaron van Geffen ec37e14f98 More consistent indentation for nested checkboxes. 
Also fixes the height of the lightning effect checkbox.
 2017-12-22 08:03:03 +01:00
Aaron van Geffen 4e57ad55b3 Refactor widgets for 'controls and interface' tab. 2017-12-22 08:03:03 +01:00
Aaron van Geffen dfffabc08f Change option window tab icons. 2017-12-22 08:03:03 +01:00
Aaron van Geffen 8fd4f323fd Reposition widgets in Miscellaneous tab; add strings. 2017-12-22 08:03:03 +01:00
Aaron van Geffen b76c8b863a Move 'scenario grouping' to Misc tab. 2017-12-22 08:03:03 +01:00
Aaron van Geffen f7b92e4d37 Reposition widgets for 'Advanced' tab. 2017-12-22 08:03:03 +01:00
Aaron van Geffen 511a158fdd Options: introduce new 'Advanced' tab split off from 'Misc'. 2017-12-22 08:03:03 +01:00
Hielke Morsink 916060907f Fix sign mismatch warning 2017-12-21 23:47:30 +01:00
Hielke Morsink b6718d08d4 Remove unnecessary return statements 2017-12-21 23:47:30 +01:00
Hielke Morsink bcfd66cbc6 Use nullptr instead of 0 2017-12-21 23:47:30 +01:00
Hielke Morsink 3770b46e46 Replace 1 and 0 constants with bool where applicable 2017-12-21 23:47:30 +01:00
Hielke Morsink 628039dd8a Use range-based for loops in libopenrct2 2017-12-21 23:47:30 +01:00
Robert Lewicki 3c2aaefc85 Fix #6851: Passing password as argument does not work 
* Using password from command line arguments to connect to server

* Replaced tabs with spaces

* Added myself to contributors
 2017-12-21 21:23:01 +01:00
Aaron van Geffen 4678829e03 Use LIST_ROW_HEIGHT in Map window. 2017-12-21 16:50:23 +01:00
Aaron van Geffen 9582561a7b Use LIST_ROW_HEIGHT in Park window. 2017-12-21 16:50:23 +01:00
Aaron van Geffen dbb22dd883 Use {SCROLLABLE/LIST}_ROW_HEIGHT in track list window. 2017-12-21 16:50:23 +01:00
Aaron van Geffen ad5246976c Use SCROLLABLE_ROW_HEIGHT in ride list window. 2017-12-21 16:50:23 +01:00
Aaron van Geffen a0cadab70b Use LIST_ROW_HEIGHT in Staff window's stats page. 2017-12-21 16:50:23 +01:00
Hielke Morsink 24999b60a4 Add missing log string for 'No Money' cheat 2017-12-21 10:00:22 +01:00
Michael Steenbeek 282e70a806
Allow building level crossings without cheats 2017-12-20 18:20:31 +01:00
Michael Steenbeek 863a71c984 Fix #6803: Symlinks to directories are not descended by FileScanner 2017-12-19 20:51:35 +01:00
Gymnasiast 44651defa7 Fix #6447: Rename friction to mass 2017-12-17 20:11:55 +01:00
Gymnasiast b52b22c97b Fix #6829: Steel Twister cannot reach the same height as in vanilla 2017-12-17 17:39:38 +01:00
Aaron van Geffen 3d7d7bee71 Right-align buttons in Options window. 2017-12-17 17:29:51 +01:00
Aaron van Geffen 39b2a00fd8 Disable resolution dropdown on "Windowed" and "Fullscreen (desktop)". 2017-12-17 17:29:34 +01:00
Michael Steenbeek c4f44e5e7a Compile files in paint folder as C++ 2017-12-17 17:24:36 +01:00
Ted John 14075b8d84 Fix #6835: Undefined string in ride stats window 
New changes to LanguagePack stop ability to tell apart an undefined string and an empty string. As a temporary measure, only allow string #0 to return empty string.
 2017-12-16 17:40:46 +00:00
Marijn van der Werf 00667c81b6 Reformat MouseInput 2017-12-16 15:47:38 +02:00
Marijn van der Werf 1e946fc0fe Move Dropdown to UI project 2017-12-16 15:47:38 +02:00
Marijn van der Werf 0193ea4fdc Move tooltip to UI project 2017-12-16 15:47:38 +02:00
Marijn van der Werf e9ef843619 Move majority of input.c to UI 2017-12-16 15:47:38 +02:00
Marijn van der Werf 22966c1ad7 Fix graph land move 2017-12-16 15:47:38 +02:00
Marijn van der Werf b660b42554 Move land tool 2017-12-16 15:47:38 +02:00
Marijn van der Werf 6b17a185d6 Move graph 2017-12-16 15:47:38 +02:00
Ted John 4aff132fd7 Fix #6830: Crash when using mountain tool due to ride with no entry 2017-12-16 12:22:14 +00:00
Ted John 6e34aaa321 Fix debug assert when closing game from object selection 2017-12-16 12:22:14 +00:00
Ted John 14490ad45b Refactor, use .empty() in LanguagePack.cpp 2017-12-16 12:06:00 +00:00
Michael Steenbeek 2a509c2c02 Return null pointer if an override is not specified, rather than an empty string 2017-12-15 12:43:50 +01:00
Michael Steenbeek 65fc7f914f Fix US English missing almost every string 2017-12-15 12:35:40 +01:00
Ted John fc6fd9a444 Fix inline sprites 2017-12-14 14:38:14 +01:00
Ted John 2ea20552c4 Fix strings by std::string-ing LanguagePack 2017-12-14 14:38:14 +01:00
Ted John 31e112cf3b Use std::string for objects 2017-12-14 14:38:14 +01:00
LRFLEW eed00ea363 Add Vsync Toggle to Options 2017-12-14 11:18:28 +01:00
Michael Steenbeek 90446d06ed Try to fix compilation on MSVC 2017-12-14 10:03:21 +01:00
Michael Steenbeek 4a9ef5bd12 Explicitly cast to size_t 2017-12-14 10:03:21 +01:00
Michael Steenbeek 717d71eb24 Make const char-char conversions explicit 2017-12-14 10:03:21 +01:00
Michael Steenbeek 1a9975d683 Compile util and cheats as C++ 2017-12-14 10:03:21 +01:00
ζeh Matt c84fd8edd2 Fix #6821: Edge sprites drawing is corrupted 2017-12-14 09:46:22 +01:00
Michael Steenbeek cc27beef73 Remove unnecessary strdup 2017-12-13 19:46:29 +01:00
ζeh Matt 8772d746ce Use index instead of memmove 2017-12-13 17:57:39 +01:00
Hielke Morsink 5fa292207f Replace character \U3000 with simple space 2017-12-13 17:53:06 +01:00
Michael Steenbeek eec1829081 Add missing declarations 2017-12-13 13:51:38 +01:00
Michael Steenbeek 9ea5302a2a Refactor access to some footpath stuff 2017-12-13 13:51:38 +01:00
ZehMatt 02128131e2 Refactor access to tile descriptor via reference. 2017-12-13 12:00:45 +01:00
ZehMatt 1d0750b2dd Refactor more variables to const type. 2017-12-13 12:00:45 +01:00
ZehMatt 07bd4f13be Unify some surface drawing functions. 2017-12-13 12:00:45 +01:00
ZehMatt 05137355fd Format Surface.cpp 2017-12-13 12:00:45 +01:00
ZehMatt 594c32b537 Refactor park boundary fences to use data tables. 2017-12-13 12:00:45 +01:00
ZehMatt 8814b15a85 Add sprite definitions for park boundary fences. 2017-12-13 12:00:45 +01:00
ZehMatt 6787e6ca04 Rename surface.c to Surface.cpp. 2017-12-13 12:00:45 +01:00
Michael Steenbeek 8095c970aa Fix memory leak in New Ride window 
The way the window handles strings might need to be updated at some point
to be a little bit cleaner, but this at least plugs the leak.
 2017-12-13 11:59:03 +01:00
Michael Steenbeek e9dff344e4 Fix comparison between signed and unsigned integer 2017-12-13 08:03:48 +01:00
Michael Steenbeek a5d4e96aae Remove unused sprite_file_load_palette() 2017-12-13 08:03:48 +01:00
Michael Steenbeek 6dc49d643a Compile files in base dir as C++ 2017-12-13 08:03:48 +01:00
Michał Janiszewski b47a0f7cb5 Don't place trees when impossible 2017-12-12 23:30:50 +01:00
Christian F. Coors 0aa515355a Add cursor scaling 2017-12-12 22:11:40 +01:00
Michael Steenbeek 2b2e617086 Use OpenRCT2 language ID in SetString, avoid mixups 2017-12-12 13:23:42 +01:00
Michał Janiszewski e9c429e9ee Don't try placing null scenery entries in RMG 2017-12-11 22:19:09 +01:00
Hielke Morsink 3f685b4213 Add more options for visual changes 2017-12-11 17:45:23 +00:00
Hielke Morsink 59df0a9941 Add no-peeps and no-sprites options 2017-12-11 17:45:23 +00:00
Hielke Morsink 9b874f8abe Refactor screenshot options 2017-12-11 17:45:23 +00:00
Michael Steenbeek 8951d1b332 Fix box and pole support naming 2017-12-10 13:59:02 +01:00
Hielke Morsink 40cea0e7e7 Fix #2607: Rain rendered incorrectly in additional viewport 2017-12-08 11:24:45 +01:00
Hielke Morsink e307d22bf9 Replace loop with std::fill 2017-12-08 11:06:43 +01:00
Hielke Morsink 79aa4a99cf Use range-based for loops 2017-12-08 11:06:43 +01:00
Michael Steenbeek e3c52360db Remove most usages of separate flag 
This removes most usages of the separate flag, instead relying on ride groups to do its job.
Research is more complicated and will follow in another commit.
 2017-12-08 10:28:29 +01:00
Michael Steenbeek 171271215e Change some ride type names for clarity, fix Americanism 2017-12-08 07:59:44 +01:00
Michael Steenbeek 3868b100df Stop encrypting money 
It serves no purpose any more. Of course, we still need the ENCRYPT_MONEY() and DECRYPT_MONEY() functions for importing and exporting S6 files.
 2017-12-07 23:22:24 +01:00
Ethan Smith 76434c0eb6 Reword comment 2017-12-07 22:04:33 +00:00
Ethan Smith 64f2778c10 Refactor MAX_PATH to be in common.h 2017-12-07 22:04:33 +00:00
Marijn van der Werf 34e27a2408 Sort includes 2017-12-07 17:52:03 +01:00
Marijn van der Werf 2d776de772 Extract functions from EditorObjectSelection 2017-12-07 17:52:03 +01:00
Marijn van der Werf 862ab26cc1 Move object selection window to UI module 2017-12-07 17:52:03 +01:00
Michał Janiszewski 0a28b6eb56 Fix MSVC builds 2017-12-06 13:33:02 +01:00
Michał Janiszewski 7116d88e98 Refactor CPUID 2017-12-06 13:33:02 +01:00
Michał Janiszewski e5da0f4ffc Fix Android builds 2017-12-05 22:48:14 +01:00
Michael Steenbeek 0ffa2b541a Use more consistent terminology and remove some Americanisms 2017-12-05 10:23:36 +01:00
Michael Steenbeek 10a4dd06b0
Merge pull request #6754 from Gymnasiast/game-as-cpp 
Compile game.c and game.h as C++
 2017-12-05 09:23:01 +01:00
Hielke Morsink 884bc0c9a4 Trim object names when copying the missing objects list 
Before adding a name to the clipboard buffer, it checks for spaces at
the end of the name, to prevent copying those.

It also moves some logic from the "mouseup" function, and moved memory
deallocation within the same function where it got allocated.
 2017-12-05 09:22:07 +01:00
Michael Steenbeek fb3b9ccdd2 Clean up for loop 2017-12-05 09:10:28 +01:00
Michael Steenbeek e1eadff208 Formatting fixes 2017-12-05 09:10:28 +01:00
Michael Steenbeek c9354a2c83 Fix alignment and loop variable declaration 2017-12-05 09:10:28 +01:00
Michael Steenbeek ce0147b536 Fix signed/unsigned comparisons 2017-12-05 09:10:28 +01:00
Michael Steenbeek 00eb9bb949 Remove unused functions and undefined symbols from Game.cpp/h 2017-12-05 09:10:27 +01:00
Michael Steenbeek 67f64c35c5 Style fixes 2017-12-05 09:10:27 +01:00
Michael Steenbeek 4d1fc38f8d Replace NULL with nullptr 2017-12-05 09:10:27 +01:00