Commit graph

7558 commits

Author SHA1 Message Date
Marijn van der Werf
1bf9dc26f9 Rename entrance flags to base_image_id 2016-05-18 23:00:26 +02:00
Marijn van der Werf
7c30f89a75 Draw fences underground 2016-05-18 22:57:43 +02:00
Marijn van der Werf
9bcc0d05ed Rebase branch 2016-05-18 22:53:29 +02:00
Marijn van der Werf
c863174814 [fixup] remove monorail stuff 2016-05-18 22:53:29 +02:00
Marijn van der Werf
b07349eae3 Draw ride pier 2016-05-18 22:53:29 +02:00
Marijn van der Werf
98e3eb059a Draw submarine ride track 2016-05-18 22:53:29 +02:00
Ted John
dd03cfc36f integrate more ride entrance / exit place variables 2016-05-18 21:52:39 +01:00
Martin Černáč
3bdc06dc25 Refactor hard-coded strings to use string_ids.h constants (and couple sprites too) (#3658) 2016-05-18 21:51:37 +01:00
Marijn van der Werf
ffa826976c Fix warnings 2016-05-18 22:50:44 +02:00
Marijn van der Werf
c84e23b9ea Clean up code and fix banner drawing 2016-05-18 22:46:24 +02:00
Marijn van der Werf
0a15ccc355 Make construction_markers extern 2016-05-18 22:46:24 +02:00
Marijn van der Werf
679db5e055 Use decompiled construction markers 2016-05-18 22:46:24 +02:00
Marijn van der Werf
aee8607f7a Fix offset for left bottom walls 2016-05-18 22:46:24 +02:00
Marijn van der Werf
bfaa2acf3f Update with changes in develop 2016-05-18 22:46:24 +02:00
Marijn van der Werf
201a01f126 Split up image ids 2016-05-18 22:46:24 +02:00
Marijn van der Werf
44021fdb0a Rename flag 2016-05-18 22:46:24 +02:00
Marijn van der Werf
00d16e7186 tertiaryColour 2016-05-18 22:46:24 +02:00
Marijn van der Werf
000f9cc9b4 Rename dword_141F708 to frameNum 2016-05-18 22:46:24 +02:00
Marijn van der Werf
a71c239b43 Rename dword_141F70C to sceneryEntry 2016-05-18 22:46:24 +02:00
Marijn van der Werf
748ed9ccb0 Update code to use proper function names 2016-05-18 22:46:24 +02:00
Marijn van der Werf
fda7dd6eea Fix fences in direction 0 2016-05-18 22:46:24 +02:00
Marijn van der Werf
564d6b2e12 Refactor other fence function 2016-05-18 22:46:24 +02:00
Marijn van der Werf
78b63b2c6e Refactor one paint function 2016-05-18 22:46:24 +02:00
Marijn van der Werf
ab255ae90d Decompile fence drawing 2016-05-18 22:46:24 +02:00
duncanspumpkin
f1fe46c52c Fix underground track styles. 2016-05-18 21:22:19 +01:00
Martin Černáč
2b6770bfad Fix redundat separator in ride's measurement & test data window tab (#3654) 2016-05-18 21:04:57 +01:00
Matte A
beb8e41056 Use white outlined letters in the console (#3642) 2016-05-18 20:57:11 +01:00
Ted John
d27658ca27 integrate entrance / exit place variables 2016-05-18 20:50:45 +01:00
Marijn van der Werf
5ee6855cdd Paint Merry-go-round (#3653) 2016-05-18 20:48:05 +01:00
Marijn van der Werf
1eb6a529bf Draw flying saucers (#3648) 2016-05-18 20:47:56 +01:00
Marijn van der Werf
811f24bfee Paint 3d cinema (#3651) 2016-05-18 18:18:05 +01:00
Marijn van der Werf
6d6bd0a129 Draw Circus Show (#3649) 2016-05-18 18:16:37 +01:00
Martin Černáč
feed51de27 Add correct tooltip entry for the no. circuits (#3650) 2016-05-18 12:56:30 +01:00
OpenRCT2 git bot
1fd2c1d000 Merge Localisation/master into OpenRCT2/develop. 2016-05-18 04:00:21 +00:00
Ted John
8efe699754 integrate gMapTooltipFormatArgs 2016-05-18 00:02:26 +01:00
Ted John
8d4e4ed0e9 remove unread RCT2_GLOBALs 2016-05-17 23:39:37 +01:00
Ted John
51f01c3341 use set_format_arg instead of RCT2_GLOBAL 2016-05-17 23:29:33 +01:00
Ted John
a6a2dc516a Merge pull request #3644 from marijnvdwerf/paint-setup/cleanup-5
Cleanup/harmonisation of paint code
2016-05-17 23:13:47 +01:00
Ted John
42c83ab982 integrate peep pathfinding goal position 2016-05-17 22:51:46 +01:00
Ted John
8499600786 integrate peep queue pathfinding variables 2016-05-17 22:37:35 +01:00
Marijn van der Werf
5a5eea6837 Add size to sprite arrays 2016-05-17 23:31:10 +02:00
Marijn van der Werf
8756f4cff0 Move data outside of headers 2016-05-17 23:04:37 +02:00
Ted John
6510de394b remove use of 0x00F1AEE0 in footpath_is_connected_to_map_edge 2016-05-17 22:03:06 +01:00
Ted John
e73aeb9a42 integrate gGameCommandNestLevel 2016-05-17 21:47:14 +01:00
Ted John
4847cfe84f clean up footpath_get_coordinates_from_pos 2016-05-17 21:42:46 +01:00
Ted John
14825a8dbc integrate queue chain and refactor 2016-05-17 21:29:05 +01:00
Ted John
c879638f22 integrate ground flag variables 2016-05-17 20:51:11 +01:00
Marijn van der Werf
dbfca8997a Use support-setting functions in more places 2016-05-17 21:05:45 +02:00
Marijn van der Werf
f0badd9e73 Clean up facility drawing 2016-05-17 21:05:04 +02:00
Ted John
52a92fa6f1 fix #3623: initialise _loadedTrackDesignIndex to UNLOADED 2016-05-17 19:55:07 +01:00