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

359 Commits

Author SHA1 Message Date
zsilencer 623e607dfd game_command_fire_staff_member 2015-04-25 09:20:15 -06:00
zsilencer 97bd30ece7 game_command_set_staff_patrol 2015-04-25 09:20:15 -06:00
zsilencer ab9e250abe game_command_set_staff_order 2015-04-25 09:20:14 -06:00
zsilencer 08a5bea762 game_command_demolish_ride 2015-04-25 09:20:14 -06:00
IntelOrca b1d6c34a00 implement money_effect_create 2015-03-31 03:23:40 +01:00
IntelOrca 851b0819b9 clean up many CALL_PROCs and implement a few functions 2015-03-31 02:21:30 +01:00
IntelOrca d1e4fe8060 implement scenery_set_default_placement_configuration 2015-03-29 02:29:07 +01:00
IntelOrca 745614c959 refactor misc. sprites and implement jumping_fountain_begin 2015-03-23 10:39:47 +00:00
IntelOrca 7d383a586e implement map_update_tiles, grass growing and scenery aging 2015-03-22 17:04:50 +00:00
Duncan Frost 4171289050 Added game_command_set_ride_setting. 2015-03-20 22:33:06 +00:00
IntelOrca cd16af0f60 add some event handlers for invalidating map objects 2015-03-18 19:52:45 +00:00
Duncan Frost a04de29bf8 Finish refactor of object_list.c 2015-03-07 12:45:13 +00:00
Duncan Frost 936f2f127f Refactor of object_list.c 2015-03-07 11:13:10 +00:00
Duncan Frost 013be11aed Refactored water and entrance paint functions 2015-03-01 21:06:51 +00:00
Gericom ec3e7edcec Implemented paint_ride_entry 
Translated ride names and descriptions! (only the names in the scenario
editor are still in english somehow)
 2015-02-26 14:47:34 +01:00
IntelOrca 5912b412c7 fix autosave bug, fixes #855 2015-02-24 00:30:25 +00:00
IntelOrca 7fbcc3598d ensure scenario path is set when loading a saved game 2015-02-22 18:24:19 +00:00
IntelOrca a3df2527b0 implement autosaving, closes #778 2015-02-21 11:05:15 +00:00
IntelOrca 2ab48c998e Merge branch 'set-ride-status' into develop 
Conflicts:
	src/ride/track.h
 2015-02-17 17:00:47 +00:00
IntelOrca 7f0ed995b5 improve reading and saving of configuration 2015-02-16 22:47:11 +00:00
Adrian Wielgosik 4c98d01a67 Reduced frequency of flickering in map window by 4 2015-02-16 22:24:21 +01:00
Adrian Wielgosik bfe401c778 Refactor code related to map flashing, removed a small mistake related with it 
Removed code related to map flashing from title_update
 2015-02-16 18:53:47 +01:00
IntelOrca ac4cd56b63 add new load / save window, closes #580 2015-02-14 02:16:03 +00:00
IntelOrca 886f30d00c Merge branch 'develop' into footpath-commands 2015-02-13 19:32:13 +00:00
IntelOrca a66b29076b move osinterface code to shared or windows 2015-02-12 20:51:40 +00:00
IntelOrca 9d2abf1925 add map generation window 2015-02-09 18:32:58 +00:00
IntelOrca a6c95f1f38 Merge branch 'develop' into set-ride-status 
Conflicts:
	src/ride/track.c
	src/windows/ride_construction.c
 2015-02-08 16:04:35 +00:00
