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
Duncan
414c94c9e0
Merge pull request #2177 from janisozaur/memory
...
Fix variable not being shifted
2015-11-01 18:49:32 +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
Ted John
0730ece1ec
Merge pull request #2176 from HaasJona/Fix2138
...
Fix Bug #2138
2015-11-01 11:18:31 +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
Ted John
aa67539120
Merge pull request #2172 from zsilencer/network
...
Network
2015-10-31 18:04:13 +00: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
Duncan
476280cdf3
Merge pull request #2170 from duncanspumpkin/fix_entrance
...
Fix entrance drawing issue
2015-10-30 23:40:16 +00:00
duncanspumpkin
9a76c59ec9
Fix entrance drawing issue. Fixes #2164 .
2015-10-30 23:33:02 +00:00
Ted John
d1745c0738
Merge pull request #2169 from janisozaur/safe_strncpy
...
Add safe_strncpy function
2015-10-30 22:26:23 +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
Ted John
653c2b2701
Merge pull request #2159 from FlukiestEmperor/develop
...
Fixes NULL map elements when loading a save
2015-10-30 12:31:51 +00:00
Flukiestemperor
a819a6f177
Fix crash when map element is null in a save
2015-10-30 06:47:05 -05:00
Ted John
1f9c02fc5f
Merge Localisation/master into OpenRCT2/develop.
2015-10-30 04:00:17 +00:00
Ted John
2b6cc139a8
Merge pull request #2160 from janisozaur/develop
...
fixes
2015-10-29 21:36:40 +00: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
Michael Steenbeek
6e2962f3e4
Merge pull request #2157 from dail8859/patch-1
...
Update readme.md
2015-10-29 17:27:46 +01:00
dail8859
cc35320b6a
Update readme.md
...
Remove mentioning of VS2013. Other minor edits.
2015-10-29 12:11:54 -04:00
Ted John
b05b54c3fc
Merge pull request #2148 from Overv/insert_enum_constants
...
Replace RCT2_GLOBAL magic numbers with address identifiers and string ids
2015-10-29 12:02:52 +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
Ted John
0b66558852
Merge Localisation/master into OpenRCT2/develop.
2015-10-29 04:00:17 +00:00
Duncan
54dd6cac15
Merge pull request #2149 from duncanspumpkin/track_paint
...
Top Spin Track paint
2015-10-28 20:18:43 +00: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
