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

4153 Commits

Author SHA1 Message Date
Michał Janiszewski 3d0fcc948d POSIX: use mincore to detect impending doom 
Call to mmap (or next malloc) will likely fail if there are already
mapped pages within the region we want to map ourselves. Using mincore
we can detect if such pages exist and warn user about what's going to
happen.
 2015-12-09 00:57:42 +01:00
Michał Janiszewski 8f82e5013a POSIX: MAP_ANONYMOUS should have fd = -1 2015-12-08 23:30:55 +01:00
IntelOrca 08fc36ee49 fix #2449: Turning off Day/Night Circle while it is night doesn't reset back to day 2015-12-08 20:50:30 +00:00
Ted John 176381b642 Merge pull request #2444 from jackinloadup/farris-wheel-backward-rotation 
fixes #2126 Ferris wheel backward rotation
 2015-12-07 17:54:45 +00:00
Lucas Riutzel 489d047c66 fix farris wheel breaking when set in backwards rotation 2015-12-07 10:40:53 -06:00
Duncan 2e9945a748 Merge pull request #2442 from LinusU/platform-osx-fixes 
small fixes for platform/osx.c
 2015-12-07 12:49:23 +00:00
Ted John 47e8c54b89 Merge pull request #2443 from LinusU/ride-track-fixes 
use larger integers in ride/track.c
 2015-12-07 08:13:04 +00:00
Linus Unnebäck 4bfbe27116 use larger integers in ride/track.c 2015-12-06 18:56:09 +01:00
Linus Unnebäck 16e5ace672 use RCT2_ADDRESS_TRACK_LIST 2015-12-06 18:49:35 +01:00
Linus Unnebäck fc849eb097 small fixes for platform/osx.c 2015-12-06 18:34:34 +01:00
Linus Unnebäck bd82b7a297 use RCT2_ADDRESS in track_manage.c 2015-12-06 18:22:33 +01:00
Ted John 1d3cefe73d Merge pull request #2427 from xperia64/develop 
Add symbolic link support
 2015-12-05 21:34:44 +00:00
Kevin a18089145b [Linux] Check for null pointer in locale specific functions 2015-12-05 22:25:25 +01:00
Ted John e77537b27f Merge pull request #2396 from janisozaur/osx-path 
Set path properly for OS X
 2015-12-05 14:21:41 +00:00
Ted John ebcde1b231 Merge pull request #2418 from janisozaur/fixes 
fix remaining suspicious left shifts
 2015-12-05 14:20:29 +00:00
Ted John 4ed7a3496e Merge pull request #2347 from Gymnasiast/default-measurement-system 
Change fallback measurement system to metric.
 2015-12-05 13:32:07 +00:00
Ted John 8e3bfb7a58 Merge pull request #2409 from Gymnasiast/track-designs-manager-close 
Add close button to track designs manager, closes #1807
 2015-12-05 13:31:31 +00:00
IntelOrca b1bb72c833 Merge branch 'master' into develop 
Conflicts:
	src/rct2.h
 2015-12-04 21:16:43 +00:00
IntelOrca 673796eb6c Merge branch 'pre-release-0.0.3.1' 2015-12-04 21:09:43 +00:00
Sam Parkinson b9ba20a399 Implement CTRL-Backspace shortcut for clearing inputs, fixes #2355 2015-12-05 06:56:39 +11:00
IntelOrca 9c19d689c2 fix #2434: Dropdown menus linger when toolbars are toggled 2015-12-04 19:02:24 +00:00
IntelOrca 737baf8b78 fix #2158: Video Freeze when window is maximised, minimised and then restored 2015-12-04 18:59:59 +00:00
duncanspumpkin 11398cf60f Fix warning. 2015-12-04 16:57:43 +00:00
xperia64 562d7fdb61 Add symbolic link support 2015-12-03 00:20:04 +00:00
duncanspumpkin 8eb313f852 Fix #2417 also fixed some surface pathfinding bugs. 
Guests were ignoring fences when surface pathfinding even when there was an available exit. Missing &= 3 was causing the assert to trigger.
 2015-12-02 18:59:00 +00:00
IntelOrca 9426170918 fix #2425: ride campaign list corrupted if over 40 rides 2015-12-02 17:50:32 +00:00
Michał Janiszewski 796021cfdc fix suspicious left shifts 
See b5b1957f5
 2015-12-02 08:32:15 +01:00
Michał Janiszewski d1b6d175c7 Make each platform set its own exe path 2015-12-01 21:38:35 +01:00
IntelOrca 60300dcece update version and branch 2015-12-01 18:30:04 +00:00
IntelOrca 8de299cc06 fix #2415: day / night cycle not working 2015-12-01 18:26:02 +00:00
Hielke Morsink 65a0dcbc8a Fixed #2407 - Prevent prompt from showing shortly after loading a second park. 2015-12-01 18:21:47 +00:00
Hielke Morsink 90e67772e0 Resolved warnings, and removed duplicated function. 2015-12-01 12:03:34 +01:00
Gymnasiast 3f6990dac9 Add close button to track designs manager, closes #1807 2015-11-30 22:53:28 +01:00
Duncan 396e6f8fee Merge pull request #2297 from osconnoisseur/decompile-map_set_land_height 
Decompilation of map_set_land_height
 2015-11-30 20:35:50 +00:00
duncanspumpkin 1a9b96340c Merge OpenRCT2/master into OpenRCT2/develop 2015-11-30 18:55:32 +00:00
duncanspumpkin 93e0bc5a24 Merge OpenRCT2/pre-release-0.0.3 into OpenRCT2/master 2015-11-30 18:53:57 +00:00
duncanspumpkin d91a9c965c Fix #2405. Foundations under shops now correctly drawn. 
Issue was caused by a mistake in implementation
 2015-11-30 18:00:33 +00:00
