mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,966 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

3019 Commits

Author SHA1 Message Date
Miso Zmiric (Mike Squinter) be98d6d850 closes #1305, uses absolute paths for all file loads 
edit and update the distribution readme

clean up the variables mess

improve the set_exe_path and cleanup

final fixes
 2015-06-16 14:05:25 +01:00
IntelOrca 705efbeee9 add last_crash_type to ride struct 2015-06-16 00:16:59 +01:00
IntelOrca 3feacc3400 fix #1356 2015-06-15 22:08:03 +01:00
IntelOrca 32046c3c0a improve saving of S6 data and remove ghost banners / user strings 2015-06-15 22:08:03 +01:00
IntelOrca 2eb39d4a31 Merge branch 'pre-release-0.0.2' into develop 
Conflicts:
	src/util/util.c
 2015-06-15 19:04:10 +01:00
Ted John 40591fda50 Merge pull request #1353 from duncanspumpkin/bugs 
Fix rotation and rides been on
 2015-06-15 18:39:04 +01:00
Duncan Frost 9886bb5d48 Fix peep rides been on displaying incorrectly. 
Made a mistake when changing from an array of 32bit values to an array of 8bit values. Fixes #1336.
 2015-06-15 18:33:21 +01:00
Duncan Frost b997b8bf14 Fix large scenery rotation button missing 
Button was missing when the large scenery item was in position 0. Missing a compare. Scenery window needs to be refactored at some point. Fixes #1342.
 2015-06-15 18:15:15 +01:00
IntelOrca fef88695a0 improve version handling 2015-06-15 18:01:13 +01:00
IntelOrca b206a31cae fix #1145 by removing ghost map elements and trackless rides when saving 2015-06-15 17:27:11 +01:00
IntelOrca ce300c8cb8 set version to develop 2015-06-15 16:29:15 +01:00
IntelOrca c3afb498da Merge branch 'pre-release-0.0.2' into develop 2015-06-15 16:28:45 +01:00
Robert Jordan b4cea081a0 Fixed secondary scroll thumb 2015-06-15 10:36:05 -04:00
Ted John 73a49f6298 Merge pull request #1345 from zsilencer/bugfixs 
fix animation invalidation in large scenery
 2015-06-14 23:33:38 +01:00
zsilencer 28f58b768c fix animation invalidation in large scenery 2015-06-14 15:59:34 -06:00
LRFLEW b588e519c4 Some Cleanup of Past PRs 2015-06-14 16:36:17 -05:00
IntelOrca 0f1b178b96 set version to 0.0.2 2015-06-14 21:36:56 +01:00
Ted John 6b9a64577e Merge pull request #1340 from trigger-death/develop 
Filters should sort properly now
 2015-06-14 21:31:23 +01:00
zsilencer 9419e3a2ec fix a crash in large scenery placement 2015-06-14 14:23:18 -06:00
IntelOrca ce924b4b1b add new custom title sequence to celebrate 0.0.2 release 2015-06-14 21:01:48 +01:00
Robert Jordan aec68a72d7 Excess space no longer created in filter list 2015-06-14 14:52:24 -04:00
Robert Jordan 06525fc83b Removed duplicate strings 2015-06-14 14:51:24 -04:00
Robert Jordan 91bd595326 forgot changes to other tabs 2015-06-14 14:47:08 -04:00
Robert Jordan f988e990ea Reset selection when changing ride tab 2015-06-14 14:43:01 -04:00
Robert Jordan 7f98dba63a Filters sort properly now 2015-06-14 14:41:27 -04:00
Robert Jordan 3ad9a1a74a Removed printf's 2015-06-14 12:25:41 -04:00
Robert Jordan 9ae22b5938 Fixed merge conflicts 2015-06-14 12:21:13 -04:00
Robert Jordan cbf27687cb Added ride filters in object selection 2015-06-14 12:19:54 -04:00
Gymnasiast 95966f6346 Allow building large scenery outside park borders in sandbox mode. 2015-06-14 15:07:08 +02:00
zsilencer d2b565b283 game_command_place_large_scenery 2015-06-14 05:56:41 -06:00
IntelOrca beb2b23afb use log functions instead of printf and RCT2_ERROR (now removed) 2015-06-14 12:03:32 +01:00
Duncan Frost adea7cb9ad Fix incorrect string text colour. 
With the change in how text box colouring is done during the first drawing of any window it would default to the wrong colour due to not calling invalidate before setting the window colour global variables.
 2015-06-14 09:10:56 +01:00
Ted John 74784cd7f3 Merge pull request #1330 from rd3k/window-flags 
Tidy window flags
 2015-06-13 22:28:33 +01:00
rd3k 628a586ea2 Tidy window flags 2015-06-13 22:16:14 +01:00
IntelOrca ee7a2c47f4 refactor map size 2015-06-13 19:11:26 +01:00
rd3k 6f28010e87 Add cheat window per-tab titles 2015-06-13 18:59:38 +01:00
Ted John 9b6eaa25d6 Merge pull request #1327 from trigger-death/tile-inspector-cursor 
Tile Inspector Appropriate Cursor
 2015-06-13 16:10:10 +01:00
Robert Jordan 89a2cc9468 Tile Inspector Appropriate Cursor 2015-06-13 11:05:56 -04:00
IntelOrca b69487cbba add changelog window 2015-06-13 13:30:50 +01:00
IntelOrca 26abb73b8e implement update_cursor_position 2015-06-12 23:29:26 +01:00
IntelOrca f316b423c4 fix scroll H&V issue 2015-06-12 20:10:27 +01:00
Ted John 285240a20b Merge pull request #1316 from trigger-death/input-scroll 
Decompiled input_scroll Functions
 2015-06-12 19:51:30 +01:00
Robert Jordan 927a2a48b5 decompiled input_scroll functions 2015-06-12 14:34:54 -04:00
Andrew Putlock a785ff3cad Autosave no longer changes scenario name to "autosave" 2015-06-11 19:36:56 -04:00
LRFLEW 09d6d9be1c Automatic staff placement 
This will automatically place hired staff near a random guest (with
fallbacks if no guests are in the park). The setting can be toggled in
the options or by holding SHIFT when hiring.
 2015-06-11 15:39:47 -05:00
Ted John ae8464d31f Merge pull request #1310 from rd3k/debug-inspector 
Add debug toolbar menu, start tile inspector
 2015-06-11 21:15:42 +01:00
