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

3808 Commits

Author SHA1 Message Date
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
duncanspumpkin 930bdc1669 Make suggested changes. Invis huts now correctly remove fence 2015-10-28 19:57:02 +00:00
duncanspumpkin d9b7c1fafd Implement remaining rotations 2015-10-28 19:02:32 +00:00
duncanspumpkin e7c653abf2 Refactor attached ps setup code 2015-10-28 18:44:44 +00:00
duncanspumpkin c62e61bd36 Started implementing rotation 0 2015-10-28 18:44:44 +00:00
duncanspumpkin 330b6b5524 Implemented tables for top spin paint setup 2015-10-28 18:44:43 +00:00
Ted John f233f5c498 Merge pull request #2146 from janisozaur/develop 
Cleanups
 2015-10-28 08:14:03 +00:00
Michał Janiszewski 2f457aeffc Cleanups 
* Remove unused function in config.c
* Check handle *before* it is used
* Provide explicit parentheses around unclear if statements
 2015-10-28 08:06:45 +01:00
Linus Unnebäck 29243780c8 add limits.h include for CHAR_BIT 2015-10-28 07:33:56 +01:00
Ted John df5538e930 Merge pull request #2143 from janisozaur/develop 
Guard against possible NULL dereference
 2015-10-27 17:45:16 +00:00
Michał Janiszewski 0cdaa0b57e Guard against possible NULL dereference 2015-10-27 18:32:39 +01:00
zsilencer 00e2ca43a1 ipv6 support, non-blocking address resolve and connect 2015-10-26 22:35:34 -06:00
Gymnasiast 9504f3f10d Replace missed occurrence of magic numbers with defines 2015-10-26 13:53:26 +01:00
Gymnasiast 61444c8518 Display the visible/practical map size instead of the technical size, fixes #2133 2015-10-26 10:21:04 +01:00
IntelOrca 8d84b540ad add vehicle struct and enum labels from vehicle-update branch. 2015-10-25 21:26:03 +00:00
Gymnasiast 98fd1bf95d Reinstate RCT2_ADDRESS_VEHICLE_SOUND_LIST 2015-10-25 21:42:09 +01:00
Gymnasiast 2b0d5b2470 Remove obsolete sound and config code 2015-10-25 20:54:19 +01:00
Ted John 865c1a68a7 Merge pull request #2130 from Dandandan/readability 
Replace constants in world/sprite.c
 2015-10-25 16:43:59 +00:00
IntelOrca 4ac42ff1b2 add vehicle struct, enum labels and helper functions from implement-ride-create-vehicles branch. 2015-10-25 16:00:21 +00:00
Daniël Heres 358647d07c Replace constants in world/sprite.c 2015-10-25 16:34:01 +01:00
Michał Janiszewski fcd22dd8ca Memory handling fixes 2015-10-25 01:15:52 +02:00
e-foley 73eed6830a remove unnecessary rating conditioning 
Remove old workaround to issue #2064
 2015-10-24 14:59:55 -07:00
e-foley 663e430300 cap airtime bonus 
Caps airtime addition to excitement rating rather than allowing infinite
subtraction
 2015-10-24 14:54:15 -07:00
Ted John 3be4dc748a Merge pull request #2115 from Dandandan/optimize 
Fix assignment
 2015-10-24 20:16:34 +01:00
Daniël Heres 9752d197e6 Fix assignment 2015-10-24 21:02:08 +02:00
Ted John cfa847ee71 Merge pull request #2113 from Broxzier/develop 
Added 10-minute inspections cheat.
 2015-10-24 19:13:30 +01:00
Duncan d7a1747407 Merge pull request #2114 from Dandandan/optimize 
Cache width of line in gfx_bmp_sprite_to_buffer
 2015-10-24 18:16:28 +01:00
Daniël Heres 3ebd576d78 Cache width of line 2015-10-24 18:25:11 +02:00
Hielke Morsink e5ce186534 Wrapped new widget with () 2015-10-24 17:23:34 +02:00
Hielke Morsink dc8e197799 Added 10-minute inspections cheat. 2015-10-24 17:10:33 +02:00
Ted John 5e9912e880 Merge pull request #2038 from HaasJona/restart_required 
Require a restart after changing hardware rendering
 2015-10-24 14:44:01 +01:00
Jonathan Haas 475466dcd9 Require a restart after changing hardware rendering setting, decouple setting from active status 2015-10-24 12:50:28 +02:00
Ted John abdcd50c8e Merge pull request #2112 from Dandandan/optimize 
Low level optimizations
 2015-10-24 11:49:32 +01:00
Daniël Heres 29976790cb Low level optimizations 
* Just memcpy if we don't have to use a pallete and zoom_amount == 1
* Replace some divide operations by right-shifts
* Optimize / simplify sub_68B3FB
 2015-10-24 12:32:56 +02:00
Ted John 1cd1344711 Merge pull request #2109 from Overv/develop 
Disable drawing if the window is minimized or otherwise hidden
 2015-10-23 18:22:31 +01:00
Alexander Overvoorde 8a23aa1bec Change openrct2_loop to not draw if window is minimized or otherwise hidden (fixes #2096) 2015-10-23 17:33:25 +02:00
Michał Janiszewski 79552feb54 Only copy strings when they're different 
When called from window_loadsave_scrollmousedown,
window_loadsave_populate_list will try to strncpy a string over itself.
This commit prevents that.
 2015-10-23 17:22:31 +02:00
Ted John a24b3e114c Merge pull request #2107 from Dandandan/optimizemixer 
Optimize Mixer::EffectPanS16
 2015-10-23 13:28:40 +01:00
Daniël Heres fdbd08e306 Calculate correct d_left / d_right 2015-10-23 14:06:38 +02:00
Daniël Heres 831dc631c8 Optimize Mixer::EffectPanS16 2015-10-23 12:40:35 +02:00
Michał Janiszewski 11fb15bba7 Add casts for types 2015-10-22 23:51:05 +02:00
Michał Janiszewski 10587cb5ab Port non-VS inline asm to AT&T syntax 
This is much more liked by other compilers
 2015-10-22 23:32:27 +02:00
Michał Janiszewski 18c867a6fe Modify inline assembly to properly returns results 
Both RCT2_CALLFUNC_X and RCT2_CALLPROC_X did not really return any
value, even though declared to return an int. The inlines are now
modified to properly return flags (`lahf`), with other contents zeroed
out.
 2015-10-22 20:23:26 +02:00
Ted John 6a33b92725 Merge pull request #2101 from nightroan/develop 
Opening or testing a ride will only that ride's close construction window
 2015-10-22 09:48:10 +01:00
nightroan 2e52fac0ca Testing or opening a ride only closes the construction window for that ride. 2015-10-22 01:27:39 -07:00
Michał Janiszewski 06b13794ea Use const for parameters 
In profiling, gfx_rle_sprite_to_buffer turns out to be a hot spot. Use
const pointers, so compiler can make more assumptions regarding them and
perhaps optimize more heavily.
 2015-10-22 10:15:45 +02:00