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

10363 Commits

Author SHA1 Message Date
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