rd3k fb59dab59e Add debug toolbar menu, start tile inspector 2015-06-11 20:51:39 +01:00
Duncan Frost 499b5413f0 Fix graphical glitch when zoomed. 
Fixes #1088. I'm not completely sure why it works but it does.
 2015-06-11 19:33:48 +01:00
IntelOrca b2e9559d31 fix window issues, fixes #1306 2015-06-11 13:04:55 +01:00
IntelOrca 2547d38807 fix #1307 2015-06-11 02:27:19 +01:00
Ted John 65a706fcdd Merge pull request #1304 from trigger-death/fix-black-caption-bar 
Fixed black caption bar being green
 2015-06-10 21:32:06 +01:00
Robert Jordan 029f7cf664 One colour off 2015-06-10 16:13:32 -04:00
Robert Jordan 35cce1a4df Fixed black caption bar being green 2015-06-10 15:55:15 -04:00
IntelOrca 125c01a147 Merge branch 'build-in-pause-mode-3' of https://github.com/Gymnasiast/OpenRCT2 into Gymnasiast-build-in-pause-mode-3 
Conflicts:
	data/language/english_uk.txt
 2015-06-10 18:44:38 +01:00
Ted John f65ceff1d3 Merge pull request #1301 from runelaenen/develop 
Fixed Clear Loan cheat
 2015-06-10 18:39:19 +01:00
Gymnasiast e719ee02f9 Also update string ID 2015-06-10 19:38:24 +02:00
Gymnasiast 732319514f Allow building in pause mode via a cheat 2015-06-10 19:35:53 +02:00
Runelaenen 829e0712e4 Fixed Clear Loan cheat 
The function already existed in the codebase. I've fixed it and added a
button.
 2015-06-10 19:23:10 +02:00
Ted John 8a71ade8c6 Merge pull request #1300 from duncanspumpkin/fix_profit 
Fix profit
 2015-06-10 18:11:28 +01:00
Duncan Frost 792e70d00c Round the currency away from zero. 
Change the profit per hour to use 2dp currency. Fixes #1227
 2015-06-10 17:53:57 +01:00
Ted John 723fcafd51 Merge pull request #1298 from trigger-death/quick-fire-staff 
Quick fire staff button
 2015-06-10 17:30:31 +01:00
Duncan Frost f6507f70bc Fix negative zero in currency display. 2015-06-10 17:26:37 +01:00
Robert Jordan f16c120200 Quick fire staff button 2015-06-10 12:17:42 -04:00
Robert Jordan 9ffedd598a Fixed fire prompt transparency issue 2015-06-10 11:54:26 -04:00
Ted John a90d5b43ec Merge pull request #1294 from trigger-death/fix-rct1-park-lights-disabled 
RCT1 lights now disabled properly
 2015-06-10 16:48:59 +01:00
Robert Jordan fb828afa1a Added RCT1 light tooltips 2015-06-10 11:47:54 -04:00
Robert Jordan 5466ab3e39 RCT1 lights now disabled properly 2015-06-10 11:43:09 -04:00
IntelOrca a24ffd1f79 fix refactor error in lower_water 2015-06-10 16:38:27 +01:00
IntelOrca 91c73836a3 fix and improve raise and lower land / water / clear scenery 2015-06-10 15:41:50 +01:00
Ted John c01d3d4242 Merge pull request #1291 from Gymnasiast/fix-sound-continuing 
Fix sound continuing in title screen (hopefully), fixes #1290
 2015-06-10 13:05:18 +01:00
Gymnasiast 14e2afaacb Fix Italian config 2015-06-10 12:57:57 +02:00
Gymnasiast c3b394b7ef Don't stop sounds on canceling exit prompt 2015-06-10 12:25:14 +02:00
Gymnasiast 5b0ada3100 Fix sound continuing in title screen (hopefully) 2015-06-10 10:49:32 +02:00
Robert Jordan d7a4474bcd Removed irrelevant comments stating false facts 2015-06-09 23:18:20 -04:00
Robert Jordan 32b79ea216 Fix ride works for all breakdown types 2015-06-09 23:17:08 -04:00
Robert Jordan 98501a51f3 Fix Ride is greyed out when it doesn't work 2015-06-09 23:05:43 -04:00
Robert Jordan e7332b2d94 Fixed maintenance bar 2015-06-09 22:43:14 -04:00
Robert Jordan bf2ac564fb Fixed merge conflicts 2015-06-09 20:19:19 -04:00
Robert Jordan 10c1c29c11 Can now force ride breakdowns 2015-06-09 20:18:04 -04:00
LRFLEW 816944f78b EXPLODE!!! 
Because why not
 2015-06-09 18:14:28 -05:00
Ted John dbb7ae8e15 Merge pull request #1284 from trigger-death/decompile-toggle-price 
Decompiled toggle ride price and fixed ride price
 2015-06-09 23:07:20 +01:00
Ted John 92daca54b8 Merge pull request #1283 from Gymnasiast/sound-settings-remnants 
Force best sound quality and software buffering
 2015-06-09 23:06:44 +01:00
Miso Zmiric (Mike Squinter) ce7b671a3b add missing log_info deffintion for the non ms build systems 2015-06-09 22:41:00 +01:00
Robert Jordan 0f955d0d92 Decompiled toggle ride price 2015-06-09 17:00:11 -04:00
Gymnasiast a62e1c02c2 Force best sound quality and software buffering 2015-06-09 22:56:47 +02:00
Miso Zmiric (Mike Squinter) 628e634199 closes #1204, add log_info 2015-06-09 20:10:37 +01:00
Ted John 59e2080c64 Merge pull request #1278 from duncanspumpkin/bugs 
Change order of load_save code
 2015-06-09 19:35:00 +01:00
Ted John d0c0170858 Merge pull request #1277 from Gymnasiast/sandbox-mode-4 
Rework land ownership cheat into sandbox mode
 2015-06-09 19:34:46 +01:00
Gymnasiast afb49855dd Correct &-operation not in brackets 2015-06-09 20:11:48 +02:00
Duncan Frost 1fde5e53f9 Change order of load_save code 
This prevents the window from appearing for a millisecond when you press x.
Fixes #1264
 2015-06-09 19:05:59 +01:00
IntelOrca 95d6bbaa43 fix dropdowns 2015-06-09 18:37:24 +01:00
Ted John e0d480fa6b Merge pull request #1276 from duncanspumpkin/bugs 
Bugs
 2015-06-09 18:31:05 +01:00