Kevin c0f7b0b1f3 [Linux] Fix platform_get_locale_currency with new ascii fallback 2015-11-30 13:33:50 +01:00
Kevin b4907ba70c [Linux] Implement platform_get_locale_currency. 
Fix Chinese language codes.
 2015-11-30 13:33:50 +01:00
Kevin 3ece04dc8d [Linux] Implement platform_get_locale_measurement_format and platform_get_locale_temperature_format 2015-11-30 13:33:50 +01:00
Kevin d43bc73e76 [Linux] Implement platform_get_locale_language. 2015-11-30 13:33:50 +01:00
Hielke Morsink 666da74beb Changed missleading variable name from 'filename' to 'path'. 2015-11-29 19:59:15 +01:00
Hielke Morsink 5b1d93805d More consistent use between name and paths. Improved path_get_* functions. 2015-11-29 19:41:06 +01:00
IntelOrca df1f5bad00 fix #604: mute toilet flush sfx on title screen 2015-11-29 17:19:16 +00:00
duncanspumpkin b9f7f6f4a2 Fix #2395. Fix pressing construct twice 2015-11-29 17:18:42 +00:00
Hielke Morsink 0909ba8ab4 fixed #2226: resetting screen age when quick saving 2015-11-29 17:18:41 +00:00
duncanspumpkin 4527aa263e Added check to match mechanic fix 2015-11-29 17:18:41 +00:00
duncanspumpkin cae7b03bdf Fix #1717. Fixes fix ride from failing to fix safety cut out. 
As the code to fix rides has not been completed yet it was unknown that safety cutout had so many flags requiring reseting
 2015-11-29 17:18:40 +00:00
duncanspumpkin b1c8275ec0 Disable tracks for networked games until fixed 2015-11-29 17:18:40 +00:00
duncanspumpkin 518b19156a Fix vehicle colours using scenario rand 2015-11-29 17:18:39 +00:00
duncanspumpkin a4cb2c55d1 Fix ride create on multiplayer using scenario_rand for colour causing desync 2015-11-29 17:18:39 +00:00
Hielke Morsink 02349d2463 Using platform_get_path_separator for getting the filename now 2015-11-29 17:01:41 +01:00
Hielke Morsink 415f55d38d Removed '.TD6' part from being added automatically when saving a new track 2015-11-29 16:45:02 +01:00
Hielke Morsink 5ca371c5c5 Displaying full track filename excluding the real extension 2015-11-29 16:36:46 +01:00
Hielke Morsink 63184052be minor optimizations and added comments to some util functions 2015-11-29 16:00:15 +01:00
Duncan 8274ea1842 Merge pull request #2389 from samdroid-apps/curl-system-certs 
[Linux] Use system ca certs bundle
 2015-11-29 14:42:50 +00:00
Michał Janiszewski b4b1624e08 Set path properly for OS X 2015-11-29 15:29:35 +01:00
Michał Janiszewski ed21aeb3fc Take care of strings in POSIX platform file 2015-11-29 12:19:13 +01:00
Michał Janiszewski 39cc16d137 Plug memory leaks, check memory accesses 2015-11-29 12:15:47 +01:00
Duncan ada46ccc80 Merge pull request #2386 from LinusU/osx-platform 
OS X platform
 2015-11-29 11:10:35 +00:00
IntelOrca cf1961b725 fix #2385: Parks created with scenario editor do not have correct initial temperature 2015-11-28 12:24:19 +00:00
IntelOrca 7909ba1f3b fix #2390: Not fully implemented UTF-8 currencies in building/landscaping/etc. 2015-11-28 12:10:17 +00:00
Linus Unnebäck 859684142a OS X platform implementation 2015-11-28 10:40:58 +01:00
Sam Parkinson 4eb55ac156 [Linux] Use system ca certs bundle 
Curl automatically has a certs bundle on GNU/Linux, so providing
our own is not needed.
 2015-11-28 10:56:23 +11:00
IntelOrca c6056cbb6c Merge branch 'pre-release-0.0.3' into develop 
Conflicts:
	src/audio/audio.c
 2015-11-27 22:05:40 +00:00
duncanspumpkin 843999997b Fix #2375. Issue caused by invalid z coordinate for invalidate. 
Also fixed a couple other functions which were calling with the incorrect z value
 2015-11-27 19:17:35 +00:00
IntelOrca 674ff839bb add icons to server list for password and version 2015-11-27 18:54:59 +00:00
duncanspumpkin 691aec5035 Fix #2381. Map animation invalidate now called during pause mode 
This was causing the number of map animations to skyrocket as there was no way to remove animations caused by ghosts. This shouldn't progress the animation only remove invalid animations.
 2015-11-27 18:40:37 +00:00
duncanspumpkin 119ca58cc7 Add check to prevent exceeding the maximum number of animations. Probable cause of #2381 2015-11-27 18:01:45 +00:00
Ted John c63eef9a21 Merge pull request #2378 from IntelOrca/support-unicode-currencies 
support unicode currencies with ascii fallback
 2015-11-27 17:56:44 +00:00
Linus Unnebäck 30b6718532 start of OS X support 2015-11-27 17:43:12 +01:00
IntelOrca 7ea0e2d6a3 improve language load fail behaviour 
improve currencies
fix bug in supported glyph check
 2015-11-26 18:28:52 +00:00
IntelOrca 46924bc9eb support unicode currencies with ascii fallback 2015-11-25 22:31:00 +00:00
duncanspumpkin 83d183954a Fix #2337. Fixed footpath placements with walls. 2015-11-24 20:10:03 +00:00
zsilencer 0c3c9d5400 Fix #2352. Do not open disconnected status window when password input canceled. 2015-11-23 13:07:18 -07:00
duncanspumpkin cba189c2de Fix #2326. Fixed research bugging out when going back to object selection 2015-11-23 18:25:43 +00:00
Harry Lam e528e32ec0 Revert "Update language.cpp (CHT font)" 2015-11-23 16:26:18 +08:00
e-foley b147fd3a90 make speed affect upward launch ratings only 2015-11-21 18:17:26 -08:00
IntelOrca c6308dcb41 stop ride window from opening when there is a vehicle crash on the title screen 2015-11-21 13:40:00 +00:00
IntelOrca 1ff2d68061 implement track paint shop 
implement track paint shop, part 2

