Commit Graph

1875 Commits

Author SHA1 Message Date
Duncan Frost 8cd6d51cea Fixed secondary item count. Labeled count offsets 2015-01-04 16:28:19 +00:00
Duncan Frost 9f267fe669 Increased the number of rain pixels to max 2015-01-02 10:16:05 +00:00
Ted John 592e6bdd45 Merge pull request #662 from duncanspumpkin/fix_pause_sound
Fixed #659
2015-01-01 14:31:25 +00:00
eezstreet 68ada3d06b Added financial options tab to main toolbar 2014-12-31 23:28:50 -05:00
Duncan Frost 8b86ded534 Fix gloom at increased zoom levels. 2014-12-31 18:42:03 +00:00
Duncan Frost cfd83eca1d Fix rain gloom. Mistake in viewport_paint caused no change in gloom 2014-12-31 18:13:58 +00:00
Duncan Frost 4257d0bcc4 Labelled offset to redundant max vehicle sounds. 2014-12-31 15:04:20 +00:00
Duncan Frost cbe49300b8 Fixed sounds not playing properly when paused. Labeled max sounds offset. Prevented crash on null dereference 2014-12-31 14:54:23 +00:00
Duncan Frost c3c8a73225 Fixed drawing issues when zoomed. 2014-12-28 13:29:26 +00:00
Duncan Frost f6cb4a0064 Remapped keypad enter to return keycode. 2014-12-22 20:29:36 +00:00
Ted John 7b8dc291a5 Merge pull request #650 from duncanspumpkin/text_input_large
Added multi line text input
2014-12-22 19:35:50 +00:00
Duncan Frost 153196a905 Remove redundant define 2014-12-22 16:55:17 +00:00
Duncan Frost ba93cd337b Added dynamic window resizing on change of text. Fixed cursor display issue 2014-12-22 16:50:35 +00:00
Duncan Frost f93aeb33c6 Added multi line text input 2014-12-22 10:40:00 +00:00
Duncan Frost acf6ef7b88 Fixed construct bug 2014-12-20 13:06:17 +00:00
Duncan Frost a96bf872bf Added more of demolish. Fixed bug in window_close 2014-12-20 11:14:26 +00:00
Duncan Frost 749bd48f3d Started adding a little bit of ride construct mouse down 2014-12-20 10:43:30 +00:00
Duncan Frost 583cb5118c Added construct dropdown function fixes #638. 2014-12-19 18:44:42 +00:00
Ted John d062e7d31e Merge pull request #641 from adrian17/viewport_fix
Fix for sub_6E7F34 in viewport.c
2014-12-18 13:55:19 +00:00
Adrian Wielgosik 8d65078abf Remove a no longer relevant comment 2014-12-17 23:30:39 +01:00
Duncan Frost c0378279f8 Properly pass dx and bp 2014-12-17 22:08:57 +00:00
IntelOrca 44efbd95ac implement more footpath construction and window 2014-12-17 20:45:27 +00:00
Duncan Frost 03da2b07a6 Fix viewport tearing. 2014-12-17 20:19:10 +00:00
IntelOrca 0209ad080c fix various footpath bugs and refactor, fixes #637 2014-12-16 22:03:56 +00:00
Adrian Wielgosik 7611cd0ad6 Condition fix in viewport.c 2014-12-16 22:10:16 +01:00
Adrian Wielgosik a20b16f651 Fix a bug in sub_6E7F34 and reenable new code 2014-12-16 21:56:08 +01:00
IntelOrca 99b85b2339 add manage track design window (UNTESTED) 2014-12-16 15:33:32 +00:00
IntelOrca a319bb15e2 fix compile error for GCC 2014-12-16 11:37:46 +00:00
IntelOrca d7212c1b14 implement inventions list window, fixes #630 2014-12-16 01:24:13 +00:00
Ted John e47b2c920f Merge pull request #636 from duncanspumpkin/fix_lightning
Fix lightning
2014-12-14 21:10:05 +00:00
Duncan Frost 86b6d8083e Fix rain continuing on main menu. Added comment about screen flags 2014-12-14 21:02:38 +00:00
IntelOrca 1459263b3c implement editor scenario options window 2014-12-14 19:21:06 +00:00
Duncan Frost 83a7dd5095 Fix lightning error caused by buffer overflow in scenery 2014-12-14 15:00:22 +00:00
IntelOrca 02b497f9c6 use old game for climate variables so they load and save to games still 2014-12-11 19:39:14 +00:00
Duncan Frost d3de21463a Fix #625 issue caused by unitialised variable 2014-12-11 18:26:44 +00:00
IntelOrca 6c0f12201e fix language reading for UTF-8 BOM and any encountered strange sequence of bytes 2014-12-11 13:38:12 +00:00
IntelOrca ff478b8673 implement editor objective options window 2014-12-10 23:07:11 +00:00
IntelOrca e887311219 add more cheats to cheat window and a small amount of refactoring 2014-12-10 01:44:30 +00:00
IntelOrca bfafc0e149 fix warnings and only allow cheats in play mode 2014-12-09 19:55:17 +00:00
IntelOrca 726fd9ef1d add RIDE_LIFECYCLE_18 to enum 2014-12-09 19:46:42 +00:00
Duncan Frost eed854ed6f Fixed #621 error caused by signed word expanding incorrectly to an unsigned dword 2014-12-08 16:20:02 +00:00
Duncan Frost 68fe54cfdd refactor object loading, part 2 2014-12-07 21:58:19 +00:00
IntelOrca 1ed6e443ca refactor object loading, part 1 2014-12-07 21:45:42 +00:00
Ted John e570eca31e Merge pull request #619 from halfbro/master
Partially Fix #551
2014-12-05 17:14:07 +00:00
IntelOrca 98348cd539 set default config option confirm prompt to false 2014-12-04 21:20:11 +00:00
Duncan Frost c5c9609b37 Fixed the buffer overflow. Increased the number of pixels again 2014-12-04 20:39:49 +00:00
halfbro 4902bad9b9 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-12-04 00:57:41 -05:00
halfbro 242bee9a07 Update rain pixels to use own global variable 2014-12-04 00:51:58 -05:00
Duncan Frost ef0b29d996 Fixed issue preventing rides from being destroyed 2014-12-03 20:37:38 +00:00
Duncan Frost ee35f9fb4f Fix #615. Issue caused by variables not being set 2014-12-03 20:19:02 +00:00
Duncan Frost f11f2f270f Added enough of ride_construction to fix #601 2014-12-02 18:09:13 +00:00
Duncan Frost d1c49ee32b Fix #600. Issue caused by not passing model_type argument 2014-12-01 17:16:30 +00:00
Duncan Frost a11f7fbd7c Fix #610. Pause toggle display issue. 2014-12-01 17:04:47 +00:00
IntelOrca 325c5243e8 change plugin.dat to be saved in user directory and stop repeated load of title screen when failed 2014-11-30 22:16:42 +00:00
IntelOrca 38184aa995 Merge branch 'fix_543' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-fix_543 2014-11-30 22:08:57 +00:00
Duncan Frost cbd7e0c096 Reversed 684ac3 2014-11-30 22:00:41 +00:00
Duncan Frost 8354304299 Added object_load_list. Fixes various object loading related bugs 2014-11-30 21:16:36 +00:00
IntelOrca d00001fed2 remove unnecessary header includes 2014-11-30 20:27:14 +00:00
Duncan Frost 743e27040f Possible fix to #543 2014-11-30 18:42:51 +00:00
IntelOrca 31ebf03c30 implement enter name on scenario complete, closes #605 2014-11-30 02:17:01 +00:00
IntelOrca 88b425f6a7 implement ride open station and ride open vehicle, partial fix for #601 2014-11-29 15:55:44 +00:00
IntelOrca 0492c966d7 fix ride shop item colouring in ride window, fixes #602 2014-11-29 13:54:53 +00:00
IntelOrca 1266f19a5c fix ride profit calculation, fixes #603 2014-11-29 13:33:39 +00:00
halfbro 47a307d50a Fix rain not drawing on high resolutions 2014-11-29 00:40:53 -05:00
IntelOrca 35145f897b optimise writing of checksum on save scenario 2014-11-28 18:00:18 +00:00
IntelOrca 0a51752bd9 fix map shortcut, fixes #599 2014-11-26 21:47:11 +00:00
IntelOrca cc36cafcaa remove redundant variable from encode_chunk_repeat 2014-11-26 16:30:41 +00:00
IntelOrca 85c41488ce implement RLECOMPRESSED chunk encoding, closes #598 2014-11-26 16:27:21 +00:00
IntelOrca 4b897ae1a3 implement saving of games and scenarios 2014-11-26 00:51:26 +00:00
IntelOrca e6fc8cacf8 implement scenario_prepare_rides_for_save 2014-11-25 22:38:47 +00:00
IntelOrca aee1b3825e fix object_free_scenario_text problem in window_editor_object_selection 2014-11-25 21:49:05 +00:00
IntelOrca 8072dc14fb fix climate_reset, not setting current climate variables, fixes #595 2014-11-25 21:40:43 +00:00
IntelOrca d9e0f8ff6a implement save scenario and fix various load / save dialog issues, fixes #433 2014-11-25 02:06:26 +00:00
IntelOrca 8e3ee3f7e9 implement bare minimum so that close button is implemented on object selection window, partial fix for #433 2014-11-24 23:05:35 +00:00
Miso Zmiric (Mike Squinter) b75612467a rename to follow convention and add the hack comment 2014-11-24 22:07:28 +00:00
Miso Zmiric (Mike Squinter) 1f60018acd fix crash on window size decrease 2014-11-24 22:02:04 +00:00
Ted John eb83dfa4d5 Merge pull request #591 from mzmiric5/cheat-window-remap-to-keystroke
closes #588, adds minor fixes
2014-11-24 17:39:55 +00:00
Miso Zmiric (Mike Squinter) a7f015669a fix erroneous position calculation due to additional offset 2014-11-24 17:37:45 +00:00
IntelOrca 5190862573 fixes #337 - shortcut keys on title screen propagating to game 2014-11-24 17:18:21 +00:00
Miso Zmiric (Mike Squinter) 1e6c9ddfd8 map cheat window to shortcut, hide fast forward button, fix toolbar autolayout 2014-11-24 16:38:19 +00:00
IntelOrca 73a6b1acea implement editor_read_s6, partial fix for #433 2014-11-24 02:58:48 +00:00
IntelOrca adb5f84f55 implement editor_convert_save_to_scenario 2014-11-23 23:03:59 +00:00
IntelOrca 0e0e9c9840 merge qcz editor early to help finish other editor parts 2014-11-23 16:28:23 +00:00
IntelOrca ca384e0b51 fix #278, objective window complete / fail text mis-aligned 2014-11-22 23:45:30 +00:00
IntelOrca b68a3cb43d improve RCT2 install directory problems, fixes #587 2014-11-22 23:30:03 +00:00
IntelOrca 7cbd80a593 fix screenshot problems, fixes #257, fixes #579, fixes #583 2014-11-22 22:05:38 +00:00
IntelOrca 3fc10f53bf fix #581 can remove park entrance bug 2014-11-22 20:33:31 +00:00
IntelOrca 453a5fd910 fix GCC errors with diagnostic errors 2014-11-21 19:32:13 +00:00
Duncan Frost 913adaffa0 Added error messages to loading objects 2014-11-21 19:09:20 +00:00
IntelOrca 335774dc08 add log level check so that --verbose option works 2014-11-21 18:39:56 +00:00
Ted John 5395f099da Merge pull request #574 from duncanspumpkin/fix_load_fail
Fix load fail
2014-11-21 09:47:42 +00:00
Duncan Frost 7252667a25 Implemented the same changes to scenario load. Error messages now copied onto cmd prompt 2014-11-20 19:02:27 +00:00
Duncan Frost 8e566e8598 Finished load related fail 2014-11-20 18:40:10 +00:00
Duncan e05d5f1922 Add remaining part that caused load to enter hybrid sate.
This should fix the remaining loading issues but it is untested at the moment. Note sub_675827 is not finished!
2014-11-20 12:52:42 +00:00
Duncan Frost 816f8661a5 Started adding sub_675827 2014-11-19 22:05:42 +00:00
Duncan Frost 4459d127d0 Found cause of crash. Game will enter hybrid state when failed to load. 2014-11-19 21:46:32 +00:00
Myx b18e07e4bb [bugfix] saved ebp before ebx in order to fix #572 2014-11-19 21:27:50 +01:00
Duncan Frost 4af9f226f4 Fix loading save money bug. 2014-11-18 20:33:21 +00:00
Duncan Frost bfa2c6e010 Fix drawing crash mentioned in #428. Could not exceed max attractions any more. 2014-11-18 19:51:28 +00:00
Ted John af1cd86a35 Merge pull request #570 from duncanspumpkin/peep_update
Peep update
2014-11-18 13:26:53 +00:00
IntelOrca d821456709 fix don't save button on quit game prompt, fixes #465 2014-11-17 01:20:20 +00:00
Ted John 3876965c07 update src/readme.md 2014-11-16 15:37:41 +00:00
Duncan Frost e822894de9 Added peep_update_watering 2014-11-16 14:05:10 +00:00
Duncan Frost 7984c0cbe0 Added peep_update_emptying_litter. 2014-11-16 12:52:52 +00:00
Duncan Frost e54a0bd9bf Fix build 2014-11-15 20:27:53 +00:00
Duncan Frost f07bafef31 Labled destination_x/y peep offsets. 2014-11-15 20:23:21 +00:00
Duncan Frost c2e187522c Added update_mowing. Fixed peep thought bug. Fixed viewport footpath bug. 2014-11-15 19:45:49 +00:00
Duncan Frost 4aff805727 Refactor thought update. Removed bug in updating thoughts 2014-11-15 19:45:47 +00:00
Duncan Frost 68e7b8666c Added sub_68F3AE some sort of ground check 2014-11-15 19:45:46 +00:00
Duncan Frost ca8d76f4dd Added peep_update_sweeping 2014-11-15 19:45:45 +00:00
Duncan Frost 4a4bb28c36 Added peep_update_1 2014-11-15 19:45:45 +00:00
Duncan Frost 38e1669c7d Added peep_update_leaving_park. Fixed bug in watching 2014-11-15 19:45:43 +00:00
Duncan Frost 93b408f7f3 Added peep_update_watching 2014-11-15 19:45:42 +00:00
Duncan Frost 135abc90a4 Added sub_693b58 2014-11-15 19:45:42 +00:00
IntelOrca 2b7142e49f attempt to fix #566 and other bugs, also refactor some footpath related functions 2014-11-15 18:22:06 +00:00
zsilencer 2dcd3b4935 use mixer for ride music 2014-11-13 19:51:02 -07:00
zsilencer c3086a5b9f finish ride music decompile 2014-11-12 18:32:33 -07:00
zsilencer 0e414ebae7 #558 2014-11-12 18:32:33 -07:00
IntelOrca 2be36b1621 fixes #564 - ebp not restored on mouse down event call 2014-11-12 22:59:50 +00:00
Duncan Frost 59ef4ac0e3 Added peep_actions set var_71 to these values 2014-11-12 19:09:17 +00:00
Duncan Frost bd06488450 Fix peeps sitting. Renamed a function to sprite_move 2014-11-12 17:45:39 +00:00
Adrian Wielgosik ad2502e4d5 - fixed a condition in sub_6939EB that compared against a wrong field
- added a missing break that caused the wrong text to be displayed in ride window
2014-11-12 12:30:28 +01:00
IntelOrca 5a4b940fc2 fix and refactor window event calls 2014-11-11 20:51:25 +00:00
IntelOrca 0cef1c9517 refactor input widgets and keyboard_shortcut screen flags 2014-11-11 16:06:51 +00:00
IntelOrca 53c8a20e0b refactor input window position and resize 2014-11-11 00:20:06 +00:00
IntelOrca d8844513a1 remove windows.h from input.c and improve window resize 2014-11-10 22:37:55 +00:00
Duncan Frost 502b4c4cbd Fix peeps walking on water after entering. Added some known offsets. 2014-11-10 17:23:13 +00:00
IntelOrca 798efef6e7 use standard integer constants 2014-11-10 02:30:55 +00:00
IntelOrca e4bd82347e refactor some of the input functions 2014-11-10 02:17:45 +00:00
IntelOrca d111c715d6 implement viewport_interaction_get_item_left 2014-11-10 00:40:59 +00:00
IntelOrca 13b56f68d3 add window snapping 2014-11-09 17:18:51 +00:00
Duncan Frost a375068f66 Remove redundant comment 2014-11-09 08:52:23 +00:00
Duncan Frost 8f2b180603 Fix another viewport issue by removing new function call it can be fixed at a later date. Change viewport address name to make it more obvious how to use it. 2014-11-09 08:50:02 +00:00
IntelOrca 6aa0241c23 fix string format, peep real names not popping arguments 2014-11-06 23:15:17 +00:00
Ted John 471fb2a45d Merge pull request #556 from duncanspumpkin/fix_viewports
Fix viewports
2014-11-06 22:29:44 +00:00
IntelOrca d556e5032b fix custom strings not popping arguments 2014-11-06 22:11:54 +00:00
Duncan Frost 2ddbc8f190 Found cause of viewport issue. Added invalidate_sprite function. 2014-11-06 21:42:18 +00:00
Duncan Frost f3da25622a Added start of new function 2014-11-06 21:16:48 +00:00
Duncan Frost 21dd6f227d Added some more viewport functions 2014-11-06 21:16:47 +00:00
Duncan Frost 3003419160 Add debug flag to dirty box draw 2014-11-06 21:16:46 +00:00
Duncan Frost 1a857edc21 Playing about with viewport setup 2014-11-06 21:16:45 +00:00
Ted John 74a0110b0d Merge pull request #555 from duncanspumpkin/weather_cheats
Added force sun/thunder cheat.
2014-11-05 21:05:36 +00:00
IntelOrca f1cc82f258 prepare for left viewport interaction implementation 2014-11-05 20:28:51 +00:00
Duncan Frost 97abffd4e8 Added force sun/thunder cheat. 2014-11-05 20:26:27 +00:00
IntelOrca 62be863476 refactor viewport interaction functions 2014-11-05 19:42:19 +00:00
IntelOrca ea6b0de6a6 refactor and move keyboard shortcuts to a new source file 2014-11-05 18:50:51 +00:00
Ted John a773ada29e Merge pull request #554 from duncanspumpkin/peep_update
Peep update
2014-11-05 17:54:52 +00:00
Duncan Frost 3016011949 Refactor scroll_input 2014-11-05 17:17:56 +00:00
Duncan Frost c1ef7ac61f Use reversed peep functions where required 2014-11-05 16:45:42 +00:00
Duncan Frost f85a2e8ad9 decompiled 6939EB unsure of its use 2014-11-05 16:35:23 +00:00
Duncan Frost 481fd08ab5 Added update_picked and update_entering_park. Added new entries to peep struct 2014-11-05 16:35:22 +00:00
Duncan Frost 97d47c3039 Fix merge fail 2014-11-05 16:35:20 +00:00
Duncan Frost c861a999ce Finished peep update sitting 2014-11-05 16:35:19 +00:00
Duncan Frost c033965faa Added start of peep sitting update. Fixed bug that caused peeps to spin 2014-11-05 16:35:19 +00:00
Duncan Frost 22df12c1c8 Added sub_69e9d3 a sprite moving function 2014-11-05 16:35:18 +00:00
Duncan Frost 573fe0c6f7 Added peep_decrement_num_riders 2014-11-05 16:35:17 +00:00
Duncan Frost 388b8ec337 Added peep_window_state_update 2014-11-05 16:35:16 +00:00
Duncan Frost 2f64d2a6db Fixed bugs and refactored 2014-11-05 16:35:16 +00:00
Duncan Frost 5439aa8755 Finished peep_update_falling 2014-11-05 16:31:23 +00:00
Duncan Frost 61e1645de0 Added a very small bit of not drowning 2014-11-05 16:31:22 +00:00
Duncan Frost 606d8c5a25 Added peep_update_drowning. 2014-11-05 16:31:21 +00:00
Duncan Frost bfe45e5996 Refactored insert_thought 2014-11-05 16:30:22 +00:00
Duncan Frost 95557bc732 Added peep_insert_new_thought 2014-11-05 16:30:21 +00:00
Duncan Frost 11c4ac52ac Added notes on peep actions 2014-11-05 16:30:19 +00:00
Duncan Frost 0624736b47 Decompiled PEEP_STATE_QUEUING 2014-11-05 16:30:19 +00:00
IntelOrca 0e223c524e implement sub_6EDE88 2014-11-05 16:14:12 +00:00
IntelOrca 2f4fd67170 implement more viewport input functions 2014-11-05 14:38:19 +00:00
IntelOrca ad84e6d076 implement ride_modify and supporting methods 2014-11-05 02:55:29 +00:00
IntelOrca 508ed131f7 implement sub_6CC3FB 2014-11-04 21:39:03 +00:00
IntelOrca 39ad49bac9 implement find mechanic in ride window 2014-11-04 19:33:17 +00:00
IntelOrca 0104042640 Merge branch 'ride-update'
Conflicts:
	src/world/map.c