IntelOrca 0dd749baac refactor window event calls 2015-06-09 18:29:02 +01:00
Duncan Frost 322d45a5dd Prevent invalid sprite coordinates from breaking sprite list. 
Fixes @Gymnasiast 's issues in sandbox
 2015-06-09 18:16:27 +01:00
Duncan Frost 5184564e84 Fixed crash when entrance/exits have been moved by 8cars 
Code defaults to 0 direction if the entrance/exit was not found. Fixes #1258.
 2015-06-09 17:35:16 +01:00
Duncan Frost 62bdd8a0ab Fix options disabled_widgets 
There was a bug that caused the first widget on each page to appear disabled due to not being reset when changing page / invalidating. Fixes #1275
 2015-06-09 17:14:57 +01:00
Gymnasiast 7ed434a804 Rework land ownership cheat into sandbox mode 2015-06-09 17:19:05 +02:00
IntelOrca 72de8ad103 implement draw_string_centred_raw 2015-06-09 15:42:25 +01:00
IntelOrca dc3fe2a6c8 remove commented out CALLPROCs and CALLFUNCs 2015-06-09 15:09:45 +01:00
IntelOrca ed86db0635 fix sign issues with selection rectangle 2015-06-09 14:47:26 +01:00
oli414 a09b103895 Fixed crash when using land/water tool outside map 2015-06-09 14:24:02 +02:00
Ted John 22c13f9f93 Merge pull request #1271 from trigger-death/decompile-ride-prices 
Decompiled Ride Prices
 2015-06-09 02:38:32 +01:00
IntelOrca eb654a220d implement sub_6A7594 2015-06-09 02:36:02 +01:00
Robert Jordan fcbe561ad8 Decompiled Ride Prices 2015-06-08 21:28:07 -04:00
IntelOrca 12b01d6521 implement footpath_remove_litter and footpath_interrupt_peeps 2015-06-09 02:09:18 +01:00
IntelOrca 8cfc71ccae fix #1269 2015-06-09 01:24:02 +01:00
IntelOrca acfcf2c33b implement a bit of sub_66397F for sandbox mode 2015-06-08 22:19:06 +01:00
IntelOrca 2888494faa implement three functions used in save scenario 2015-06-08 21:35:09 +01:00
IntelOrca 999488d38c refactor scenario update and checks 2015-06-08 20:48:29 +01:00
Robert Jordan 8e526ac525 Switch RCT1 and RCT2 theme order 2015-06-08 14:21:07 -04:00
IntelOrca 909060b964 implement language fallback to English (UK) 2015-06-08 17:16:37 +01:00
Robert Jordan e471592d16 Fixed themes features tab glitch 2015-06-07 21:11:47 -04:00
Robert Jordan 21734bd71f Fixed open button y 2015-06-07 20:56:31 -04:00
Robert Jordan 9960c8d901 Fixed merge conflicts 2015-06-07 20:37:56 -04:00
Robert Jordan e90c724a3a Rewrote Themes 
Added rct1 styles and lights.
Themes are now easier to expand
Added features tab to themes window
 2015-06-07 20:31:54 -04:00
LRFLEW c0f376aa77 fixed naming convention 2015-06-07 17:20:46 -05:00
LRFLEW d3a6965f95 Made window_loadsave_open accept a default file name 
This fixes #1231, #1245, and adds room for future work, such as porting
track saving.
 2015-06-07 17:12:17 -05:00
LRFLEW 75903ec2d9 Fixed opening save game not changing recommended name 
It was originally handled by load_game(), but was changed when the
loadsave window was implemented.
 2015-06-07 15:20:46 -05:00
LRFLEW 73acb02946 Code Cleanup 
thanks trigger-death
 2015-06-07 15:20:45 -05:00
LRFLEW 66bf2abd37 A fix for #1231 
This has the side-effect of incorrect default names in the scenario
editor, but that can be patched separately.
 2015-06-07 15:20:45 -05:00
Ted John 3cd961a3a0 Merge pull request #1257 from zsilencer/bugfixing 
fix whizzed screenshots
 2015-06-07 21:08:11 +01:00
zsilencer fbebd6527b fix whizzed screenshots 2015-06-07 13:02:17 -06:00
Duncan Frost 4f03b0c997 Refactor of research. 
Fix bug that would cause a crash on a scenario that had rides with same base type
 2015-06-07 19:19:17 +01:00
Duncan Frost 9ad775625a Fix small bugs in the inventions window. 
I think there might have been a case where the list could get corrupted that this may prevent.
 2015-06-07 19:19:16 +01:00
Duncan Frost 97966ac707 Implemented scenery_set_setup for research. 
I've also labelled ride_type->flags.
 2015-06-07 19:19:16 +01:00
Duncan Frost cd22f9bd08 Implement the reset ride research function 2015-06-07 19:18:50 +01:00
IntelOrca f4a4df1cb5 implement window_create_auto_pos 2015-06-07 18:14:33 +01:00
IntelOrca 65377629e4 implement track save select nearby scenery 2015-06-07 16:02:43 +01:00
IntelOrca 28a122ac5c don't show tab image unless tab is shown in new ride window 2015-06-07 14:35:15 +01:00
IntelOrca b79bc68af9 fix #1234 2015-06-07 14:01:32 +01:00
IntelOrca 2eea6bcd4b fix #1229 2015-06-07 13:51:27 +01:00
Ted John 0efd222eac Merge pull request #1252 from Gymnasiast/ownership-editor 
Added cheat to edit land ownership settings in-game
 2015-06-07 13:34:33 +01:00
Ted John ae15039171 Merge pull request #1251 from duncanspumpkin/fix_invis 
Correctly draw invisible entrances
 2015-06-07 13:34:01 +01:00
Gymnasiast 90ac515a9b Fix bug introduced in refactor 2015-06-07 13:34:17 +02:00
Gymnasiast c15da4370a Added cheat to edit land ownership settings in-game 2015-06-07 12:45:55 +02:00
Duncan Frost 169628ddb0 Fix #1243. 
For a lengthy reason as to how this worked before see #1243. New version skips bad map_elements (and the next one).
 2015-06-07 10:53:08 +01:00
Duncan Frost 3977865089 Fix original windows crashing 
Due to the change in WWT_LAST assignment any windows that were not finished would access invalid memory and kick up a fuss causing #1249.
 2015-06-07 08:40:55 +01:00
IntelOrca f3821c4865 finish remaining ride calculations 2015-06-07 02:56:31 +01:00
Ted John 5fb44a443e Merge pull request #1248 from trigger-death/text-box-widget 
Fixed #1247 font issues.
 2015-06-07 02:56:00 +01:00
