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 351 MiB
Commit Graph

10607 Commits

Author SHA1 Message Date
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
Michael Steenbeek e23bb8c243 Update formatting of Game.cpp and Game.h 2017-12-05 09:10:27 +01:00
Michael Steenbeek 60d8865efb Compile game.c and game.h as C++ 2017-12-05 09:10:27 +01:00
Ted John 3de8e0d37e
Merge pull request #6772 from IntelOrca/remove-rct2-interop-2 
Remove RCT2 interop
 2017-12-04 20:10:35 +00:00
Ted John e879df31e8 Fix testpaint code issues 2017-12-04 19:49:12 +00:00
Michael Steenbeek 078c2d22c1 Make use of ride preview images clearer and more future-proof 2017-12-04 20:11:38 +01:00
Aaron van Geffen db5b72c360 Fix #6782: Steam overlay checkbox widget not displayed correctly. 2017-12-04 20:10:29 +01:00
Michael Steenbeek 407f1ad148
Create scenery_small_entry_has_flag() 2017-12-04 20:09:38 +01:00
Ted John ebf43c2529 Fix testpaint 2017-12-04 19:04:07 +00:00
Ted John 99d7aaa2d6 Remove RCT2 interop 2017-12-04 19:04:06 +00:00
Michael Steenbeek caab169968 Allow building on-ride photo segments on Splash Boats 2017-12-04 19:04:14 +01:00
Ted John 9b5b671673 Fix #6776: Screenshots do not get stored in screenshot folder 2017-12-04 17:46:56 +00:00
Michael Steenbeek b9a6382557 Remove unused tutorial and guest number strings 2017-12-04 11:27:37 +01:00
Michael Steenbeek 273edee634 Turn construction marker into a define 2017-12-04 11:26:53 +01:00
Aaron van Geffen 1ef73997b5 Removed interface to window limit setting. 2017-12-04 11:26:53 +01:00
Aaron van Geffen c000263bbb Remove construction marker colour option. 2017-12-04 11:26:53 +01:00
Aaron van Geffen 38d45a102b Remove interface to option for handymen mowing by default. 2017-12-04 11:26:53 +01:00
Michael Steenbeek c83b2e31cc Replace magic number check for food and drink items with a function call 2017-12-04 10:40:41 +01:00
Michael Steenbeek b0c784ed71 Fix # 6775: New Campaign window only shows 40 rides 2017-12-04 08:35:33 +01:00
Aaron van Geffen 837b177d9d Simplify UI scaling display quality options (#6764) 
Simplify UI scaling display quality options.

This removes three options:
* 'Use NN scaling at integer scales', as NN is decidedly preferable at integer scales.
* Anisotropic scaling, as it produces results very similar (if not equal) to linear scaling.
* NN as a selectable option in the dropdown - NN is forced on integer scales and unavailable for non-integer scales.
 2017-12-03 22:35:16 +01:00
Ted John 107461bbe8 Reintroduce XDG_CONFIG_HOME 
Accidentally removed resolving the user data path by XDG_CONFIG_HOME environment variable
 2017-12-03 19:22:35 +00:00
TELK 349d19e834 Check rct_window is NULL 2017-12-03 18:08:40 +01:00
TELK b7ca7d25ee Fix #6625: Not to try to open a ride window when it crashes 2017-12-03 18:08:40 +01:00
Ted John 33d0fa9b8c
Merge pull request #6748 from IntelOrca/fix/2410 
Refactor logic for resolving base paths
 2017-12-02 19:08:43 +00:00
Michał Janiszewski 079d223663
Actually fix RCT2 builds 2017-12-02 19:46:02 +01:00
Ted John 64f129c616 Fix RCT2 builds 2017-12-02 18:03:54 +00:00
Ted John 6ef5154b02 Fix #6761: An assertion failed - Invalid Font index 65675 
Special font bases were not converted in font_sprite_get_codepoint_width.
Assert converted to safe warning.
 2017-12-02 11:47:24 +00:00
Michał Janiszewski 0920e58f98 Remove ADVERTISE_STATUS_ prefix 2017-12-02 09:03:59 +01:00
Michał Janiszewski 8e57c7d05d Make ADVERTISE_STATUS enum class 2017-12-02 09:03:59 +01:00
Michał Janiszewski 053a2540f3 Fix building with HTTP disabled, but network enabled 2017-12-02 09:03:59 +01:00
Ted John 11fac1bbf5 Change back to current directory structure 2017-12-01 21:09:52 +00:00
Michael Steenbeek 8a62229a5b Fix build on Xcode 2017-12-01 21:09:52 +00:00
Ted John 205fdaefa7 Split up Platform2 by OS 2017-12-01 21:09:52 +00:00
Ted John bbc389d18e Fix remaining code issues 2017-12-01 21:09:52 +00:00
Ted John ea356cd2b9 Fix mingw 2017-12-01 21:09:52 +00:00
Ted John 679aae801d Fix GetFolderPath for Windows 2017-12-01 21:09:52 +00:00
Ted John 66a6aa95f6 Redirect platform_get_user_directory to IPlatformEnvironment 
- Remove old code for getting user directory, redirect to IPlatformEnvironment.
- Fix config loading so that it uses path straight from IPlatformEnvironment.
- Add more special folder implementation in Platform2.
 2017-12-01 21:09:52 +00:00
Ted John dcb92a466d Add new base path for user data and config 
Refactor more path resolution to Platform2.cpp
 2017-12-01 21:09:45 +00:00
Ted John f52544d607 Fix #6739: Park name isn't displayed 
Fix wrong type, down cast introduced by mistake in 585fc1afce
 2017-12-01 20:25:41 +00:00
Ted John 1f456d3e8e
Merge pull request #6638 from janisozaur/font-guard 
Guard access to font
 2017-12-01 20:13:58 +00:00
Stefan Winkler 516c5737be Set branch/sha1 defines only for specific files 2017-12-01 21:05:44 +01:00
Michael Steenbeek 63f7820b25 Fix #1185: Close button colour of prompt windows does not match 2017-12-01 17:36:30 +01:00
Michael Steenbeek 57a2612365
Fix scenery group assignment race conditions 
When adding entries to scenery groups by hand, like we do for a lot of ToonTowner's stuff, it currently tries to get the loaded scenery group. If this happens not to be loaded at that time, this will fail.
Instead, hardcode the headers - that's how object .DATs do this anyway.
 2017-12-01 11:54:25 +01:00
Michael Steenbeek 7b373e23ac Fix #6756: Raise maximum amount of scenery items per tab to 1024 2017-12-01 10:02:33 +01:00
Aaron van Geffen 1747253c42 Do not accept implicit font substitutions from FontConfig. 
FontConfig implicitly falls back to any default font it is configured to handle.
In our implementation, this cannot account for supported character sets, leading
to unrendered characters (tofu) when trying to render e.g. CJK characters using a
Western (sans-)serif font. We therefore ignore substitutions FontConfig provides,
and instead rely on exact matches on the fonts predefined for each font family.
 2017-11-30 23:35:02 +01:00
Tomas Dittmann 1332004640 switch returnvalue from 0 to `false`. 
switch const variable to `#define`
 2017-11-30 23:26:15 +01:00
Tomas Dittmann 60b457d13f Prevent writing to invalid memory. 
Switch magic number to constant `maxTrackElements`.
If the number of TrackElements becomes equal to maxTrackElements, cleanup the data and abort the export.
 2017-11-30 23:26:15 +01:00
Michael Steenbeek b0aaf13cec Clean up and future-proof peep spawn import 2017-11-30 23:08:59 +01:00
Ted John 47a68e9e90 Add constant for maximum zoom level 2017-11-30 21:21:38 +00:00
Michael Steenbeek 251dad113c Make ride_entry_get_first_non_null_ride_type() take a const ride entry 2017-11-29 12:15:33 +01:00
Michael Steenbeek 7feb0f8f7e Fix #4760: Correct guest entry points on loading scenario 2017-11-29 09:10:09 +01:00
Michael Steenbeek 32f91e3e45 Draw friction wheels instead of chain on LRC station 2017-11-29 09:08:27 +01:00
Michael Steenbeek 3f8556c85a Fix #6294: Refactor Editor::SelectedObjects 2017-11-28 13:38:54 +01:00
Michał Janiszewski f46f2d6821 Fix g1 image ID check (#6742) 2017-11-27 22:03:54 +00:00
Michał Janiszewski 585fc1afce
Ensure variables in switch are properly scoped 2017-11-26 23:14:40 +01:00
Michał Janiszewski 9fcef9ed07 Only guard font access in RCT2-less builds 2017-11-26 21:48:54 +01:00
Michał Janiszewski 8097beeae1 Guard access to font 2017-11-26 21:38:50 +01:00
Michał Janiszewski 14f39e189d Fix building 2017-11-26 21:24:57 +01:00
Michał Janiszewski b7ecaf6ae0 Fix StaffList.cpp compilation 2017-11-26 20:36:03 +01:00
Michał Janiszewski 6943a45b19 Remove limits.h from common.h 2017-11-26 20:36:03 +01:00
Hielke Morsink 59cfc3459d Add clear button 2017-11-26 13:44:45 +00:00
Hielke Morsink c648a60502 Add search box to track list window 
This adds a vector of indices used for the track designs array, which is
used instead of the window list index.

Some other things I've edited that are not directly related to this
commit:

- Orders widgets in logical order like how they appear on screen
- Adds some comments to existing code
 2017-11-26 13:44:45 +00:00
Ted John 84305af7ab
Merge pull request #6715 from Broxzier/screenshot_climate 
Add optional screenshot argument to set weather
 2017-11-25 23:32:35 +00:00
Ted John 79a1755666
Merge pull request #6722 from duncanspumpkin/name_sprite_fields 
Name known misc sprite fields
 2017-11-25 23:31:00 +00:00
Michał Janiszewski 0a9ee59152 Change format to use 5-wide index 2017-11-25 16:42:12 +01:00
Michał Janiszewski 39bb4bcc41 Report indexing progress 2017-11-25 16:42:12 +01:00
duncanspumpkin b3cf757ee1 Increment network version 2017-11-25 09:31:16 +00:00
duncanspumpkin b6ce5ce4a5 Simplify fountain code. Name sprite fields. Fix warning 
Fountain jumping code has been sped up slightly so that the code can be simplified and not require rolling over a unsigned int. Also removed setting direction of the fountain as the field was not used.
 2017-11-25 09:30:38 +00:00
duncanspumpkin 464f5e858a Remove unused fields 2017-11-25 09:30:36 +00:00
duncanspumpkin 6905b81216 Label unused vars as pad and remove where required 2017-11-25 09:30:35 +00:00
duncanspumpkin 993ca5a03d Fix warning 2017-11-25 09:30:35 +00:00
duncanspumpkin e7774a4012 Clean up balloon update code. See previous commit for more info 2017-11-25 09:30:34 +00:00
duncanspumpkin 8bf42ea4f9 Modify how steam updates to simplify code. 
This will move steam in exactly the same way as the previous code but the
code is easier to understand. Note on first load of a save that was made
prior to this change there will be 1 tick of incorrect movement for steam. This is barrely noticeable.
 2017-11-25 09:30:33 +00:00
duncanspumpkin 0afc0eba5e Name known misc sprite fields. 2017-11-25 09:30:32 +00:00
Michael Steenbeek 1f4643b19c Show TT's Glass Roofs in the Abstract Theming group 2017-11-24 13:56:11 +01:00
Michael Steenbeek b5a4aa30cc Add TT's tile roofs to R&W tab, add TT's wooden roofs to Mine theming 2017-11-24 13:17:25 +01:00
Michael Steenbeek 303447f647 Show TT's Pirate Roofs in the Pirates Theming group 2017-11-24 12:27:22 +01:00
Michael Steenbeek c9ca5d55cd Rename incorrectly named flag 2017-11-24 11:44:57 +01:00
Michael Steenbeek bb569d35fb Fix some CC base blocks 2017-11-24 11:44:57 +01:00
rwjuk d920083503 Fix #6663: Object load error window filename corruption 2017-11-24 07:53:49 +01:00
Marijn van der Werf f19344aea6 Move tile inspector to UI module 2017-11-23 23:12:25 +01:00
Michael Steenbeek d88c01de74 Split Steel Wild Mouse and Spinning Wild Mouse when using Ride Groups 
Includes a little cleanup for the Ride Groups and a fix in the table with available pieces, which erroneously listed banked pieces as available.
 2017-11-23 16:00:58 +01:00
Michael Steenbeek 1011d6172d
Clean up string IDs 2017-11-23 15:52:06 +01:00
Hielke Morsink ce6d7415e5 Add ability to search object by filename 
This commit increases the max length of the filter string from 40 to
MAX_PATH, so that entire paths can be pasted inside the search box.
 2017-11-23 12:08:04 +01:00
Michał Janiszewski 65c21db2fc
Make GCC aware Object class is not final (#6726) 
* GCC suddenly decided `Object` should be marked as `final`, however it is
used as a base class for more specific types that inherit from it.

* Also ignore -Wsuggest-final-methods for Object class

* Guard Object::GetName from being final
 2017-11-23 10:14:28 +01:00
Ted John 323b8dd352 Partially fix #6129: Guest List not updating after a ride rename 
- Force refresh of ride list and guest list for both rename ride and demolish ride actions.
 2017-11-23 09:40:39 +01:00
Ted John aff7609b86 Name remaining wall entry flags 2017-11-22 22:53:13 +00:00
Ted John 53493d0977 Name only flag for banner objects 2017-11-22 22:06:56 +00:00
Ted John ef65a5208b Rename fields in rct_scenery_group_entry 2017-11-22 21:42:41 +00:00
Michael Steenbeek 430d95bd95 Fix vehicle name fallback 2017-11-22 18:15:07 +01:00
zyliwax 7bffc4ae33 Adding gridlines display toggle shortcut. (#6313) 
This feature existed in the original RCT1/2 games but was not present in
the latest development commit.

The original shortcut for this key was '7', placing it between the
"Invisible people toggle" (6) shortcut and the "Height marks on land
toggle" (8). This commit preserves as much as possible, using
placeholder comments that signify the relevant values which this
feature actually uses where this is not possible.
 2017-11-22 12:02:23 +00:00
Ted John 5cf30b0745 Fix #6700: Maze rendering issues 2017-11-22 01:08:48 +00:00
Hielke Morsink a5111d9feb Small fixes 
- Including C++ stdlib version and using std:: for its functions
- Added new line after printing the IOexception
- Properly clean up after quiting when weather has an invalid value
 2017-11-22 00:46:29 +01:00
Ted John a98c936316 Fix #5636: Pausing the game shows mute button as active 2017-11-21 23:23:43 +00:00
Michael Steenbeek c1400a12eb Allow separate ride and vehicle names per ride entry 2017-11-21 18:55:42 +01:00
Michael Steenbeek 76dc490fca Clip available vehicles string in New Ride window 2017-11-21 18:28:21 +01:00
Hielke Morsink 34bce9892d Turn weather setting into command line option 
Inside the HandleScreenshot function, the argc will be reduced to the
number of arguments minus the options. This way the function doesn't
have to deal with extra optional arguments.
 2017-11-21 18:18:42 +01:00
Michael Steenbeek 2a01c22e8c Raise vehicle tab window height to avoid text clipping 2017-11-21 15:10:35 +01:00
Hielke Morsink 9452457bf9 Add optional screenshot argument to set weather 2017-11-21 00:29:24 +01:00
Michael Steenbeek adae6041f3 Show list of available vehicles in New Ride window 2017-11-20 19:42:29 +01:00
Hielke Morsink b3f9fb5299 Invalidate ride window when opening/closing all 
The ride window was not invalidated, resulting in old text being still
visible inside the list. This was especially noticable when the game was
paused.
 2017-11-20 18:28:22 +01:00
Ted John 8c53b6a70b Fix #6681: Tons of visual glitches when zooming out 
Regression from #6574. Restoring the backup of SPR_TEMP was removed which was necessary as it is the sprite for grass tile zoomed out. Instead make SPR_TEMP a special sprite ID which is not used for anything else apart from temporary sprite drawing.
 2017-11-20 13:48:00 +00:00
Michael Steenbeek dd8464f907 Refactor small, large and wall scenery 2017-11-20 14:40:56 +01:00
Michael Steenbeek 1d3f6b1634 Reformat Particle.cpp 2017-11-20 14:27:32 +01:00
Michael Steenbeek 97683a38d6 Reformat TileInspector.cpp 2017-11-20 14:27:32 +01:00
Michael Steenbeek 459682721d Reformat MoneyEffect.cpp 2017-11-20 14:27:32 +01:00
Michael Steenbeek a050c6944f Compile money_effect.c as C++ 2017-11-20 14:27:32 +01:00
Michael Steenbeek ec0f672e71 Compile particle.c as C++ 2017-11-20 14:27:32 +01:00
Michael Steenbeek 005ce63a0f Compile tile_inspector.c as C++ 2017-11-20 14:27:32 +01:00
Michael Steenbeek ed05d45072 Clean up ride groups and related functions 2017-11-20 13:40:03 +01:00
Michael Steenbeek bf69b2e682 Make terminology use more consistent 2017-11-20 11:20:04 +01:00
Ted John 38024bbd0d
Merge pull request #6699 from IntelOrca/refactor/available-entertainers 
Refactor entertainer invented logic
 2017-11-19 23:46:54 +00:00
Michael Steenbeek e3ab7e723d Fix #6701: assertion on string ID -2 and name it 2017-11-19 22:22:04 +01:00
Ted John 110730015b Rename scenery set to scenery group 2017-11-19 20:40:55 +00:00
Ted John 3251af4f30 Refactor entertainer invented logic 
Remove hard dependency on scenery window by calling a new is scenery set invented function. I don't think this the performance is any worse as it called init_scenery anyway for every call to get_available_entertainers.
 2017-11-19 16:06:10 +00:00
Michael Steenbeek 03299b9a64 Assert string number is not -2 2017-11-19 16:47:35 +01:00
Marijn van der Werf 67ebf40f83 Move main editor window to UI project 2017-11-18 21:07:21 +01:00
Marijn van der Werf dceb403ca9 Move editor bottom toolbar to UI module 2017-11-18 21:07:21 +01:00
Marijn van der Werf 8b7322ad6e Move bottom toolbar to UI module 2017-11-18 21:07:21 +01:00
Marijn van der Werf 3d7867791d Move scenery window to UI module 2017-11-18 21:07:21 +01:00
platipo 789b47b7bb Refactor slope flags and path type flag 2017-11-18 12:58:27 +01:00
Ted John 06cd6a958e Fix #6274: Demolishing launched freefall track piece removes entrance and exit 
Regression caused by multiple refactor commits. Track type and sequence was being retrieved from the entrance element instead of the track element in sub_6CB945.

Also fixes #6690.
 2017-11-18 00:04:40 +00:00
Michael Steenbeek 81ee4793df Fix #6688: reverser elements not correctly registered 
Issue caused by using tile_element_get_type() where track_element_get_type was intended.
 2017-11-17 23:44:05 +01:00
Michael Steenbeek 8027af56b6 Fix multi-dim coasters freezing and crashing 2017-11-17 23:23:45 +01:00
Michael Steenbeek bb483b0c5f Replace direct access to large scenery colour with helper functions 2017-11-17 22:54:54 +01:00
Enrico Paganin 8ffe7d5b43 Refactor maze flags 2017-11-17 17:03:57 +01:00
Enrico Paganin 27b420374e Refactor path flags 2017-11-17 17:03:57 +01:00
Enrico Paganin c2bf44ab1b Refactor scenery flags 
Every SCENERY_GHOST_FLAG_X is connected with its respective
SCENERY_TYPE_xxx flag
 2017-11-17 17:03:57 +01:00
Enrico Paganin 94bdfb0e43 Refactor marketing.h flag 2017-11-17 17:03:57 +01:00
Enrico Paganin 95e75c4575 Refactor colour.h flags 2017-11-17 17:03:57 +01:00
Michael Steenbeek e23c10863e Fix tile element type confusion 2017-11-17 14:20:49 +01:00
Michael Steenbeek 470c9993fa Fix calling wrong function 2017-11-17 13:10:58 +01:00
Michael Steenbeek 3bd68947b9 Create functions for getting large scenery type and sequence 2017-11-17 12:56:08 +01:00
Michael Steenbeek 9a4021996f Remove unnecessary comment 
[ci skip]
 2017-11-17 12:54:47 +01:00
Michael Steenbeek e12de39407 Fix include 2017-11-17 12:54:47 +01:00
Michael Steenbeek dd6257af1e Tackle the two residual usages of the colour property 2017-11-17 12:54:47 +01:00
Michael Steenbeek 3cf8da184d Create tile_element_get_ride_index() 2017-11-17 12:54:47 +01:00
Michael Steenbeek 60d5d5ca1e Cleanup 2017-11-17 12:54:47 +01:00
Michael Steenbeek f448d16707 Add methods for getting and setting track element type 2017-11-17 12:54:47 +01:00
Michael Steenbeek 953d6840f4 Fix some missed occurrences 2017-11-17 12:54:47 +01:00
Michael Steenbeek ab3f42f1f9 Add getters and setters for ride index and maze entry 2017-11-17 12:54:47 +01:00
Michael Steenbeek 74209c7282 Move track tile element functions to Track.cpp 2017-11-17 12:54:47 +01:00
Aaron van Geffen 13f99e495e Reduce console verbosity for TTF loading. 2017-11-17 10:31:26 +01:00
Michael Steenbeek a292917e50
Compile mapgen.c as C++ 2017-11-17 10:22:54 +01:00
TELK d6131ed062 Fix #6547: logging does not work if server contains CJK characters (#6565) 2017-11-16 23:02:37 +00:00
Mike Slone aca7048377 Fix #6293: Screenshot sound not played when the game is paused (#6429) 
Stop all sounds when pausing the game, but allow new sounds to play.
This allows interface sounds to function while paused, which fixes #6293.
 2017-11-16 23:02:16 +00:00
Ted John 271f15328b
Merge pull request #6329 from JeroenDStout/railway-crossings-fix-clip 
Fix railway/path clipping when on same height
 2017-11-16 23:00:40 +00:00
Michał Janiszewski 63e246938f Make sure PORTABLE option is honoured globally 2017-11-16 23:08:03 +01:00
Ted John f36cffc98a Fix running headless instances 
colours_init_maps was not blocked when running in headless mode.
 2017-11-16 21:53:34 +00:00
Ted John d649a3e8b4
Merge pull request #6631 from sajattack/develop 
replace flock with fcntl for better os compatibility
 2017-11-16 20:28:24 +00:00
Ted John f7c7a5bace Fix build 2017-11-16 19:11:10 +00:00
Ted John 6b5ad0cf73 Fix alignment in sprites.h 2017-11-16 19:06:19 +00:00
Jeroen D Stout deb37a8de8 Add missing 3-tile turn piece 2017-11-16 19:04:08 +00:00
Jeroen D Stout 0c1265aba3 Add sprites to sprite index 2017-11-16 19:04:08 +00:00
Jeroen D Stout f8b4ee2602 Add gravel / grooved track painting behaviour to miniature railway 2017-11-16 19:04:08 +00:00
Jeroen D Stout c6d548cc36 Increase bouding box z of peeps 2017-11-16 19:03:14 +00:00
Jeroen D Stout b207826e56 Increase bounding box z of litter 2017-11-16 19:03:14 +00:00
Jeroen D Stout afab2bd51f Change path bounding box when intersecting with track 2017-11-16 19:03:14 +00:00
Jeroen D Stout 3410330bb2 Add paint session memory for tracks and paths 2017-11-16 19:02:28 +00:00
Ted John b5137b0e37
Merge pull request #6574 from IntelOrca/protect-g1-access 
Refactor g1 access
 2017-11-16 18:51:32 +00:00
Michał Janiszewski 8ec5f3ae82 Move FORCE32 option to top-level CMakeLists.txt 2017-11-15 22:32:51 +01:00
Michał Janiszewski 8f3434d084 Add discord-rpc support to Linux 2017-11-15 22:32:51 +01:00
Christian F. Coors 58e8ef5de4 Fix build in clang 2017-11-14 21:01:11 +01:00
Michael Steenbeek 5409dedb7e Remove unused C transfer functions in Tables.cpp 2017-11-14 11:55:53 +01:00
Michael Steenbeek a663ab6cd2 Add extra NULL checks 2017-11-13 21:14:39 +01:00
Michael Steenbeek 2ebac91a2e Add method to look up source game 2017-11-13 21:14:39 +01:00
Michael Steenbeek 11f2d60041 Automatically add all path bits and signs to the designated group 2017-11-13 21:14:39 +01:00
Michael Steenbeek 8d7d53de29 Correct Steel twister capacity 2017-11-13 20:37:13 +01:00
Michael Steenbeek f073ec33fa Fix #6646: Max cars/train increase for RCT1 parity 2017-11-13 17:37:39 +01:00
Michael Steenbeek c95a9e4c9b Fix typo in 'separator' 2017-11-13 16:25:31 +01:00
Michael Steenbeek 9d686db86c Fix typo in 'tolerance' 2017-11-13 16:23:19 +01:00
Michael Steenbeek 5eed8cecd4 Fix typo in 'multiplier' 2017-11-13 16:22:36 +01:00
Cody Jung 3bb9d41908 Fix #6657: Reset tracking icon status when opening guest list 
The guest tracking icon is hidden on the guest list if it's in
PAGE_SUMMARISED mode. Closing then reopening the window reset it back to
INDIVIDUAL mode but did not restore the icon state.
 2017-11-13 10:36:16 +01:00
Michał Janiszewski 7f6471e896 Collapse identical branches 2017-11-13 10:31:48 +01:00
Michael Steenbeek 263b7537d7 Fix crash when removing scenery groups 2017-11-13 10:30:34 +01:00
Ted John 3fbdf117cd
Merge pull request #6651 from IntelOrca/discord-integration 
Close #6639: Integrate Discord Rich Presence
 2017-11-12 21:09:28 +00:00
Ted John 36ffb1d3cb Use initialiser instead of memset zero 2017-11-12 20:31:29 +00:00
kitsunenokenja 04f0048430 Add missing header include for std::ceil call (#6655) 
OpenGLDrawingEngine::ConfigureCanvas calls std::ceil which is defined by
the cmath include. Adding the include directive resolves a compilation
failure to due std::ceil being otherwise undefined.
 2017-11-12 14:02:30 +00:00
Ted John 4722f0fe94 Make DiscordService final 2017-11-11 23:56:24 +00:00
Ted John 324058a640 Delay presence refresh to 5s interval 2017-11-11 23:48:04 +00:00
Ted John 83e80d9658 Implement basic discord status report 2017-11-11 23:48:04 +00:00
Marijn van der Werf bd0bd9e038 Move top toolbar to UI module 2017-11-11 23:57:19 +01:00
Marijn van der Werf c247bbcb82 Move ride construction window to UI module 2017-11-11 23:57:19 +01:00
Ted John d3692dfb7a Add Date class 
To eventually replace passing around month ticks and date.c
 2017-11-10 19:32:32 +01:00
Michał Janiszewski 2775f5f3e5 Guard title sequence in headless mode 2017-11-08 23:27:51 +01:00
Robert Jordan 4c3065619e Fix #996, #2254, #2589, #2875: Viewport scrolling getting stuck or shaking 
Shaking while at the edge of the map has been completely eliminated. In
order to do this, comparison with tile height was also removed which
fixed a few outlier cases.

The main cause was viewport axis were only being set if it's respective
isometric axis was at the boundary, instead of either isometric axis.
Viewport no longer gets stuck which was related to the shaking in the
end. (#2875)

Refactored viewport_update_position. I moved
viewport_set_underground_flag above the bounds checking function since
it had no relation to it. (#996, #2589)

Scrolling on the map edge with arrow keys or mouse edge will now go the
same speed in both directions. (#2254)

Added changelog entry.
 2017-11-08 17:43:50 +01:00
duncanspumpkin 55aea7188b Fix #6617. Maze deletion no longer costs 0x800000 for certain mazes. 
When a maze does not have a completely hollowed out hedge the game command would return 0x8000000 as it tries to remove an element that has already been deleted. As game actions no longer use 0x80000000 to indicate a failure this would get interpreted as the refund price and cause the issue.

Fix was to introduce checks when adding up the refund price. This was done rather than changing the game action so that it can be properly fixed when get_refund_price is converted into a game action
 2017-11-08 16:03:41 +01:00
Michał Janiszewski 49dbdefe0f Format shared.c 2017-11-08 08:45:05 +01:00
Michał Janiszewski b69b0be610 Move strndup implementation to shared.c 2017-11-08 08:45:05 +01:00
Richard Jenkins d6bd26cd83 Fix #5836, #6301: Track list freezes after deletion in Track Manager 2017-11-08 07:51:59 +01:00
Michał Janiszewski cabed0cef5 Remove unused field 2017-11-08 06:53:17 +01:00
Robert Jordan 9ae4f7d1bc Fix #6500: Fail to load resources when no config 
A simple fix of setting the environment paths before the repositories
are loaded.

Added a changelog entry
 2017-11-07 21:03:58 +00:00
Paul bf87489da8
make changes suggested in review 2017-11-07 00:15:22 -08:00
Paul 9325fffd9c
Update posix.c 2017-11-06 20:19:43 -08:00
Paul f202f19897
Update posix.c 2017-11-06 19:49:02 -08:00
Paul 62383f7cb5
fix indentation 2017-11-06 14:58:06 -08:00
Paul 8093b6369b
replace flock with fnctl for better compatibility 2017-11-06 14:53:59 -08:00
Philip Goto 19abb62586 Add Smooth NN scaling to OpenGL renderer 2017-11-06 23:05:21 +01:00
Philip Goto 360cd813b7 include cmath in HardwareDisplayDrawingEngine 2017-11-06 23:05:21 +01:00
Philip Goto 4dfcb32d85 Fix spelling errors in neighbour 2017-11-06 23:05:21 +01:00
Philip Goto 36bece4cf1 Destroy _scaledScreenTexture on destroying hardware engine 2017-11-06 23:05:21 +01:00