implement track paint shop, part 3

implement track paint shop, part 4
 2015-11-20 22:53:53 +00:00
IntelOrca 5a9a372100 change branch name - this should have been done when branch was created :/ 2015-11-20 21:40:37 +00:00
duncanspumpkin 5bd3b8d6af Implement util_rand due to rand having a poor range on some platforms 2015-11-20 21:40:36 +00:00
IntelOrca 5ef10f5050 fix memory leaks in JSON object creation for multiplayer 2015-11-20 18:48:40 +00:00
duncanspumpkin bd262d9c59 Fix #2308. ShopItem was accidentally passed into new_thought instead of thought_type 2015-11-20 17:12:26 +00:00
Gymnasiast d9fae6735b Change fallback measurement system to metric. 2015-11-19 19:53:20 +01:00
IntelOrca 67b6aa7513 fix #2330: Clear button in Object Selector doesn't refresh item list 2015-11-18 23:19:25 +00:00
duncanspumpkin e05475cb38 Fix #2342. Accidentally disabled pause mode building for large scenery 2015-11-18 22:32:23 +00:00
Michał Janiszewski c4ad2346e3 Fixes for building optimized binary on Linux 
Use `-DCMAKE_BUILD_TYPE=X`, where X:
- `RELEASE`
- `RELWITHDEBINFO`
- `MINSIZEREL`

Only works for GCC, clang binaries crash for now.
 2015-11-18 21:29:08 +01:00
duncanspumpkin 6c8c5a157f Fix #2335. Increase land window size to show price correctly. 2015-11-18 17:48:14 +00:00
Duncan e36ed5e732 Merge pull request #2325 from BodrickLight/refactor 
Refactor audio.c and audio.h
 2015-11-18 17:33:21 +00:00