IntelOrca 4a9dfcc849 implement scenario_create_ducks 2015-02-08 15:37:33 +00:00
IntelOrca dfc723573c fix expenditure table issues, fixes #762 2015-02-08 14:31:57 +00:00
Duncan Frost 0f6dd51736 Added load_palette. Labelled offset for paused and palette effect frame. Fixed fast moving water. 2015-02-07 17:40:20 +00:00
IntelOrca debafcf051 code set ride status, not yet fixed and tested 2015-01-29 00:16:34 +00:00
IntelOrca 36971b29cb implement game_command_set_park_name and game_command_remove_park_entrance 2015-01-27 21:18:41 +00:00
IntelOrca 1c18f80f07 implement game_command_set_ride_name 2015-01-27 02:05:54 +00:00
IntelOrca ba4d9b3975 implement game_command_set_park_open 2015-01-25 00:20:53 +00:00
IntelOrca dfb1f055b9 implement game_command_set_current_loan 2015-01-24 19:07:35 +00:00
IntelOrca 475c98c540 implement game_command_set_research_funding 2015-01-24 18:41:55 +00:00
IntelOrca eec7e2e458 implement marketing_start_campaign 2015-01-24 18:22:06 +00:00
IntelOrca 3a8f85b7d2 implement footpath remove and create, bugs exist 2015-01-14 23:51:59 +00:00
IntelOrca 0ff125b9b3 move across useful map functions and other bits from footpath branch to develop 2015-01-14 23:38:48 +00:00
Duncan Frost 974ecd904c Finish game command 20 change surface style 2015-01-12 18:39:53 +00:00
Duncan Frost 8a4e12a3f4 Started game_command_20 raise lower land 2015-01-12 18:39:52 +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
IntelOrca 4b897ae1a3 implement saving of games and scenarios 2014-11-26 00:51:26 +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 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
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
Duncan Frost 4af9f226f4 Fix loading save money bug. 2014-11-18 20:33:21 +00:00
Duncan Frost bd06488450 Fix peeps sitting. Renamed a function to sprite_move 2014-11-12 17:45:39 +00:00
Duncan Frost 2ddbc8f190 Found cause of viewport issue. Added invalidate_sprite function. 2014-11-06 21:42:18 +00:00
Duncan Frost 1a857edc21 Playing about with viewport setup 2014-11-06 21:16:45 +00:00
IntelOrca ea6b0de6a6 refactor and move keyboard shortcuts to a new source file 2014-11-05 18:50:51 +00:00
Duncan Frost 22df12c1c8 Added sub_69e9d3 a sprite moving function 2014-11-05 16:35:18 +00:00
IntelOrca d92a4d9418 implement clear scenery game command, try out removing paths feature 2014-11-04 03:34:48 +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
Sijmen Schoon a7b1e50a92 Implement redraw_peep_and_rain 2014-10-20 23:20:13 +02:00
IntelOrca ae85fc265e implement window_map_tooltip 2014-10-17 02:01:58 +01:00
IntelOrca ece2522273 refactor window search functions 2014-10-16 02:02:43 +01:00
IntelOrca 6fe1bace20 refactor input (flags in particular) and add sub_6EA73F 2014-10-15 22:59:26 +01:00
IntelOrca 70a33f6593 refactor game_logic_update 2014-10-09 20:31:58 +01:00
IntelOrca dcb7fde625 Merge branch 'master' into cmdline-scenario 2014-10-08 23:32:51 +01:00
IntelOrca db85a215f9 move rain drawing functions into its own module 2014-10-08 23:17:16 +01:00
IntelOrca 1d92e3d7ab Merge branch 'master' into reorganise-src 
Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
	src/audio/audio.c
	src/audio/mixer.h
	src/game.c
	src/ride/vehicle.c
	src/windows/finances.c
	src/windows/research.c
 2014-10-07 19:10:16 +01:00
IntelOrca daf231a2e9 organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
IntelOrca c8df6174b8 organisation: fix includes 2014-10-06 17:36:58 +01:00
IntelOrca 95a9b1ca2e implement research_update 2014-10-05 15:23:52 +01:00
Ted John f6bdab1eea Merge pull request #498 from duncanspumpkin/renable_cso 
Renable cso
 2014-10-04 12:23:42 +01:00
zsilencer f2e501134e palette effects 2014-10-02 19:04:29 -06:00
Duncan Frost 335aca4164 Cso now partially working. 2014-10-01 18:52:53 +01:00
Duncan Frost ddc047241e Added some checks on object loading to eventualy fix #225 2014-09-24 17:47:19 +01:00
IntelOrca 42ef09253e implement ride measurement update 2014-09-21 13:50:35 +01:00
zsilencer 44683a9246 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-09-15 15:12:48 -06:00
zsilencer 298de189f5 0x006BBC6B, hook 2014-09-15 15:12:25 -06:00
Duncan Frost 463fe459aa Add notes to game_do_command. Explode magic number into parts 2014-09-15 20:49:04 +01:00
IntelOrca 645b8fbb46 add edit command line function 2014-09-10 19:36:11 +01:00
qcz 5be600cf5b Fix double payment in game_do_command 2014-09-06 09:45:23 +02:00
zsilencer a284d446ee Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 
Conflicts:
	src/addresses.h
 2014-09-01 20:20:03 -06:00
