qcz
d4201a7eb7
add rct_scenery_set_entry struct, use it everywhere where referenced, continue to unify code in scenery window
2014-09-05 23:08:51 +02:00
adrian17
b6f98167c4
Use macros from addresses.h
2014-08-28 17:27:48 +02:00
IntelOrca
16b552270b
add rct_ride_type structure
2014-08-24 23:02:19 +01:00
IntelOrca
1158a8876b
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2 into zsilencer-master
...
Conflicts:
src/window_research.c
2014-08-22 23:55:19 +01:00
zsilencer
0992a6adcd
window_research_development_paint() ride names fix
...
stringId from typeId was not working right, this fixes it and gives
correct research ride names
2014-08-22 15:37:18 -06:00
zsilencer
6414d44306
window_research_development_paint() crash fix
...
When the Currently in development Type: is "Ride" the game will crash,
looks like the wrong value is ANDed.
2014-08-22 14:05:41 -06:00
IntelOrca
16106c7569
Merge branch 'master' into new-ride-window
...
Conflicts:
src/window_new_ride.c
src/window_research.c
2014-08-19 21:43:25 +01:00
IntelOrca
c7986d140c
add widgets, sizing and basic events for new ride window
2014-08-19 21:33:05 +01:00
qcz
8f33388d37
Typo in variable name
2014-08-19 22:19:32 +02:00
qcz
06114c2116
Fix #316
2014-08-19 22:16:05 +02:00
qcz
bd06c7caee
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
IntelOrca
9b64c576c4
fixes #293 , closes #301 (min/max) and fixes #304 (research window bug)
2014-08-16 18:15:27 +01:00
IntelOrca
62a24e5383
add research window
...
As seen from RollerCoaster Tycoon 1. This allows the player to change the priorities in a "no money" park. I find it also more logical than the two research panels being separated in finances and new ride windows.
2014-08-15 22:05:35 +01:00