Dom Light 55fb03fa75 Replace a call to audio_play_sound_panned 2015-11-18 14:01:29 +00:00
Harry Lam 0081fb8435 Update language.cpp (CHT font) 
Microsoft removed "MingLiu.ttc" in Windows 10 1511 for no reason. The alternative, "MingLiub.ttc" (which support more characters and existed since Vista (https://www.microsoft.com/typography/fonts/font.aspx?FMID=1772)) is kept instead.
 2015-11-18 13:54:22 +08:00
Dom Light 92a30e0a32 Add missing return documentation 
[skip ci]
 2015-11-18 00:20:22 +00:00
Dom Light a07333aeaf Move memory address documentation to header file 2015-11-18 00:11:31 +00:00
Dom Light bb62b7561a Replace some uses of play_sound_panned with play_sound_at_location 2015-11-18 00:03:15 +00:00
Dom Light e9b7e41635 Refactor audio_sound_play_planned 2015-11-17 23:05:24 +00:00
duncanspumpkin f1ffba8f21 Merge branch 'pre-release-0.0.3' into develop 2015-11-17 22:39:31 +00:00
Dom Light bbc58830f3 Allow lines to be 128 characters 2015-11-17 20:07:39 +00:00
Ted John aade14ba03 Merge pull request #2322 from Broxzier/search_types 
Searching through rides now also checks their type.
 2015-11-17 20:01:38 +00:00
Dom Light 72b6a1e74b Add parens and use coordinate_3d_to_2d in audio.c 2015-11-17 20:01:30 +00:00
Duncan cdb9ccc558 Merge pull request #2323 from Smeat/file_pattern 
Use fnmatch to match file patterns.
 2015-11-17 19:07:36 +00:00
duncanspumpkin 6d3eaafe2f Fix #2327. Fix no entry signs. 
Issue was caused by mistakenly not stopping searching for tiles after finding the correct one. Mistake made during refactoring
 2015-11-17 19:04:43 +00:00
Hielke Morsink 68b0068a22 Resolved warnings 2015-11-17 19:40:48 +01:00
Hielke Morsink 504f551eec Avoiding the use of strlen 2015-11-17 19:40:47 +01:00
Hielke Morsink 063a568a72 Searching through rides now also checks their type. 2015-11-17 19:40:44 +01:00
Ted John 50edff6158 Merge pull request #2314 from Gymnasiast/obsolete-tooltip 
Remote obsolete date tooltip
 2015-11-17 18:21:29 +00:00
Kevin c1fe547901 Add FNM_PATHNAME flag for fnmatch 2015-11-17 12:25:45 +01:00
Dom Light b9d48d2f9b Document audio.h 2015-11-17 01:05:22 +00:00
Dom Light b736de003e Sanitize audio.c 2015-11-17 01:05:21 +00:00
Dom Light 3a8b25a0ee Sanitize audio.h 2015-11-17 01:05:14 +00:00
Kevin 5cd0ab7fad Use fnmatch to match file patterns. 
strstr doesn't support wildcards, so patterns like '*.TD?' will fail.
This adds the possibility for more complex patterns.
 2015-11-17 00:27:29 +01:00
Alexander Overvoorde 0f065cf4a9 Add string ids for scenario name window 2015-11-16 20:30:38 +00:00
Alexander Overvoorde b83e570230 Fix length of max scenario name in scenario editor 2015-11-16 20:30:26 +00:00
duncanspumpkin c1ed727067 Fix #2305. Fences now build correctly with shift. 
Issue was caused by failing to reinitialise a variable and reusing a variable name for two different purposes. It has been fixed by nameing the variable and also initialising it.
 2015-11-16 20:19:58 +00:00
Duncan 62863db42a Merge pull request #2318 from Overv/fix_2316 
Fix length of max scenario name in scenario editor (fixes #2316)
 2015-11-16 19:07:23 +00:00
U-ASUS-EEEPC\Cameron Hall da79f706f3 Hoist gCheatsDisableSupportLimits check outside of loop 2015-11-16 12:09:11 -06:00
zsilencer 292b67874f Fix #2311. Water no longer is able to be raised above existing map elements. 2015-11-16 10:38:20 -07:00
Alexander Overvoorde 994dd1f945 Add string ids for scenario name window 2015-11-16 17:56:51 +01:00
Alexander Overvoorde 3ba35745c8 Fix length of max scenario name in scenario editor 2015-11-16 17:50:52 +01:00
Ted John b31e2d02bc Merge pull request #2317 from telk5093/patch-3 
Korean font change
 2015-11-16 16:33:48 +00:00
TELK 5d1c1b4445 Update language.cpp 2015-11-17 01:21:41 +09:00
Duncan 637e454fef Merge pull request #2290 from janisozaur/network-clean-close 
Skip closing network if already closed
 2015-11-16 15:58:00 +00:00
TELK 3889f5daad Korean font change 
change korean font from malgun to gulim.
I tested it is displayed correctly in korean os. See http://file.telk.kr/rct/img/gulim.png
 2015-11-17 00:56:22 +09:00
janisozaur d3329b74a5 Comment expected cmdline_call_action results 2015-11-16 13:59:01 +01:00
Gymnasiast 2afed6a4de Remote obsolete date tooltip 2015-11-16 11:04:00 +01:00
Cameron 9f255e5045 Use fcntl.h instead of sys/fcntl.h 2015-11-15 15:58:22 -06:00
Cameron 763a5f2938 Restore newline at end of file 2015-11-15 15:50:36 -06:00
Cameron 1fc7793c2a Clean up and match coding style 2015-11-15 15:48:27 -06:00
duncanspumpkin 54d7b54cb3 Merge branch 'pre-release-0.0.3' into develop 2015-11-15 21:23:01 +00:00
duncanspumpkin 82498c4a57 Fix #1922. Corrected invalid viewport code. 
ACTIVE_VIEWPORT_PTR_ARRAY should be iterated along checking for a NULL pointer. To indicate the list end. Removed NEW_VIEWPORT macro as its description was incorrect.
 2015-11-15 21:05:30 +00:00
U-HP-Pavilion-PC\Cameron e5ad14e3f5 Finished decompiling 2015-11-15 12:20:01 -06:00
duncanspumpkin eaa2d10ec4 Fix #2070. Incorrect highest drop penalty height caused incorrect calculations 2015-11-15 18:11:49 +00:00
U-HP-Pavilion-PC\Cameron cfdc0cf057 More refactoring 2015-11-15 11:01:34 -06:00
Michał Janiszewski 7ba9ea2574 Make OpenRCT2 use iconv on Linux 
This makes possible to run the game with non-english locales on Linux

Fixes #2300, fixes #2268, fixes #2267
 2015-11-15 17:12:32 +01:00
duncanspumpkin b7d402cfbe Implement right click scrolling for scroll widgets. 
Think this had just been missed. Its heavily modified from the original to match closer to what the rest of the code base does. Fixes #2052.
 2015-11-15 13:55:09 +00:00
Gymnasiast 8953357f85 Add Czech and fix some typos 2015-11-15 12:30:13 +01:00
duncanspumpkin 485705f1cb Fix incorrect parameter type 2015-11-15 10:05:22 +00:00
duncanspumpkin faf5d9a043 Fix #2301 
Lanaguages were not falling back if there was a translated string further on in the langauge pack. This issue was caused by operating on an invalid string that was masked by a cast from a nullpointer to a size_t. The code now will not set the string if there is a nullptr
 2015-11-15 09:55:01 +00:00
duncanspumpkin cd07fd5d4e Fix #1565. Construction window now checks to see if it has control of tool before canceling it 2015-11-15 09:12:19 +00:00
duncanspumpkin 97fc78a506 Fix safe_strncpy being unsafe 2015-11-15 08:45:50 +00:00
U-HP-Pavilion-PC\Cameron 0a824d0957 saving my work 2015-11-14 22:45:13 -06:00
duncanspumpkin 8d2641a2a1 Fix mistake in last commit 2015-11-14 16:45:42 +00:00
duncanspumpkin 13e43b779b Refactor large scenery placement 2015-11-14 16:44:03 +00:00
Michał Janiszewski e885056229 Fix exit code handling, sprite generation 
Make sprite generation not start UI
 2015-11-14 17:43:03 +01:00
Michał Janiszewski e7b58b7375 Skip closing network if already closed 
Fixes #2203
 2015-11-14 17:12:38 +01:00
duncanspumpkin 331d75e5f7 Fix signs. Broken by #2172 2015-11-14 12:40:40 +00:00
duncanspumpkin bdd29107e6 Refactoring 2015-11-14 11:56:13 +00:00
U-HP-Pavilion-PC\Cameron f9b1a9eeb4 Refactor some more and fix #2264 2015-11-13 19:50:20 -06:00
duncanspumpkin 954d6348b2 Fix change in function name 2015-11-14 00:12:19 +00:00
duncanspumpkin d0332c81d8 Refactor and move wide flag code. 2015-11-14 00:08:31 +00:00
duncanspumpkin 45c4dfe12d Merge branch 'develop' into pre-release-0.0.3 2015-11-13 23:30:13 +00:00
Duncan bc9a28d7ae Merge pull request #2261 from osconnoisseur/fix_2233 
Add buttons for Up and New File in the load/save dialog and fix #2233
 2015-11-13 22:50:46 +00:00
U-ASUS-EEEPC\Cameron Hall 2cd40b025a Fixed one of my bugs and did some refactoring. Still more refactoring to do... 2015-11-13 13:48:21 -06:00
Duncan 65a3dd710a Merge pull request #2299 from janisozaur/g2 
Zero the buffer for g2.dat
 2015-11-13 18:40:00 +00:00
Duncan 86fdd6d1f6 Merge pull request #2280 from janisozaur/highdpi 
Highdpi
 2015-11-13 18:39:24 +00:00
duncanspumpkin aa55ca6b62 Refactor banner_remove. Fixed an original bug. 
Banners that are placed on two different heights that face the same direction will end up bugging out. This has now been fixed. This required modification of the top toolbar code in order to correctly set the z variable.
 2015-11-13 18:30:14 +00:00
Duncan 8a3b4a9bb7 Merge pull request #2295 from osconnoisseur/platform_enumerate_directories_begin 
Fixed off-by-one errors in string conversion
 2015-11-13 18:17:33 +00:00
Michał Janiszewski 60f7d29c2e Zero the buffer for g2.dat 
Some leftover data caused the g2.dat generated on different platforms to
have mismatching cheksums. Zeroing the buffer makes them
checksum-identical.
 2015-11-13 14:43:08 +01:00
U-HP-Pavilion-PC\Cameron 0757b09781 refactor 2015-11-12 22:47:36 -06:00
U-ASUS-EEEPC\Cameron Hall 9cf2783785 Initial work. Decompiled up to 0x663BE4 2015-11-12 17:02:04 -06:00
Cameron fe4d98bc83 Fixed off-by-one errors in string conversion 2015-11-12 13:36:16 -06:00
duncanspumpkin a0014eee09 Refactor set scenery and fence. 2015-11-12 19:22:08 +00:00
Michał Janiszewski 6723f51087 Keep track of address returned by malloc to free it correctly 
When doing g2 generation on Linux, src variable was not modified in the
same way as on Windows, which caused free() on a pointer that was not
malloc()ed.

This fixes #2219.
 2015-11-12 14:11:22 +01:00
Michał Janiszewski b5b1957f58 Fix some left-shifts 
An explicit `1` is considered signed by compiler, if `int` is 32 bit
long, a left shift `1 << 31` is undefined. Since the type of result is
the type of left shift operand, make sure we shift unsigned int so that
the behaviour is defined correctly.

Also one fix in peep code, where it would use too big value for
`item_extra_flags`.
 2015-11-12 13:38:10 +01:00
Michał Janiszewski 075b98e209 Minor cleanups 
Mostly just setting variables to better define game state, with one
minor update of decompilation where an `or` instruction was used in
place of `mov` (in `sub_6CBCE2`).
 2015-11-12 12:19:40 +01:00
osconnoisseur b5c04a79e5 Added buttons for "up" and "new file" and fixed #2233 2015-11-11 21:51:21 -06:00
Michał Janiszewski 80510c91bd Add ui option to change scale in run-time 
Doesn't let user go lower than 0.5f
 2015-11-12 01:18:42 +01:00
Michał Janiszewski 516cddcf97 Explicitly cast scaled values to avoid warnings 2015-11-12 01:17:32 +01:00
Michał Janiszewski 6e63519bce Make `scale` a float 
There's no problem in `scale` being a floating point value, however,
since it's only NN scaling so far, it looks best for integer values
 2015-11-12 01:16:21 +01:00
Michał Janiszewski 681723869f Enable display scaling, useful on highdpi screens 
This allows for NN-scaling of display, a much needed feature on highdpi
screens.

Scale can be set to positive integer value which will become a zoom
factor for whole rendered output.
 2015-11-12 01:16:21 +01:00
IntelOrca ed8e7c2d38 add extra server details on gameinfo packet 2015-11-11 22:39:04 +00:00
IntelOrca 7f541240e2 fix #2279, make game remember save path rather than filename 2015-11-11 21:37:26 +00:00
duncanspumpkin e857f2d3c8 Refactor set_banner and set_large_scenery 2015-11-11 20:24:59 +00:00
duncanspumpkin 6a00482d1f Fix #1834 & #2288. Non complete circuit tracks now save correctly. 
Issue was caused by a bit of code not iterating correctly backwards.
 2015-11-11 19:44:53 +00:00
duncanspumpkin 47ca2c4c59 Merge branch 'fix_2284' of https://github.com/Overv/OpenRCT2 into pre-release-0.0.3 2015-11-11 19:21:26 +00:00
Alexander Overvoorde 74cc03ac06 Fix title sequence script interpreter treating parameters as commands (fixes #2284) 2015-11-11 15:17:43 +01:00
Michał Janiszewski 2b02a04114 Use C++'s std::abs instead of C's to get floats 
C's abs() will only work on int values, only std::abs will get floats.
 2015-11-11 08:16:36 +01:00
duncanspumpkin 77699e99e5 Final fix of #2151. 
Large Scenery, land, water now also force a retry of track placement. Small scenery, walls do not block tracks so do not require this.
 2015-11-10 21:34:09 +00:00
IntelOrca 54ff0b2045 ride_with_colour_config_exists should ignore itself 2015-11-10 21:28:10 +00:00
IntelOrca c9de9aeee0 fix #2051, stop queue paths connecting to three different directions 2015-11-10 21:23:16 +00:00
duncanspumpkin 026dba0348 Fix issue with last commit. 
If large scenery was outside of selection area it would not have its flag reset. Now it will clear the flag for all large tiles. This could do with improving at some point in the future
 2015-11-10 19:38:48 +00:00
duncanspumpkin e6c08fcdf4 Fix #1539. This is an alternative to @warp-10 's technique. 
Sets a flag when using the clear large scenery to prevent profit when destroying large scenery.
 2015-11-10 19:04:36 +00:00
duncanspumpkin 1f08f092dd Fix #2273 
This was also allowing bins to be paid for placing in a 4 connected tile
 2015-11-10 17:23:38 +00:00
Michał Janiszewski 1bd665563b Improve memory setup for Linux 
DATASEG was mapped, but did not have its contents filled properly. It is
now done as the process expects it.

Extend memory checksum region to catch possible corruptions early.

Fixes #2063
 2015-11-09 22:11:46 +01:00
duncanspumpkin efb30a8121 Fix #2037. Issue caused by reseting the zoom difference before too early. 2015-11-09 18:48:03 +00:00
IntelOrca 501d36b16c format top spin seat position offset array 2015-11-09 18:39:22 +00:00
duncanspumpkin 2ee1e05408 Implemented seatpositionoffset. 2015-11-09 17:39:49 +00:00
Duncan bcc7e2f5a1 Merge pull request #2147 from Overv/develop 
Fix confusing errors appearing when building a flat ride partially outside the park #2129
 2015-11-09 12:39:41 +00:00
IntelOrca 09cd007f3f add dedicated flag to gameInfo 2015-11-08 23:50:38 +00:00
IntelOrca da6d382c47 make server heartbeat PUT 2015-11-08 23:29:52 +00:00
Alexander Overvoorde 3f00ec42f1 Replace trackPlaceZ RCT2_GLOBALs with define for clarity 2015-11-08 23:44:41 +01:00
IntelOrca 2e55495470 improve master server to POST json 2015-11-08 22:03:35 +00:00
Alexander Overvoorde 6114aa5dac Rename hmm variable to something more descriptive 2015-11-08 22:30:51 +01:00
Alexander Overvoorde b20a844982 Fix "land not owned" errors being overridden by "can't construct here" 
I'm not entirely sure what the "hmm" check is about, but it caused
track_place() to return early when called from
window_ride_construction_construct(), so I moved up the owned land check
to give it a higher priority.
 2015-11-08 21:47:18 +01:00
Alexander Overvoorde d1a6b65049 Fix supports error appearing when building outside of owned land 
This was caused by ride_construction_toolupdate_construct() pointlessly
trying to fix the "building outside owned land" error by increasing the Z.
 2015-11-08 21:47:17 +01:00
Ted John c70880c0a5 Merge pull request #2251 from Broxzier/fix_filename 
Fixed filenames being cut off when there's a dot in them
 2015-11-08 19:04:45 +00:00
Ted John a24844a6ee Merge pull request #2247 from Gymnasiast/ride-entry-flag-15-and-17 
Identify RIDE_ENTRY_FLAG_15 and 17, fix 'Show all operating modes' cheat
 2015-11-08 18:57:03 +00:00
IntelOrca 48e3d70e57 refactor colour maps 2015-11-08 18:55:32 +00:00
IntelOrca 442cfef887 fix #2230, scroll bar colour issues 2015-11-08 17:31:46 +00:00
Hielke Morsink b929a27595 Fixed filenames with dots not being displayed completely. 2015-11-08 18:21:55 +01:00
IntelOrca 141705fe6b disable peep watching thought for multiplayer as its client specific 2015-11-08 15:15:10 +00:00
IntelOrca 12a6ec2fef stop desynchronisation when placing scenery, fixes #2111 2015-11-08 15:01:30 +00:00
IntelOrca 6fe2340dfe stop clients from pausing multiplayer games 2015-11-08 14:32:22 +00:00
Gymnasiast 4ba83b0418 Rename RIDE_ENTRY_HIDE_LAST_OPERATING_MODE to RIDE_ENTRY_DISABLE_LAST_OPERATING_MODE 2015-11-08 15:01:40 +01:00
Gymnasiast e749c1a82c Identify RIDE_ENTRY_FLAG_15 and 17, fix 'Show all operating modes' cheat 2015-11-08 14:55:01 +01:00
IntelOrca e1b67eeda0 improve command line version information and add headless check 2015-11-08 12:49:19 +00:00
Ted John 7d51eb55e1 Merge pull request #2243 from Gymnasiast/rossija 
Add support for Russian
 2015-11-08 11:59:41 +00:00
Ted John 91edd322ae Merge pull request #2242 from Gymnasiast/more-currencies 
Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232
 2015-11-08 11:58:41 +00:00
Ted John 6e6637922a Merge pull request #2240 from Gymnasiast/fix-2125 
Only play message sound in normal playing mode, fixes #2125
 2015-11-08 11:57:20 +00:00
Gymnasiast 6413052cbb Use language codes for Korean and Russian 2015-11-08 12:49:25 +01:00
Gymnasiast eed070bde0 Use string IDs for all currencies 2015-11-08 12:41:55 +01:00
Gymnasiast b7a09cca0c Adjust Arial placement and sizes 2015-11-08 12:26:49 +01:00
Gymnasiast ea5282f508 Add support for Russian 2015-11-08 11:52:47 +01:00
Gymnasiast 4e5b8a1a19 Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232 2015-11-08 11:46:11 +01:00
Gymnasiast 7a510f76e2 Only play message sound in normal playing mode, fixes #2125 2015-11-08 11:07:35 +01:00
duncanspumpkin 251ee91bf6 Fix #2235 anti clockwise no longer crashes 
Issue cause by %4 not handling negative numbers.
 2015-11-08 09:22:29 +00:00
IntelOrca d2aa736492 fix master server communication 2015-11-08 04:02:23 +00:00
IntelOrca 0b9882b96f fix master server poll times 2015-11-08 02:22:49 +00:00
IntelOrca 782d3e63b2 add new master server functionality 2015-11-08 02:12:12 +00:00
IntelOrca 9bad4183a7 add default master server url and refactor 2015-11-07 23:56:16 +00:00
IntelOrca 74fe482a62 improve game info json 2015-11-07 23:47:50 +00:00
zsilencer 1e9381ef97 master server list 2015-11-07 22:27:51 +00:00
zsilencer 9acfd27735 password prompt for client 2015-11-07 22:26:46 +00:00
zsilencer 3b639ced47 allow host to specify password #2072 2015-11-07 22:25:47 +00:00
zsilencer d66eb70f56 fix potential overflow 2015-11-07 22:23:41 +00:00
IntelOrca c7a85c5114 add desync debug checks for scenario_rand 2015-11-07 17:56:19 +00:00
Flukiestemperor 8d3655e0f6 fix #2162 2015-11-07 12:22:44 +00:00
duncanspumpkin 983436d425 Implemented a insert corrupt element button on the tile inspector 2015-11-07 10:04:57 +00:00
duncanspumpkin 6493c83efc Fix regression in last commit 2015-11-06 19:13:29 +00:00
IntelOrca 31ab7c8b98 fix several warnings 2015-11-06 18:50:37 +00:00
IntelOrca daf95940ac add warning message for two unstable cheats 2015-11-06 18:46:18 +00:00
Ted John 7366c87e2c Merge pull request #2196 from IntelOrca/custom-user-data-path 
Allow user data path to be specified by command line
 2015-11-06 18:35:38 +00:00
duncanspumpkin 13e2f8e9ed Fix #2210. Reverts from a0909a2 that cause the up button to load the same directory 2015-11-06 18:02:27 +00:00
Duncan db356290ba Merge pull request #2204 from janisozaur/language-check 
Early out and report error if langauge files are missing
 2015-11-05 22:02:25 +00:00
Michał Janiszewski 2d62c356c3 Early out and report error if langauge files are missing 
This is a common problem if you don't set up your paths properly on
Linux, so be nice and try to provide helpful message why we failed to
load instead of crashing on user a moment later.
 2015-11-05 22:41:20 +01:00
IntelOrca 70ef8d6777 add unicode support for windows command line arguments and resolve relative paths to absolute 2015-11-05 21:36:24 +00:00
duncanspumpkin 6684804e28 Fix small regression that caused a black screen when switching between hardware rendering 2015-11-05 21:22:08 +00:00
duncanspumpkin 599c259603 Fix #1749. Rainbow road graphical glitch. 
Issue was caused by the image using an invalid colour entry. This initilises the memory that is expected to return white. Platform update palette also had to be modified to allow this fix to work.
 2015-11-05 19:42:23 +00:00
duncanspumpkin ce06ee8681 Fix #1523. Water tool selection now the correct colour. 2015-11-05 18:02:21 +00:00
Jonathan Haas 3be79fd738 Fix screen location on resize/alt+tab 2015-11-05 10:16:13 +01:00
Duncan 36b8c1ce98 Merge pull request #2193 from duncanspumpkin/fix_2082 
Fixed #2082. Sub_6D31A6 now working.
 2015-11-04 19:43:58 +00:00
Duncan 0f14d33cc6 Merge pull request #2184 from duncanspumpkin/fix_2151 
fix #2151.
 2015-11-04 19:42:34 +00:00
duncanspumpkin 96a1f0c6f7 Refactor. 
Labelled the known flags and used functions for setting and clearing them.
 2015-11-04 19:28:45 +00:00
Ted John e2ce5ee49e Merge pull request #2202 from HaasJona/fixrotation 
Fix Bug #2201
 2015-11-04 12:06:01 +00:00
Jonathan Haas 96d71ac174 Fix Bug #2201 2015-11-04 12:51:00 +01:00
Aaron van Geffen 36f5d089df Add OS X as a platform. 2015-11-04 18:57:13 +09:00
Ted John d0836ef63b Merge pull request #2188 from kmdreko/decompile_683359 
decompiled sub_683359
 2015-11-04 00:19:35 +00:00
kmdreko 2db198e7c4 Remove unneeded call 2015-11-03 18:14:22 -06:00
kmdreko d951bebf88 move range checks 2015-11-03 18:13:49 -06:00
kmdreko a35472befe properly format function comment 2015-11-03 18:13:11 -06:00
IntelOrca 0b7544dbce fix error in linux.c and double .config/.config 2015-11-03 23:18:10 +00:00
IntelOrca 800e80aeb3 fix demolish track piece as client on multiplayer 2015-11-03 22:58:30 +00:00
IntelOrca e177be305b allow user data path to be specified by command line, closes #2182 
Also changed default path under linux to be ~/.config/OpenRCT2.
 2015-11-03 22:20:35 +00:00
Flukiestemperor c8701ef01e partially fix #2181 
create common function
 2015-11-03 16:11:11 -06:00
duncanspumpkin 5b54ad18e9 Fixed #2082. Sub_6D31A6 now working. 
Small mistake in track previous meant the x/y coordinates didn't match the map element. There were also a few other issues that presented themselves once that was fixed.
 2015-11-03 20:03:21 +00:00
IntelOrca 025f36ec28 fix #2187 
Title sequence now maintains central position from script if window size changes.
 2015-11-03 19:20:32 +00:00
duncanspumpkin d5688cdc4e Fix #2189. Map owned area not shown correctly. 
Issue was caused by doubling up a bit of code and combining it with the next line when implementing it.
 2015-11-03 18:19:23 +00:00
duncanspumpkin 9bf40ffd83 Fix #1504. Correct curvature for previous lift hill piece. 
Note this is an original bug that is fixed in the GOG version.
 2015-11-03 15:20:25 +00:00
duncanspumpkin bbe2a34714 Fix #2151. 
I think this fixes the issue but its hard to understand from the original
issue.
 2015-11-03 14:39:33 +00:00
Ted John dc3542e349 Merge pull request #2119 from e-foley/fix-heartline-twister-airtime-ratings 
fix heartline twister airtime ratings
 2015-11-03 08:15:09 +00:00
kmdreko 1293325699 decompiled sub_683359 2015-11-02 23:30:48 -06:00
e-foley 5f799ac6c4 contain rating mods in pp directives 2015-11-02 20:23:22 -08:00
Michał Janiszewski a911ff09d0 Some more checks, make sure gVehicleHierarchies are counted properly 2015-11-02 22:58:15 +01:00
Michał Janiszewski c0e2a5c7be Add get_current_rotation function and DEBUG_LEVEL macros 2015-11-02 22:58:15 +01:00
Michał Janiszewski be32b5e5f4 Init all fields in audio classes 2015-11-02 22:58:15 +01:00
Ted John 51cdf5bc34 Merge pull request #1714 from janisozaur/news_item_fix 
Play sound when message first appears, not later
 2015-11-02 21:35:38 +00:00
IntelOrca a0909a242d fix several safe_strncpy calls 2015-11-02 21:23:01 +00:00
IntelOrca 2c58e1d894 use internal load window for convert saved game to scenario, closes #2121 2015-11-02 21:10:07 +00:00
IntelOrca 45bfdad4e3 fix #1144 2015-11-02 20:43:55 +00:00
duncanspumpkin 4c72710e02 Fix issue introduced in last commit 2015-11-02 20:08:55 +00:00
duncanspumpkin ddd6b63d09 Fix #2173. Entrance fee too high can no longer be a news item if no money is on. 
This is kind of an original bug because the game doesn't check normally to see if money is on during this. I didn't want to reset the entrance fee as then it would be annoying switching between the two states. The peeps don't pay if no money is on so nothing is lost.
 2015-11-02 20:03:06 +00:00
duncanspumpkin eaffec651c Fix #2178. Failure to load a scenario no longer causes intro to be playable. 2015-11-02 19:45:18 +00:00
Ted John 5914558575 Merge pull request #2180 from janisozaur/safe_strncpy 
Fixes to safe_strncpy
 2015-11-01 22:52:17 +00:00
Michał Janiszewski 0f9bc229b4 Fixes to safe_strncpy 
* don't touch memory at all if size passed is 0
* use original address instead of now-changed `destination`
* fix one of the calls having improper size passed
 2015-11-01 23:33:02 +01:00
IntelOrca 61b7c77be3 add colour enum 2015-11-01 22:21:46 +00:00
duncanspumpkin d21e5a3b8c Fix #2136. Issue caused by missing branch. 2015-11-01 21:03:50 +00:00
duncanspumpkin f1cdc99afc Fix #2079. Scroll windows no longer have incorrect tooltips 
There was an issue with forgetting to reset the x/y variable introduced when I fixed a different bug. Possibly fixes #2136
 2015-11-01 20:55:54 +00:00
duncanspumpkin 428613a804 Fix #2122. Mechanics default to blue and guards yellow. 2015-11-01 20:04:24 +00:00
Michał Janiszewski 9a981ef68f Fix variable not being shifted 
When decompiled, at 0x6AA8ED, there's `shr edi,0x4`, which is not
reflected in sources.

The `type` without that shift could easily become a value large enough
to point to memory beyond object entries and modify those values. In my
case, it was modifying `RCT2_ADDRESS_OBJECT_LIST_NO_ITEMS` from 2122 to
2123 (by setting lowest bit), which luckily, is used later in
`setup_in_use_selection_flags`. For this reason, I believe it could be a
major source of other problems, possibly also recent `MAP_ANIMATION`
ones, although I haven't checked.

I also put an assert in place to validate type against max available
count.
 2015-11-01 18:53:47 +01:00
Ted John caa5f870c5 Merge pull request #2175 from zsilencer/network 
Network
 2015-11-01 11:24:04 +00:00
Jonathan Haas d2ec665ae4 Fix Bug #2138 2015-11-01 09:59:13 +01:00
zsilencer 34dff6f46b address #2073, graceful KickPlayer with message, disconnect reason messages, chat player name and text different color 2015-11-01 01:50:44 -06:00
zsilencer d18adc80de fix small error 2015-10-31 17:43:36 -06:00
zsilencer a95357a32d signs and banners editable in multiplayer 2015-10-31 11:07:36 -06:00
zsilencer 6c5acdde6a fix #2161 2015-10-30 19:41:49 -06:00
duncanspumpkin 9a76c59ec9 Fix entrance drawing issue. Fixes #2164. 2015-10-30 23:33:02 +00:00
Michał Janiszewski 45b3d8362d Provide strndup implementation for platforms missing it 2015-10-30 19:14:05 +01:00
Michał Janiszewski 9284930d7e Add safe_strncpy function 
safe_strncpy is similar to strncpy, but makes sure buffer is
null-terminated. Update most of project to use this updated function to
prevent illegal memory accesses.
 2015-10-30 16:01:00 +01:00
Flukiestemperor a819a6f177 Fix crash when map element is null in a save 2015-10-30 06:47:05 -05:00
Michał Janiszewski 1d772b01d0 Plug memory leak and validate getsockopt result 2015-10-29 21:41:49 +01:00
Michał Janiszewski 00a347159c Type fixes, remove unused variable 2015-10-29 21:25:26 +01:00
Ted John ad5869a8a0 Merge pull request #2150 from janisozaur/develop 
Fixes
 2015-10-29 19:38:06 +00:00
Michał Janiszewski 7fcc801d01 Cleanup allocated segments on disposal 2015-10-29 20:26:47 +01:00
Michał Janiszewski 31f412d0e4 Fixes: scope & types, control flow, cmake, platform support 2015-10-29 20:26:47 +01:00
Ted John f1931c2cc4 Merge pull request #2155 from kmdreko/decompile_637ff3 
Decompiled sub_6E7FF3
 2015-10-29 18:31:19 +00:00
Alexander Overvoorde 56645a6941 Revert address constant replacement in ride.h 2015-10-29 09:44:46 +01:00
Alexander Overvoorde 111ddeb445 Replace old RCT2_ADDRESS_RIDE_ENTRIES accesses by GET_RIDE_ENTRY() 2015-10-29 09:44:46 +01:00
Alexander Overvoorde 060d41f5a0 Replace raw addresses in RCT2_ADDRESS() with identifiers 2015-10-29 09:44:46 +01:00
Alexander Overvoorde 01793e11b7 Replace RCT2_GLOBAL magic numbers with address identifiers and string ids 2015-10-29 09:44:46 +01:00
kmdreko 115c099e2a Decompiled sub_6E7FF3 2015-10-28 23:26:33 -05:00