Robert Jordan 02a9f1b535 Fixed #1247 font issues. 2015-06-06 21:18:20 -04:00
Ted John ad6ccc2553 Merge pull request #1246 from trigger-death/themes-fix 
Fixed themes "editor" tooltip
 2015-06-07 02:09:41 +01:00
Robert Jordan c0df70a9b0 Fixed themes "editor" tooltip 2015-06-06 21:04:14 -04:00
Ted John c295e8bc2d Merge pull request #1241 from trigger-death/text-box-widget 
Textbox Widget
 2015-06-06 22:27:44 +01:00
Robert Jordan 9f9143a5c6 textbox widget 2015-06-06 17:04:53 -04:00
Ted John 076e7142e9 Merge pull request #1240 from duncanspumpkin/fix_1239 
Fix peep placement crash
 2015-06-06 20:29:16 +01:00
Duncan Frost 117526ec77 Fix #1239. Issue caused by sign extension. 2015-06-06 20:12:21 +01:00
IntelOrca dd84ee8340 implement more ride rating calculations 2015-06-06 14:30:43 +01:00
IntelOrca 859e7a3418 implement more ride rating calculations 2015-06-06 12:36:45 +01:00
Robert Jordan 4e43b04524 Fixed english_uk conflicts 2015-06-05 20:19:53 -04:00
Robert Jordan a490284569 Renumbered strings 2015-06-05 20:16:01 -04:00
Robert Jordan c3d36c96ef Now resets scroll properly 2015-06-05 19:02:20 -04:00
Robert Jordan 6179888231 Renamed strings and removed warnings 2015-06-05 18:59:07 -04:00
Robert Jordan c9c3e66289 Object selection search 
Can now search for objects in the object selection window.
 2015-06-05 18:54:47 -04:00
Robert Jordan 83fda8fc56 Clear scenery tool now as options 
Can now choose to clear small scenery, large scenery, and/or footpaths.
 2015-06-05 12:38:52 -04:00
IntelOrca 27484d1a27 implement more ride rating calculations 2015-06-05 16:29:13 +01:00
zsilencer 71ae580483 fixes #1230 and #1212 2015-06-05 01:02:02 -06:00
IntelOrca d51f6ac3c9 add more ride rating calculations and fix bugs 2015-06-05 03:10:42 +01:00
Ted John 1903ab16bb Merge pull request #1223 from zsilencer/volume_control 
add volume control in options
 2015-06-05 00:57:37 +01:00
IntelOrca 5100ed747b refactor rest of ride ratings 2015-06-04 23:52:24 +01:00
zsilencer c6e63d5d25 add volume control in options 2015-06-04 16:31:54 -06:00
IntelOrca 9c4f7b0973 refactor ride ratings and add junior coaster ride calculation 2015-06-04 22:49:02 +01:00
Ted John dfcea20443 Merge pull request #1222 from ThomasdenH/develop 
Change use of gfx_draw_string() to gfx_draw_string_left()
 2015-06-04 20:40:41 +01:00
Thomas e9a33e0de6 Change use of gfx_draw_string() to gfx_draw_string_left() 2015-06-04 21:27:38 +02:00
Duncan Frost 47e41b5d82 Fix bug introduced in previous bug fixing! 
Accidently switched two functions. Small refactor as well.
 2015-06-04 20:15:27 +01:00
Duncan Frost 8351e56353 Fix small graphical bug on bottom arrow. 
Caused by not setting the font style before using them.
Also the origin was one pixel off.
 2015-06-04 20:15:26 +01:00
Duncan Frost 44d4ff4d03 Fix cross hatching graphical glitch. 
Forgot to Xor the value before clearing it. Fixes #1177
 2015-06-04 20:15:25 +01:00
Duncan Frost 2765f15584 Cheats showing pressed after tab change 
Fixes #1084
 2015-06-04 20:15:24 +01:00
Duncan Frost cd753e13e4 Fix #1213 once and for all. 
Forgot to check that the tool in use was the set land rights tool.
 2015-06-04 20:15:23 +01:00
Ted John b688b1eb5f Merge pull request #1220 from trigger-death/options-window-pages 
Options window now uses paged widgets
 2015-06-04 20:04:11 +01:00
Robert Jordan 319fe2b6a2 Didn't commit one file. 2015-06-04 14:51:54 -04:00
Robert Jordan 4b0d005e0f Options window now uses paged widgets 
Widgets now are defined by page.
Fixed options window flashing text colour when first opened.
Fixed themes window gfx_invalidate happening every step.
 2015-06-04 14:51:39 -04:00
Ted John 3e12e9502f Merge pull request #1218 from ThomasdenH/develop 
Refactor cheat window and fix #1084
 2015-06-04 19:08:46 +01:00
Thomas 9f6f7c8b9e Move cheat tab tips 2015-06-04 19:58:16 +02:00
Thomas 9ddd655b20 Refactor cheat window and fix #1084 2015-06-04 19:52:35 +02:00
danidoedel bcbc05e9a2 fix mapgen background bug 2015-06-04 17:39:07 +02:00
danidoedel c481905d0a fix research label position 2015-06-04 17:34:47 +02:00
danidoedel d9807221b8 fix number of selected items label position 2015-06-04 17:33:29 +02:00
danidoedel a57e4587f1 fix number of designs label position 2015-06-04 17:31:42 +02:00
danidoedel c736face55 fix status label position 2015-06-04 17:29:47 +02:00
danidoedel 89e4b1c824 fix status label position 2015-06-04 17:27:56 +02:00
Thomas 70edd18a36 Fix #1214 2015-06-04 15:13:18 +02:00
IntelOrca 67c6e899c1 fix motion simulator ride rating calculation 2015-06-04 12:56:24 +01:00
IntelOrca bb309f34c6 refactor test project and add ride ratings test 2015-06-04 12:46:17 +01:00
IntelOrca f6eec3725c Merge branch 'develop' of https://github.com/marcotc/OpenRCT2 into marcotc-develop 
Conflicts:
	src/openrct2.c
 2015-06-04 11:54:27 +01:00
IntelOrca 43f54cd729 implement more ride rating calculations 2015-06-04 02:08:52 +01:00
IntelOrca efcfbf9a26 implement more ride rating calculations and fix bugs 2015-06-03 22:36:47 +01:00
Ted John 3e08ada75e Merge pull request #1210 from duncanspumpkin/fix_bugs 
Fix bugs
 2015-06-03 21:13:50 +01:00