zsilencer b02463478b few basic functions decompiled and small bug fix 2014-09-01 00:12:46 -06:00
adrian17 6473da43b2 Decompiled game_command_set_park_entrance_fee 2014-08-29 11:37:32 +02:00
Ted John 4ddb26fc21 Merge pull request #364 from zsilencer/master 
Additional sound decompilation and fixes
 2014-08-25 19:14:45 +01:00
zsilencer 799797876a Audio fixes #361 #355 2014-08-24 22:18:01 -06:00
Marco Costa bb81bfd5d0 Created named address RCT2_ADDRESS_SCENARIO_TICKS 
* 0x00F663AC is now named RCT2_ADDRESS_SCENARIO_TICKS. This variable
starts at an arbitrary value, defined by the current scenario, and
increments by 1 on every game tick.
* Also, added meaningful name to some variables in draw_light_rain and
draw_heavy_rain.
 2014-08-24 21:27:56 -04:00
IntelOrca 83ba89214c move input functions to input code file 2014-08-24 18:45:47 +01:00
IntelOrca 02293c46a8 fixes #357, glitchy viewport dragging 2014-08-24 17:52:17 +01:00
qcz fa6caa856a Move staff related stuff to its own file 2014-08-20 23:48:36 +02:00
qcz 250acea957 Rename tabIndex to staff_type, move staff max count constant to #define 2014-08-20 17:48:47 +02:00
qcz 12f6d57876 Fix pointer type 2014-08-20 17:39:41 +02:00
qcz f142cddbd6 Add return type to remove Travis warnings 2014-08-20 16:04:10 +02:00
qcz 1007e79baa Fix Travis error 2014-08-20 16:00:47 +02:00
qcz 92f0139b5a Move typedef to header file 2014-08-20 15:48:53 +02:00
qcz cb169952ac Remove unused variable, add indices to new_game_command_table 2014-08-20 15:38:21 +02:00
qcz 1b3f98362f Finalize hire-staff-command 2014-08-20 15:32:39 +02:00
qcz 0e48e92949 Entertainers don't crash the game anymore 2014-08-20 07:23:02 +02:00
qcz 4959bdd55d Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-19 23:52:23 +02:00
hexdec 540c8efd23 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-19 22:41:13 +02:00
hexdec de01827de9 Decompiled game shortcuts for viewport flags. 2014-08-19 22:39:22 +02:00
Duncan Frost 5f68d4b2a0 Fix #318. Issue caused by checking progressivly more incorrect coordinates for connection 2014-08-19 20:41:46 +01:00
Duncan 56e6028a56 Rewrote to use map_elements 
not tested
 2014-08-19 12:48:00 +01:00
qcz 2bbba4672b Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-19 09:46:25 +02:00
qcz c88a786399 Fix peep struct member name 2014-08-19 09:46:04 +02:00
Duncan Frost ca49b7ca09 Fix crash on right click of flat rides 2014-08-17 11:57:50 +01:00
Duncan Frost 9e5412579a Moved old function comment to top of func 2014-08-16 14:40:07 +01:00
Duncan Frost ad8a96c196 Added remaining left click on viewport functions 2014-08-16 14:38:45 +01:00
Duncan Frost 1adeb35e69 Decompiled first part of left down 2014-08-16 00:43:19 +01:00
qcz ff28ff7e1b Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-13 22:18:31 +02:00
qcz a992e31113 Fixes on the hire staff command (there is still a bug when hiring entertainers) 2014-08-11 22:50:13 +02:00
qcz c74640d9c4 Start to decompile hire new staff member command (not working yet) 2014-08-10 14:31:41 +02:00
Duncan Frost b98d4bb508 Viewport integrated into gfx_draw_sprite. 2014-08-10 11:11:43 +01:00
IntelOrca e8fa6b7c5a finish finances summary page 2014-08-09 14:47:58 +01:00
Duncan Frost 57f17f62e5 Moved function to gfx.c added new addresses 2014-08-08 17:19:08 +01:00
Duncan 13b51fe475 More cleanup of gfx_rain. 2014-08-08 16:36:47 +01:00
Duncan Frost 5257f368c9 Cleaned up rain code. Remember to remove constant rain 2014-08-08 16:36:46 +01:00
Duncan Frost 6ec15b240b Fix compile mistakes 2014-08-08 16:36:45 +01:00
Duncan ca38d60b6f Cleaned up 684027 
Not tested.
 2014-08-08 16:36:44 +01:00