2014-11-04 19:01:59 +00:00
IntelOrca d92a4d9418 implement clear scenery game command, try out removing paths feature 2014-11-04 03:34:48 +00:00
IntelOrca 015e85d263 refactor station update and fix bugs 2014-11-04 01:07:54 +00:00
Ted John c75ae048a4 Merge pull request #550 from duncanspumpkin/zero_clearance
Added zero clearance cheat tool
2014-11-03 23:03:22 +00:00
IntelOrca 073a747660 fix ride update, financial statistics 2014-11-03 21:53:22 +00:00
IntelOrca 1b8a88e828 add more gentle / thrill ride rating calculation functions 2014-11-03 21:24:10 +00:00
Duncan Frost 70c06d62ef Added zero clearance cheat tool. Warning does not clean itself up 2014-11-03 21:15:35 +00:00
IntelOrca 8ab3188914 Merge branch 'master' into ride-update
Conflicts:
	projects/openrct2.vcxproj.filters
2014-11-03 17:37:08 +00:00
IntelOrca 3ecfee72a2 refactor ride_get_measurement 2014-11-03 17:20:07 +00:00
Ted John e2ed908a79 Merge pull request #546 from duncanspumpkin/window_sign
Window sign
2014-11-02 18:26:01 +00:00
Duncan Frost c6bda25ddf Fixes none generation of tracks.idx. This is not how rct2 does it 2014-11-02 15:48:18 +00:00
Duncan Frost c87e373ced Added window_sign_small 2014-11-02 14:16:44 +00:00
Duncan Frost 49ccea7f26 Fix remaining bugs with window_sign(large) 2014-11-02 14:16:43 +00:00
Duncan Frost 828c6ff7a2 Added window_sign. Invalidate function to be finished 2014-11-02 14:15:18 +00:00
Duncan Frost 880cf21d6f Added code to call sign windows 2014-11-02 14:15:17 +00:00
IntelOrca 19d3852f9c refactor update ride more 2014-11-02 14:03:28 +00:00
Duncan Frost 40a26f689f Added demolish ride prompt 2014-11-02 08:39:01 +00:00
IntelOrca cf59455d69 refactor ride update and fix bugs 2014-11-02 03:38:05 +00:00
IntelOrca 3d40c7e3ee add various ride mechanic functions 2014-11-02 01:41:00 +00:00
IntelOrca e4dc9b8c8e improve ride update and add some breakdown functions 2014-11-01 22:21:28 +00:00
Duncan Frost f58be44a20 Remove previous hack 2014-11-01 13:13:11 +00:00
Duncan Frost 53e0ebc57c Refactored a bit of tooltip window. Added hack to fix #540 note this should be fixed better 2014-11-01 13:10:14 +00:00
IntelOrca 1d3fc842e3 fix bugs and refactor ride update 2014-11-01 03:32:57 +00:00
IntelOrca 1095c1d33a finish update ride, still testing and refactoring to go 2014-11-01 01:25:25 +00:00
IntelOrca 7f7c380bd6 fix ride_get_station_start_track_element 2014-10-31 02:37:28 +00:00
IntelOrca 7e17f4fcf9 start implementing ride update and station update 2014-10-31 02:33:33 +00:00
Duncan Frost ae09e6ffcc Fix issues with peeps picked up 2014-10-30 09:09:04 +00:00
Duncan Frost 605c62f566 Window banner complete 2014-10-21 17:59:47 +01:00
IntelOrca 287b614392 fix window_map_tooltip using original window events instead of new 2014-10-21 11:07:11 +01:00
IntelOrca 9299588663 Merge branch 'german' of https://github.com/Yepoleb/OpenRCT2 into Yepoleb-german 2014-10-21 10:59:54 +01:00