Duncan Frost c9543005de Fix small issues with scrolling. 
I've found the cause of the cursors not correctly changing. It would appear ebx is popped to its previous value as the call function returns. This causes the cursor value to never change. This can be solved when all windows are complete. Fixes points i, ii, iii, iv of #1127 (Fixed by reseting scroll positions when the height is 0. And actually passing the scroll index to the calling function)
 2015-06-03 20:54:28 +01:00
Ted John 0cc54ca1f1 Merge pull request #1209 from danidoedel/patch-2 
Scenario Editor: fix entry price label position
 2015-06-03 19:19:19 +01:00
IntelOrca ab2e6a867f refactor ride names and show ride type/s on object selection window 2015-06-03 19:14:45 +01:00
Duncan Frost 21b57e90a3 Stop plain clothes handymen. 
Accidentally was not reseting the image offset whenever a peep changed sprite.
 2015-06-03 19:14:07 +01:00
Duncan Frost 9dfa9b1461 Fix #1161 
In the editor map window the string displaying the current tool size was not checking to make sure the tool was active before displaying the size.
 2015-06-03 19:04:13 +01:00
Duncan Frost 17abada57e Fix invalid locations breaking viewports 
Fixes #1183. Note this isn't the same fix that rct2 uses. But I feel it solves the main issue
 2015-06-03 19:00:16 +01:00
danidoedel 578d676b7f fix entry price label position 2015-06-03 19:25:16 +02:00
Ted John 0910f97fdf Merge pull request #1208 from trigger-death/object-selection-filter 
Object Selection Filters
 2015-06-03 18:13:25 +01:00
Duncan Frost fb1c8c4e42 Check against invalid tiles correctly 2015-06-03 18:02:41 +01:00
Robert Jordan ee00962ac9 Object Selection Filters 
Can now filter objects in the selection window by source. (RCT2, WW, TT,
Custom)
Object selection window now displays source above dat name.
 2015-06-03 12:37:07 -04:00
IntelOrca 463131117c fix edit command line function 2015-06-03 17:11:52 +01:00
IntelOrca 899c563d35 improve sprite compiler 2015-06-03 03:11:54 +01:00
Ted John 3e9e17e679 Merge pull request #1203 from trigger-death/MOM-saftey-checks 
Added some M.O.M. safety checks.
 2015-06-02 22:41:57 +01:00
Robert Jordan d1bc98e121 Added some M.O.M. safety checks. 
Parks using M.O.M. and other hackish features should be less likely to
crash now.
 2015-06-02 17:31:45 -04:00
Ted John 5cae4da1b6 Merge pull request #1201 from trigger-death/remove-clear-scenery-function-usage 
Removed unecissary usage of clear scenery tool
 2015-06-02 22:22:06 +01:00
Robert Jordan 44e5af5fe0 Removed unecissary usage of clear scenery tool 2015-06-02 16:43:21 -04:00
IntelOrca caa6155259 fix HTTP request URL bug 2015-06-02 21:09:52 +01:00
IntelOrca e42333df05 add go karts ride rating calculation and fix rating bugs 2015-06-02 21:07:46 +01:00
IntelOrca 1d622ed3e2 add more ride rating calculations and refactor ride operation mode 2015-06-02 19:59:55 +01:00
Ted John 6a39115941 Merge pull request #1199 from ThomasdenH/map_generator_improvements 
Add new map generation icons and make description wider
 2015-06-02 16:01:20 +01:00
Thomas 857e104153 Add new map generation icons and make description wider 2015-06-02 16:52:00 +02:00
Ted John 9144080ef7 Merge pull request #1197 from ThomasdenH/develop 
Sprite tool now can export all sprites in a file
 2015-06-02 14:45:04 +01:00
IntelOrca 137c8c190d add giant screenshot to file menu 2015-06-02 14:12:36 +01:00
Thomas den Hollander 2f6bff4def #include fix 2015-06-02 13:37:18 +02:00
Thomas df25e7a15a Add command 'exportall' to sprite tool 2015-06-02 12:50:16 +02:00
zsilencer 14b9445d8a make texture screen blit faster 2015-06-02 02:21:07 -06:00
Marco Costa f05d851811 Create simple test framework 
* Run all tests by passing "test" as a command line argument to
'openrct2'
* Using CuTest 1.5 as a test framework
 2015-06-01 21:45:12 -04:00
IntelOrca f827234dc8 fix sprite compile issue, entry offsets were not updated when data was reallocated. 2015-06-02 00:53:51 +01:00
Ted John 954db85e8c Merge pull request #1193 from zsilencer/bugfix 
#1192
 2015-06-01 21:36:54 +01:00
Ted John a63b7906c8 Merge pull request #1191 from ThomasdenH/develop 
Add dithering to sprite importer
 2015-06-01 21:36:14 +01:00
zsilencer 603233a583 #1192 2015-06-01 13:07:18 -06:00
Robert Jordan c0ea64b83d Minor visual improvements 2015-06-01 11:38:27 -04:00
Robert Jordan 765bf976ee Renamed Colour Schemes to Themes 
Themes window now opens to settings/presets tab so it's less confusing
for others.
Can no longer change default presets, you get a warning when you try.
now stores themes in themes folder.
Now clips theme names.
 2015-06-01 11:02:09 -04:00
Thomas a3368c4a54 Fix issue 2015-06-01 15:14:15 +02:00
Thomas f262ef977d Fix warning and remove debugging 2015-06-01 14:04:35 +02:00
Thomas c266c21c9c Fix overflow issue 2015-06-01 13:19:40 +02:00
Thomas 55456559bb Added dithering and closest pixel conversion for sprite tool 2015-05-31 20:35:40 +02:00
rd3k 9d7dc3bacc Use uint16 for park size 2015-05-31 13:00:39 +01:00
rd3k 395773cdd6 Add cheat to make all guests feel nauseous 2015-05-31 02:04:01 +01:00
IntelOrca 1fdf1f57f7 add zoom button images to viewport window 2015-05-31 00:20:42 +01:00
Robert Jordan 3fae3c2017 Resolved more conflicts 2015-05-30 16:03:39 -04:00
Robert Jordan 41171aa304 Resolved Merge Conflicts 2015-05-30 16:00:13 -04:00
rd3k 3bd079a9f4 Add handy input windows to mapgen first tab 2015-05-30 20:10:10 +01:00
Robert Jordan eb19ae7995 Final changes 2015-05-30 12:43:24 -04:00
Robert Jordan 53a241d197 Finished ini file loading and removed warnings 2015-05-30 11:52:08 -04:00
IntelOrca 4bb4b197dd make small change to screenshot command line 2015-05-30 13:06:36 +01:00
IntelOrca 85bf7c77d0 Merge branch 'cmdline-screenshot' into develop 2015-05-30 13:03:16 +01:00
Ted John e9f7ec0a6a Merge pull request #1172 from duncanspumpkin/cmdline-screenshot 
Fix rotation issue
 2015-05-30 13:02:38 +01:00