Duncan be1d3ff74a Added very rough 0x684027 function 2014-08-08 16:36:43 +01:00
IntelOrca 96aaa87543 make both game commands use same call and rename / use more commands in enum 2014-08-07 22:25:51 +01:00
Marco Costa cc1e2248de Decompile of rain-drawing functions 
Light rain function at position 0x00684114
Heavy rain function at position 0x0068416D
Function array at position 0x009AC058
Avoid passing uint32 function address. Instead use the array index.
 2014-08-06 20:40:42 -04:00
qcz 1baf54a051 Enum for the command table; cleanup warnings and comments from the previous commit 2014-08-06 21:06:51 +02:00
Dániel Tar fa931e1ff0 Decompiling window_staff 2014-08-05 19:15:28 +02:00
anyc 305cef2f75 fix errors and warnings with mingw 2014-07-31 00:11:01 +02:00
Duncan Frost 3acb1a72ba Fixes cursor error when main window is at increased size. 2014-07-29 18:05:52 +01:00
adrian17 bc814f395e Fix window_map_mouseup() (it was callling window_options_mouseup() instead) 2014-07-29 16:52:11 +02:00
Duncan Frost e406869fe4 Cleanup of last goto's. 2014-07-28 21:27:14 +01:00
Duncan Frost 6818d31492 Rework of cursor code 2014-07-28 18:15:02 +01:00
Duncan Frost 425ab513a4 Started cleanup of process mouse over 2014-07-28 17:45:50 +01:00
Duncan Frost cdb60bab6c Fixed pointing locations. 2014-07-28 17:45:49 +01:00
Duncan Frost e321708e05 Debugging 2014-07-28 17:45:46 +01:00
Duncan Frost d84ed93c62 Added JeroenSack's decompile of mouse over. 2014-07-28 17:45:45 +01:00
Duncan Frost 2fd87342af Trying a different set_cursor interface to make multiple os support easier 2014-07-28 17:45:44 +01:00
Duncan Frost 6f8cefac21 Added a setcursor function 2014-07-28 17:45:44 +01:00
adrian17 46889b6890 Remove duplicated SCROLL_FLAGS enum 2014-07-27 16:39:20 +02:00
adrian17 8960792073 Add SCROLL_FLAGS enum (and fix an hidden bug in widget_scroll_get_part) 2014-07-25 20:19:32 +02:00
Duncan Frost d68e716cd8 Removed compile errors. Implemented changes to window.h 2014-07-23 18:07:38 +01:00
adrian17 0369bdcb34 Improvements for a9091b41b6 
* renamed variables and functions
* simplified logic copied from other functions
* removed "fast staff" button
* commented the macros in window_cheats.c
* changed water tool bottom limit back to 1 (it doesn't work the same way as the land tool)
* used 1ULL for bit shift by 32
 2014-07-21 14:05:43 +02:00
Ted John 8f1fa5b9ee Merge pull request #216 from wolfreak99/master 
Cheats, temporary cheat placement macro for convenince, audio option, co...
 2014-07-20 22:12:43 +01:00
Marco Costa 54933646f1 Implement draw_rain_window and call_draw_rain_func 
Implement procedure (0x006842AF) as two methods: draw_rain_window and
call_draw_rain_func.
Avoid using global variable 0x00EE7850 by passing it as a parameter:
draw_rain_func. This global variable was only used by these procedures.
Rain has some visual artifacts in RCT2, specially when using game
windows. This implementation matches the original game, and thus has the
same artifacts.
 2014-07-20 02:50:06 -04:00
Duncan Frost 5f030c6b1e Cleaned up code to remove goto. 2014-07-19 12:04:32 +01:00
Duncan Frost 6727c216e4 fixed bug due to incorrect function calls 2014-07-19 11:55:34 +01:00
Duncan Frost c4f49bb7cd Added missing case still not working 2014-07-19 11:22:46 +01:00
Duncan Frost 00381d9313 Deleted twice reversed function added note to prevent this happening. Labled global vars where noticed. 2014-07-19 11:22:45 +01:00
Duncan Frost cbb913c8af Added final part of input_scroll_left. Requires more testing 2014-07-19 11:22:44 +01:00
Duncan Frost 3cc9863fc5 Added switch for scroll state 2014-07-19 11:22:43 +01:00
Duncan Frost 16860a8817 Added sub_6E9F92 determines scroll action type 2014-07-19 11:22:42 +01:00
Duncan Frost d8727e8998 Started reverse of scoll_left 2014-07-19 11:22:41 +01:00
Ted John 7d16c653cb Merge pull request #214 from adrian17/master 
Use address names from addresses.h
 2014-07-19 11:12:46 +01:00