duncanspumpkin
5340af4a12
Refactor sprite_flags
2016-02-23 17:09:53 +00:00
Duncan
40971267c3
Merge pull request #2995 from OpenRCT2/vehicle_sprite_type
...
Vehicle sprite type
2016-02-23 17:09:52 +00:00
Michał Janiszewski
60d01a3ddf
More optimizations to drawing code
2016-02-23 17:33:54 +01:00
Ted John
7d158b962d
Merge pull request #2999 from janisozaur/const
...
Mark map element getters const
2016-02-23 15:02:29 +00:00
Michał Janiszewski
d375015975
Mark map element getters const
...
While it doesn't change a lot in terms of performance, it helps out
compiler being a bit smarter about inlining and reordering things (as
evidenced by generated assembly).
2016-02-23 15:12:48 +01:00
Michał Janiszewski
2a2a188a8b
Improvements to sprite_paint_setup
...
This includes following changes:
* Reorder exit conditions by frequency they're hit at, this makes the
function exit earlier in many cases without having to do expensive
accesses to global memory.
* The code in C tested (eax > 0x2000) || (ecx > 0x2000) while I believe
it was meant to check for >= instead (`cmp ax,2000h; jnb`)
* The check mentioned above was changed to be expressed more concisely:
`((eax | ecx) & 0xe000)`, which generates a single `test` instead of
two.
It improves performance by 1-2fps in parks that rely heavily on this
function, like the mega-micro park from
https://github.com/OpenRCT2/OpenRCT2/issues/2589
2016-02-23 14:18:53 +01:00
Duncan
6a43c2ffc6
Merge pull request #2997 from marijnvdwerf/fix-2996
...
Fix #2996 : change track_descriptor of diagonal downwards track
2016-02-23 11:59:55 +00:00
Marijn van der Werf
b1f4f23712
Fix #2996 : change track_descriptor of diagonal downwards track
2016-02-23 10:07:00 +01:00
OpenRCT2 git bot
fe7c99e256
Merge Localisation/master into OpenRCT2/develop.
2016-02-23 04:00:20 +00:00
duncanspumpkin
5eb3ca8f36
Label var_1F and var_20
2016-02-22 18:05:59 +00:00
Duncan
baffb37b34
Merge pull request #2967 from marijnvdwerf/decompile-6CA2DF
...
Decompile sub_6CA2DF
2016-02-22 17:27:26 +00:00
Michał Janiszewski
2744db77d9
Prefer masking over multiplication in rendering code
2016-02-22 15:54:46 +01:00
Michał Janiszewski
0e42bef94e
Trade control-flow dependency for data-dependency
...
Removes branching in drawing code
2016-02-22 09:30:15 +01:00
OpenRCT2 git bot
196d3d8dcc
Merge Localisation/master into OpenRCT2/develop.
2016-02-22 04:00:14 +00:00
Ted John
cd3c30f730
Merge pull request #2993 from Gymnasiast/fix-linux-file-dialog
...
Fix the file dialog on Linux being case sensitive
2016-02-21 21:31:52 +00:00
Gymnasiast
7c33ff502b
Don't use hardcoded filter pattern conversions
2016-02-21 22:13:22 +01:00
Gymnasiast
21cb7a948b
Make 'All files' translatable
2016-02-21 18:42:55 +01:00
Gymnasiast
efe73b08dc
Fix the file dialog on Linux being case sensitive
2016-02-21 18:28:23 +01:00
duncanspumpkin
f68fe7d24b
Fix vehicles disobeying gravity when crashing on certain tracks
2016-02-21 09:40:50 +00:00
OpenRCT2 git bot
9c08d03b0d
Merge Localisation/master into OpenRCT2/develop.
2016-02-21 04:00:14 +00:00
Ted John
141221f217
Merge pull request #2986 from Gymnasiast/cc2
...
Add Chinese currencies, closes #2403 , closes #2872
2016-02-20 23:33:51 +00:00
Gymnasiast
d32b7286f5
Adjust string ids
2016-02-21 00:21:14 +01:00
Harry Lam
0453b4a5a6
Add Chinese currencies, closes #2403 , closes #2872
2016-02-21 00:13:42 +01:00
IntelOrca
9d15bb1b1f
fix #2984 : refactor error in ride_shop_connected
2016-02-20 22:51:17 +00:00
Marijn van der Werf
a744f84292
Clean up property calculation
2016-02-20 21:55:12 +01:00
Marijn van der Werf
88d0f8c60b
Clean up track retrieval
2016-02-20 17:54:26 +01:00
IntelOrca
3583d601ad
name flag: RIDE_TYPE_FLAG_15
2016-02-20 16:37:09 +00:00
IntelOrca
bd040918a1
use helper functions instead of direct access to 0x00982164
2016-02-20 16:30:08 +00:00
IntelOrca
caf8b45dc3
remove usages of 0x00F441D2
2016-02-20 15:52:38 +00:00
IntelOrca
edbca479e3
remove old usages of 0x00993CCC and 0x00F441D3
2016-02-20 15:50:05 +00:00
IntelOrca
37336d30b7
Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop
2016-02-20 15:17:21 +00:00
Ted John
5182441768
Merge pull request #2968 from octaroot/add_multiplayer_strings
...
Fix #2802 - extract hardcoded network-related strings
2016-02-20 15:07:53 +00:00
IntelOrca
7cc280ca9f
Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop
2016-02-20 14:43:36 +00:00
Ted John
7239921dfa
Merge pull request #2980 from JarnoVgr/installerfix
...
Possible fix for installer upgrade issues
2016-02-20 14:43:14 +00:00
IntelOrca
e4636fd1e5
update .gitignore
2016-02-20 14:40:00 +00:00
Marijn van der Werf
14bf53bb30
Add drawing_fast.cpp to project
2016-02-20 13:41:45 +00:00
Michał Janiszewski
aaf572ab27
Fix fastcall for non-MSVC toolchains
2016-02-20 13:41:44 +00:00
IntelOrca
3edc5c6f0a
compile multiple versions of draw RLE sprite
2016-02-20 13:41:43 +00:00
Jarno Veuger
513ad15c84
Possible fix for installer upgrade issues
2016-02-20 10:02:05 +01:00
OpenRCT2 git bot
05d66fac25
Merge Localisation/master into OpenRCT2/develop.
2016-02-20 04:00:14 +00:00
IntelOrca
4617a52e53
improve dirty block performance
2016-02-20 00:23:58 +00:00
Ted John
1b6299b9d2
Merge pull request #2976 from janisozaur/rotation-optimise
...
Optimise accesses to get_current_rotation()
2016-02-19 23:07:03 +00:00
Michał Janiszewski
cafed8551b
Optimise accesses to get_current_rotation()
2016-02-19 23:56:08 +01:00
duncanspumpkin
1fb1c69d86
Label more vehicle offsets
2016-02-19 18:15:19 +00:00
duncanspumpkin
60b8407b2b
Added assert and error log for questionable localisation code
2016-02-19 17:53:35 +00:00
duncanspumpkin
0e550d8b6b
Remove old peep_find_ride_to_look_at code.
2016-02-19 17:51:34 +00:00
Duncan
591611c9f1
Merge pull request #2977 from octaroot/fix_multiplayer_weather_cheat
...
Fix multiplayer weather cheat
2016-02-19 17:46:38 +00:00
Martin Černáč
4a97743276
Fix multiplayer weather cheat
...
While refactoring the freeze-climate cheat I noticed the state was not being transmitted over the network. This commit fixes that
2016-02-19 18:23:13 +01:00
Marijn van der Werf
9b8b90964e
Use TRACK_SLOPE_NONE for comparing with bl
2016-02-19 17:19:34 +01:00
Martin Černáč
830b897dc6
Refactor conditional buffers and string_ids
2016-02-19 17:17:10 +01:00