Ted John b7d293f4dd Merge pull request #1171 from duncanspumpkin/toolbar_funcs 
Toolbar Update Functions
 2015-05-30 13:00:25 +01:00
Ted John ba48b474b9 Merge pull request #1170 from zsilencer/bugfixes 
#1165
 2015-05-30 12:59:45 +01:00
IntelOrca 8bc877ad27 Merge branch 'cmdline-screenshot' into develop 2015-05-30 12:54:45 +01:00
IntelOrca 0b058cfab0 finish giant screenshots and bugs 2015-05-30 12:54:10 +01:00
Duncan Frost 3bd3fccb57 Fix rotation disapearing sprites 
This was caused by the sprite quadrant assignment not being reset when a new rotation was assigned
 2015-05-30 10:15:29 +01:00
Duncan Frost 0954687973 Refactor ofviewport code slightly 
Fix potential water height bug
 2015-05-30 10:00:33 +01:00
Duncan Frost 2532e9aad2 Added try_place_ghost_scenery. 
Ghost scenery placement is now performed by OpenRCT2 game commands.
 2015-05-30 07:04:15 +01:00
Duncan Frost e04f649d2a Added scenery_large_update 
From quick test seems to be working
 2015-05-30 06:27:55 +01:00
Duncan Frost eef779378e Added more of update_scenery 
Only large scenery missing
 2015-05-30 06:27:54 +01:00
Duncan Frost 5578a16663 Started update_scenery 2015-05-30 06:27:54 +01:00
Duncan Frost b2caeaf531 Refactor of code slightly 
Since get_map_coordinates_from_pos returns sint16 values I changed it so that it didn't use sint32 values.
 2015-05-30 06:27:52 +01:00
Duncan Frost a59fd26b3d Added update_water 
Refactored up/down water commands so that it used more standard layout.
Not tested.
 2015-05-30 06:27:51 +01:00
Duncan Frost 24f9898ce6 Fixed bug with land direction 
This would cause the cursor to highlight the opposite tile when hovering over bottom left and bottom right
 2015-05-30 06:27:50 +01:00
Duncan Frost 5fa982f08b Added tool_update_land 
Not tested
 2015-05-30 06:27:49 +01:00
Duncan Frost 573a632e43 Fix bugs in scenery_clear update 
Note make a new version of land update to fix cost issue
 2015-05-30 06:27:48 +01:00
Duncan Frost 54a37edb44 Implemented clear scenery update 
Not tested.
 2015-05-30 06:27:47 +01:00
zsilencer 5c7dc6bb9a #1165 2015-05-29 21:50:32 -06:00
rd3k 257d3b8469 proper cheat and Twitch window tooltips, fix #1167 2015-05-30 02:51:20 +01:00
Robert Jordan dbc1df308f Issues with Dropdown text 2015-05-29 16:42:57 -04:00
rd3k 3a55c060f7 fix #1163 2015-05-29 20:59:16 +01:00
IntelOrca c6aa17f053 add headless game support 2015-05-29 20:45:21 +01:00
Robert Jordan dc1e38180e Starting work on colour schemes config settings 2015-05-29 12:04:53 -04:00
IntelOrca 31e0bdd76f add partial working screenshot by command line 2015-05-28 23:04:02 +01:00
Duncan Frost 8c27be2357 OpenRCT2 no longer crashes after station abuse. 
Certain 8cars functions would move station track pieces that would cause the game to crash as they would not be at the correct location. OpenRCT2 will just skip trying to update the tiles of station track that has been modified this way
 2015-05-28 19:46:59 +01:00
Graham Edgecombe 8da01a1bf7 Fix building with -DDISABLE_TWITCH. 
The gTwitchEnable variable was used in some places without being
wrapped around an #ifndef DISABLE_TWITCH block.
 2015-05-28 11:52:40 +01:00
IntelOrca 6f1cd77f3c implement textinput_cancel and refactor textinput event calls 2015-05-28 01:15:58 +01:00
IntelOrca 101fed0dd9 refactor g1Elements pointer and implement sub_68371D 2015-05-28 00:17:22 +01:00
Jackson Davis e394c1d0d3 Fix compile error for non-windows 2015-05-26 18:29:31 -07:00
Robert Jordan 16105af1e7 Progress on window colour schemes 2015-05-26 16:59:25 -04:00
IntelOrca 6426adb45d remove asm for set scroll size and add gCurrentAwards 2015-05-26 19:28:56 +01:00
Miso Zmiric (Mike Squinter) c2c9bbf4ef add twitch integration, part 2 2015-05-25 20:38:33 +01:00
IntelOrca 1ac93e44c9 add twitch integration, part 1 2015-05-25 20:36:40 +01:00
Ted John b488693a0b Merge pull request #1147 from trigger-death/fixed-whizzed-images 
Fixed "whizzed" images #1070
 2015-05-25 02:39:57 +01:00
Robert Jordan 7121c8c097 Fixed "whizzed" images #1070 
In reset_type_to_ride_entry_index_map() we were simply reseting every
up-to but excluding LIM launched (the last ride type)
 2015-05-24 16:48:56 -04:00
Robert Jordan 6bc081edca Added date format to culture options menu 2015-05-24 12:38:07 -04:00
Ted John ad4436ea4f Merge pull request #1142 from trigger-death/in-game-object-selection 
Added in-game object selection
 2015-05-24 03:52:53 +01:00
Robert Jordan ab942236d7 Added in-game object selection 
New console commands:
- open (opens a window)
- windows (lists windows usable with open)
- load_object (loads the specified obj with the given filename)
- object_count (lists the number of objects in the scenary)
Console commands now have a usage variable.

Use: "open object_selection" for the object selection window.
Once the object selection window is closed, all objects will
automatically be researched whether or not they were already in the base
scenario.
The object selection window will close any other windows when selecting
an object to prevent a crash.
 2015-05-23 14:56:54 -04:00
