1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Commit Graph

3736 Commits

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