Gymnasiast 81272f5ab7 Resolved merge conflict 2015-05-23 14:22:24 +02:00
Michael Steenbeek 89b0f81bfc Forgot the change string number 2015-05-23 02:43:38 +02:00
Gymnasiast 0a093be3b1 Resolve merge conflict 2015-05-23 02:24:07 +02:00
Gymnasiast 7868d19522 Add option to exit Openrct2 2015-05-23 02:21:05 +02:00
Robert Jordan 37221f0aae Testing Improvements 
Added test_unfinished_tracks and no_test_crashes
Both are enablable through the console and test_unfinished_tracks is
also an option.
Increased options window height.
Made it so "out" ride window is opened after a crash instead of RCT2's
ride window.
ride_is_valid_for_open has a counterpart: ride_is_valid_for_test
 2015-05-22 14:18:48 -04:00
IntelOrca d0a50c43f4 fix #1129 2015-05-22 13:49:18 +01:00
Gymnasiast 121052b807 Add cheat to unlock both entry and ride prices, reordered misc tab on cheats window 2015-05-22 12:41:22 +02:00
IntelOrca 0013310f0d add hardware display 2015-05-22 03:17:46 +01:00
Ted John 25c5c8cbaa Merge pull request #1124 from jcdavis/69A3A2 
69A3A2: ride_update_satisfaction
 2015-05-21 21:22:31 +01:00
Ted John 3f71502718 Merge pull request #1107 from zsilencer/decompiling 
game_command_place_scenery
 2015-05-21 21:20:22 +01:00
Michael Steenbeek 2a7926915c Declare window_invalidate_all() 2015-05-21 19:44:10 +02:00
Jackson Davis 095fbfa21d 69A3A2: ride_update_satisfaction 2015-05-21 10:00:04 -07:00
Ted John 2ed1963d96 Merge pull request #1123 from Gymnasiast/powered-launch-availability 
Allow both types of powered launch on every RC that supported one of them
 2015-05-21 16:45:10 +01:00
Gymnasiast 4a4e6a3b4f Allow both types of powered launch on every RC that supported one of them. 2015-05-21 14:58:17 +02:00
Gymnasiast 36ccfe77e0 Add GUI option for switching to the RCT1 colour scheme, along with proper invalidation of the affected windows 2015-05-21 12:28:51 +02:00
IntelOrca 6135b9204d fix #1118 2015-05-21 03:11:53 +01:00
IntelOrca bdd712bc4b fix config parsing bug 2015-05-21 02:52:32 +01:00
zsilencer 28c2451d97 move data into code, cleanup 2015-05-20 19:21:13 -06:00
zsilencer 9ee4b64fa1 game_command_place_scenery 2015-05-20 19:21:13 -06:00
IntelOrca 22212df32a fix user error 2015-05-21 01:51:48 +01:00
Ted John a27a516e30 Merge pull request #1112 from trigger-death/sprite-build-command 
Sprite build command
 2015-05-21 01:45:30 +01:00
Ted John 18e1a53e42 Merge pull request #1117 from zsilencer/stuff 
fix #1101 and reorganize the tune lists
 2015-05-21 01:36:53 +01:00
IntelOrca c0079919b4 implement user_string_allocate 2015-05-21 01:35:24 +01:00
zsilencer 86ce94f8e9 fix #1101 and reorganize the tune lists 2015-05-20 18:25:26 -06:00
Ted John e2b53ddca6 Merge pull request #1115 from duncanspumpkin/fix_bugs 
Fix #1103 and #483
 2015-05-20 21:23:54 +01:00
IntelOrca 776c85db74 allow localisation of digit seperator and decimal point 2015-05-20 20:11:50 +01:00
Robert Jordan ac17b52139 g2.dat is now updated every build. 
data/g2.dat is now ignored.
 2015-05-20 14:20:24 -04:00
Duncan Frost d3587c2fc5 Fix #1103 and #483 
Measurement close is now correctly called when the ride measurement window is closed.
When quiting a scenario tool_cancel is called to also reset the scnery selection mode
 2015-05-20 19:18:54 +01:00
Robert Jordan 0a3d2b949c sprite build now uses parameters 
Added batch file to build g2.dat
 2015-05-20 13:17:08 -04:00
Ted John 56c3647215 Merge pull request #1114 from trigger-death/fix-tooltips 
Fixed tooltip issue #1053
 2015-05-20 17:54:29 +01:00
Robert Jordan dc38087f07 Fixed tooltip issue #1053 
Tooltips should now behave more like RCT2.
 2015-05-20 12:53:02 -04:00
Robert Jordan 06449648b3 Possibly fixed issue #1056 
Only resizes GUI and windows if not minimized.
 2015-05-20 11:58:43 -04:00
Robert Jordan c7e3639663 Sprite build command 
build uses ../../data/g2.dat and all numbered images in
../../resources/g2/.
No other parameters needed.
Also changed speed button hyper arrows to support game speeds inbetween
4 and 8.
 2015-05-20 11:52:40 -04:00
IntelOrca 1339c9b493 fix console caret typo and invalidate screen on variable change 2015-05-20 02:37:44 +01:00
IntelOrca 1fd7bd255f Merge branch 'develop' of https://github.com/trigger-death/OpenRCT2 into trigger-death-develop 2015-05-20 02:31:17 +01:00
Robert Jordan 0fbeb9214e Finished improvements to console 
Added commands: variables, get, and set
Added console scrolling
set console_small_font 1 will change the console font
Fixed issue with textinput incrementing the length twice in shared.c
 2015-05-19 21:12:09 -04:00
IntelOrca d6e27c8241 fix #1097 2015-05-20 01:10:53 +01:00
Duncan Frost ebcb4ba480 Refactor and bug fix of scenery removal. 
Looks like I might have introduced a bug during my last refactor due to using the same name for multiple variables.
 2015-05-19 22:08:51 +01:00
Duncan Frost 5e1ec9134d Fix #1102 
Fixed tracks from failing to save due to mistake in reversing.
 2015-05-19 21:22:09 +01:00
Robert Jordan 61474ecd9a Progress on console 2015-05-19 13:46:05 -04:00
Duncan Frost 2d956d2fc6 Fix rides been on displaying incorrectly 2015-05-19 18:35:02 +01:00
Duncan Frost b681c98505 Fix #1099. 
The middle news item was not being reset to empty as news update is not called when there is no news. Added in a reset when opening the bottom toolbar.
 2015-05-19 18:04:58 +01:00
Duncan Frost 3008d56851 Fix #1098. 
Forgot to increment the mapElement after during loop.
 2015-05-19 17:41:32 +01:00
Robert Jordan 0a71b633c7 Added game speed button sprites 
Also added empty.png to resources to fill in g2 sprites reserved by
other contributors.
 2015-05-19 11:51:59 -04:00
Ted John 20057ef46c Merge pull request #1095 from noitatum/decompile_0x0069DEAD 
First decompilation, criticism welcome.
 2015-05-19 14:20:11 +01:00
Ted John 8f19ecbdef Merge pull request #1094 from trigger-death/new-title-logo 
Changed Title Logo
 2015-05-19 14:18:22 +01:00
Ted John 8ab5fec68a Merge pull request #1096 from Gymnasiast/increase-num-laps 
Increase max circuits to 20 and max number of people in maze to 64
 2015-05-19 14:17:50 +01:00
Gymnasiast 257e330503 Increase maximum number of laps to 20 and maximum number of people in maze to 64. 2015-05-19 11:18:08 +02:00
Robert Jordan c48645a67a Changed Title Logo 
Started placing g2.dat sprites in resources/g2
 2015-05-18 23:33:21 -04:00
noitatum 3b9a5bd2f4 Decompiled 0x0069DEAD, it's now called finance_shift_expenditure_table. 
Added some defines for the expenditure table size, the expenditure table saves the history up to 16 months but only shows 5 ingame.
Fixed an inconsitency with the assembler code in finance_init(), it only initializes the first month, not four.
 2015-05-19 00:12:06 -03:00
IntelOrca 8772cdd7aa add in game console 2015-05-19 03:54:09 +01:00
IntelOrca c1260fc11f add command line sprite editor and additional custom graphics (g2.dat) 2015-05-19 00:26:31 +01:00
Ted John 27737cc086 Merge pull request #1092 from trigger-death/game-speed-button 
Added game speed button and other changes
 2015-05-19 00:01:02 +01:00
Robert Jordan 77767a6bc5 Didn't update top_toolbar 2015-05-18 18:16:43 -04:00
Robert Jordan 6faaca53aa Added game speed button and other changes 
Game speed button with up to 4/5 speeds.
Debugging tools option to enable non-playable changes.
Cheat window is now a setting.
Game speeds 5-7 are removed.
Game speed 8 added with enabling debugging tools.
Windows and news ticker update once per tick instead of based on game
speed.
 2015-05-18 18:15:43 -04:00
Duncan Frost 5180c247d6 Fix scenario bugs. 
Number of guests and currency were accidentaly being truncated to bytes. This was causing display issues when creating custom scenarios in OpenRCT2.
There was a small bug in research loading that was causing a crash due to exiting of a loop to early. As this was after a call to random this would only occur occasionally.
 2015-05-18 22:21:12 +01:00
Duncan Frost a69575dbea Refactor of update_park_fences 
Now uses functions to work out map location ownership.
Also uses mapElements instead of tileIdxs.
 2015-05-18 18:27:01 +01:00
Ted John 7a22ff57cf Merge pull request #1085 from Gymnasiast/disable-all-breakdowns 
Add cheat option to disable breakdowns completely.
 2015-05-17 23:01:58 +01:00
Ted John 372ab2f685 Merge pull request #1082 from trigger-death/decompiled-functions 
Decompiled sub_6EC847 & sub_664D05
 2015-05-17 18:21:42 +01:00
Ted John 14db9a78cd Merge pull request #1081 from Gymnasiast/allow-high-launch-speeds 
Allow maxing out launch speed and many other operation settings as well
 2015-05-17 18:21:08 +01:00
Gymnasiast dc524c1b6a Add cheat option to disable breakdowns completely. 2015-05-17 18:55:57 +02:00
Robert Jordan eb85b8f4dd One small mispelled function fix 2015-05-17 12:42:43 -04:00
Robert Jordan db701eca56 Fixed editor bottom toolbar right button alignment 
The button was improperly sized. I just switched 2 sets of values to fix
that.
 2015-05-17 12:41:21 -04:00
Robert Jordan 9eed7dc614 renamed functions 
renamed gfx_invalidate_scrollingtext to gfx_invalidate_tile_if_zoomed
 2015-05-17 12:38:02 -04:00
Robert Jordan 9529f3e179 Decompiled sub_6EC847 & sub_664D05 
sub_6EC847 is named invalidate_viewport_tile
sub_664D05 is named update_park_fences
both functions are in world/park.c
 2015-05-17 12:36:16 -04:00
Ted John 65ff82b187 Merge pull request #1076 from Gymnasiast/disable-brakes-failure 
Add a cheat option to disable brakes failure
 2015-05-17 16:50:52 +01:00
Gymnasiast 8f82175fec Allow maxing out launch speed and many other operation settings as well 2015-05-17 17:26:07 +02:00
Ted John 2fa9b1a5a0 Merge pull request #1075 from Gymnasiast/develop 
Extend the RCT1 colour scheme to the scenario select and start new campaign window
 2015-05-17 13:45:12 +01:00
Gymnasiast 0b3d2dad41 Add a cheat option to disable brakes failure 2015-05-17 14:26:45 +02:00
Gymnasiast 8d0ab82d65 Extend the RCT1 colour scheme to the scenario select and start new campaign window 2015-05-17 12:55:26 +02:00
Duncan Frost 0701bacc71 Fix yellow arrow when closing construction window. 
Small refactor of map selection globals.
Fixes #1062
 2015-05-17 08:49:39 +01:00
Duncan Frost 328abd1d45 Fix out of bounds errors 
Changed get_surface_element to bubble up the null mapElement to be taken care of by the calling function.
Added checks on the track functions to ensure that invalid coordinates do not call get_surface_element_at.
Fixes #1066 and Fixes #1057
 2015-05-17 07:58:51 +01:00
IntelOrca b762fccdb2 fix format codes that did not backtrack the null terminator. 2015-05-16 16:42:23 +01:00
Gymnasiast 02ba241385 Add cheat option for lift hills up to 410 km/h, fix a comment and some spaces 2015-05-16 17:16:09 +02:00
IntelOrca f7972f0d48 Merge branch 'land-rights-tool' of https://github.com/trigger-death/OpenRCT2 into trigger-death-land-rights-tool 
Conflicts:
	data/language/english_uk.txt
 2015-05-15 22:10:13 +01:00
Robert Jordan e3451df703 Fixed up strings 2015-05-15 16:06:59 -04:00
Robert Jordan 6d5a07f7ef Finished cleaning up land rights tool code 2015-05-15 15:19:36 -04:00
Robert Jordan f18524151c Park Window Toggling 2015-05-15 11:53:28 -04:00