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

1257 Commits

Author SHA1 Message Date
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
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
IntelOrca c7986d140c add widgets, sizing and basic events for new ride window 2014-08-19 21:33:05 +01:00
Ted John 654e40aaa5 Merge pull request #333 from qcz/hulang 
Add Hungarian language
 2014-08-19 21:31:57 +01:00
Ted John 9065837c9b Merge pull request #334 from qcz/316-fix 
Fix #316
 2014-08-19 21:31:18 +01:00
Ted John c7edafc627 Merge pull request #332 from duncanspumpkin/update_viewport_left 
Update viewport left and fix #318
 2014-08-19 21:30:32 +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
Duncan Frost 71b6389ec7 Fix 1 pixel width ride_window 2014-08-19 20:54:58 +01:00
Duncan Frost 5f68d4b2a0 Fix #318. Issue caused by checking progressivly more incorrect coordinates for connection 2014-08-19 20:41:46 +01:00
Ted John 2a09b03c43 Merge pull request #331 from duncanspumpkin/fix_317 
Fix #317 crash on viewing news items
 2014-08-19 20:31:06 +01:00
qcz a4bab7cd0d Add Hungarian language 2014-08-19 21:17:20 +02:00
Duncan Frost 3307560a74 Merge branch 'upadate_viewport_left' of https://github.com/duncanspumpkin/OpenRCT2 into update_viewport_left 2014-08-19 19:56:41 +01:00
Ted John 274c2dc36f Merge pull request #330 from qcz/window-staff-registers 
Clean up most of the inline assembly from windows
 2014-08-19 19:35:06 +01:00
Duncan Frost 3df3ff4d1c Fix #317 crash on viewing news items caused by double pointer de ref and reuse of same pointers. 2014-08-19 19:34:31 +01:00
IntelOrca 37258b4710 add polish language entry, #329 2014-08-19 19:31:51 +01:00
qcz 6473fd2b97 Maybe this will statisfy Travis 2014-08-19 20:22:13 +02:00
qcz 5c22530965 Fix coordinate type to avoid invalid cast 2014-08-19 20:08:09 +02:00
qcz bd06c7caee Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02: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
IntelOrca e222b88581 start work on new ride window 2014-08-17 23:57:41 +01:00
Ted John b5d796b48e Merge pull request #322 from hexdec/master 
Fixed resize gripper not showing up on guest and staff windows.
 2014-08-17 22:23:37 +01:00
hexdec 2f5f65d607 Fixed resize gripper not showing up on guest and staff windows. 2014-08-17 22:40:34 +02:00
Ted John e36836366d Merge pull request #312 from hexdec/master 
Initial window_staff_peep_open create window
 2014-08-17 20:17:30 +01:00
hexdec ea43709c27 Fixed using wrong class & flag. 2014-08-17 21:11:26 +02:00
IntelOrca 92b74a8deb handle utf8 characters in languages, convert appropriately for #319 2014-08-17 19:20:45 +01:00
hexdec 7071f68670 Merge branch 'window_staff_peep' of https://github.com/duncanspumpkin/OpenRCT2 
Conflicts:
	src/window_peep.c
 2014-08-17 16:30:01 +02:00
Ted John 83c047e632 Merge pull request #315 from duncanspumpkin/fix_303 
Fix crash on right click of flat rides
 2014-08-17 12:46:33 +01:00
Ted John 4262366cf5 Merge pull request #314 from duncanspumpkin/fix_graph 
Fixes upside down graph
 2014-08-17 12:46:24 +01:00
Duncan Frost ca49b7ca09 Fix crash on right click of flat rides 2014-08-17 11:57:50 +01:00
Duncan Frost b0d39bbf0e Added sepearte file for staff_peep_window 2014-08-17 11:45:43 +01:00
Duncan Frost aa0709c439 Fixed clicking on peep causing hybrid 2014-08-17 11:01:34 +01:00
Duncan Frost 6258a76b96 Fixes upside down graph 2014-08-17 10:52:12 +01:00
Duncan Frost 1943682153 Fixed bug in toolbar widget drawing. Added pause and zoom out disable. 2014-08-17 10:11:19 +01:00
hexdec d3a55efd30 Added window_peep_staff_events. 2014-08-17 01:37:28 +02:00
hexdec 7285dbc339 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-17 01:08:41 +02:00
IntelOrca 2dcdb09d05 partial fix to #305 2014-08-16 19:07:13 +01:00
IntelOrca 9b64c576c4 fixes #293, closes #301 (min/max) and fixes #304 (research window bug) 2014-08-16 18:15:27 +01:00
Ted John e3c407d5b5 Merge pull request #302 from duncanspumpkin/viewport_left_down 
Viewport left down
 2014-08-16 15:30:10 +01:00
IntelOrca 8b503a4722 change options window to tab interface 
To better group the options together and allow the window to be scalable with additional OpenRCT2 options, I have changed the window to a tab interface similar to the options window seen in Locomotion.
 2014-08-16 15:29:15 +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
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
Duncan Frost d8ab81c456 Fixed Zoom bug. No longer uses undefined behaviour. 2014-08-15 15:07:35 +01:00
Duncan Frost 4ec0920968 Trying to solve gfx issues 2014-08-15 14:46:26 +01:00
IntelOrca 0b744c684a add french language 2014-08-15 00:13:08 +01:00
IntelOrca 831e67068c Merge branch 'load_custom_text' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-load_custom_text 
Conflicts:
	src/string_ids.c
 2014-08-14 23:56:38 +01:00
IntelOrca e66b686f75 add ability to change language 2014-08-14 23:46:36 +01:00
Duncan Frost 12800b8d74 Removed warnings. Only reads 4 characters for string id 2014-08-14 23:08:46 +01:00
Duncan Frost 0251cf7679 Added comments capability to language.txt. Now reads string number 2014-08-14 23:01:57 +01:00
Duncan Frost 5bfe2d52f5 Added object_scenario_load_custom_text function 2014-08-14 23:01:56 +01:00
Ted John b306e1e28c Merge pull request #291 from duncanspumpkin/fix_286 
Fixes #286. Issue was caused by a typo.
 2014-08-14 22:27:01 +01:00
Duncan Frost 2345a510bf Fixes #286. Issue was caused by a typo. 2014-08-14 22:18:12 +01:00
Duncan Frost 412c9b689a Fix see through glass 2014-08-14 20:56:26 +01:00
hexdec 593841060f Removed unused parameters, fixed warning. 2014-08-14 15:33:57 +02:00
hexdec 5c1a19e1de Changed sub_6BEF1B to use window_create_auto_pos rather than the subfunction. 2014-08-14 15:28:22 +02:00
Ted John 462cd6d65b Merge pull request #280 from duncanspumpkin/gfx_invalidate_window 
Added gfx_invalidate_window
 2014-08-14 09:02:29 +01:00
Duncan Frost c5473266bb Added more cheat strings to load from language file 2014-08-14 07:47:23 +01:00
Duncan Frost bc2640314e Remove duplicate function. Change comment to prevent repeat 2014-08-14 07:22:47 +01:00
hexdec db42345d94 Used proper function for window_invalidate. 2014-08-14 00:32:18 +02:00
hexdec af06b5aae2 Changed sub_6EBED21 to use peep as a parameter. 2014-08-14 00:18:33 +02:00
hexdec 229dedbb64 Changed hardcode address to RCT2_ADDRESS_SPRITE_LIST. 2014-08-14 00:07:47 +02:00
hexdec 31440c9da7 Removed goto in sub_6BED21. 2014-08-14 00:01:17 +02:00
hexdec 6217440bc9 Added sub_6BED21 (called from sub_6BEF1B). 2014-08-13 23:41:13 +02:00
qcz ff28ff7e1b Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-13 22:18:31 +02:00
Duncan Frost 4292109753 Added gfx_invalidate_window 2014-08-13 20:47:30 +01:00
hexdec 3f10c76344 Cleaned up more code in sub_6BEF1B. 2014-08-13 21:22:59 +02:00
hexdec 67e0afca70 Removed comments, removed v3 variable. 2014-08-13 02:23:59 +02:00
hexdec 5d2e73ae25 Initial work on 0x006BEF1B. 2014-08-13 02:16:28 +02:00
IntelOrca bf8f2ed569 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git 2014-08-12 22:22:21 +01:00
IntelOrca b13f31f73e implement finance research tab 2014-08-12 22:22:16 +01:00
Duncan Frost cd1f71708e Fixed zoom bug. 2014-08-12 20:43:38 +01:00
Duncan Frost 3aaa9ef965 Tidy viewport code 2014-08-12 20:11:23 +01:00
Duncan Frost 3bbfd97224 Zooming working again. Graphical glitch along x=0 line. 2014-08-12 18:19:37 +01:00
Duncan Frost 9a33bc0597 Added zoom_masks 2014-08-12 08:02:18 +01:00
Duncan Frost ffaeca1a1c Zoomed land working. 2014-08-12 07:45:55 +01:00
Duncan Frost a44171205c Removed redundant comments about not being tested 2014-08-12 07:12:47 +01:00
Duncan Frost b3325bcb38 Cleaned up obsolete variables 2014-08-12 07:12:46 +01:00
Duncan Frost 00a9ab9da3 Added notes to draw_sprite 2014-08-12 07:12:46 +01:00
Duncan Frost 787340921e Swapped variable names to match game 2014-08-12 07:12:45 +01:00
Duncan Frost bc5ac887c5 Fix primary secondary tertiary colour sprites 2014-08-12 07:12:44 +01:00
Duncan Frost cdd15bf1fe Fixes water display issues. 2014-08-12 07:12:43 +01:00
Ted John 01974a0b9b Merge pull request #276 from hexdec/master 
Window_resize_gui for scenario editor and window_zoom_in/out
 2014-08-12 00:28:35 +01:00
IntelOrca b03c2ab77a implement new campaign window 2014-08-12 00:27:25 +01:00
hexdec befd430e59 Decompiled window_zoom_in and window_zoom_out. 2014-08-11 22:58:40 +02:00
hexdec ce812fe403 Added window_resize_gui_scenario_editor (0x0066F0DD). 2014-08-11 22:57:45 +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
Ted John 02d3c5ddbd Merge pull request #274 from duncanspumpkin/fix_272 
Fixes thick lines in line draw
 2014-08-11 07:23:17 +01:00
Duncan Frost a39412d28b Fixes thick lines in line draw 2014-08-11 07:05:46 +01:00
Duncan Frost 1350c64284 Fix issue with viewport draw caused by large x/y 2014-08-11 06:52:08 +01:00
IntelOrca 4f5b905760 implement finances graph tabs and marketing 2014-08-11 01:09:17 +01:00
IntelOrca 1169329b09 refactor graph drawing and add finances cash graph tab 2014-08-10 18:12:07 +01:00
qcz c74640d9c4 Start to decompile hire new staff member command (not working yet) 2014-08-10 14:31:41 +02:00
Duncan Frost 663a21dc95 Cleaned up drawing code 2014-08-10 11:11:46 +01:00
Duncan Frost e830502181 Switched back to rct2 zoom code 2014-08-10 11:11:45 +01:00
Duncan Frost 61ea5dded6 Fixed draw_sprite for large x/y. Zooming broken 2014-08-10 11:11:44 +01:00
Duncan Frost b98d4bb508 Viewport integrated into gfx_draw_sprite. 2014-08-10 11:11:43 +01:00
Duncan Frost d4a2cebc84 Still working out crashing bug 2014-08-10 11:11:42 +01:00
Duncan Frost 1c79d9c19a Started trying to integrate viewport draw function 2014-08-10 11:11:42 +01:00
Duncan Frost 8d888756ca Fix compile issues 2014-08-10 11:11:41 +01:00
Duncan 2bae41a1a1 Finished paint struct. Implemented paint_struct in code. 
Not tested.
 2014-08-10 11:11:40 +01:00
Duncan Frost 087cc64b16 Started adding new paint_struct 2014-08-10 11:11:40 +01:00
Duncan 6016fe2888 Added more to draw code. 
Still requires huge rewrite. Probably does not compile. Require to work out the structures pointed to by esi and ebp.
 2014-08-10 11:11:39 +01:00
Duncan Frost a9f3a30744 Started decompile of actual draw function 2014-08-10 11:11:38 +01:00
Duncan Frost 41c610ad4b Added start of one rotations setup 2014-08-10 11:11:38 +01:00
Duncan Frost 047b5196a1 Started decompiling litter paint prep function 2014-08-10 11:11:37 +01:00
Duncan Frost 8857b2fc6a Split the paint functions 2014-08-10 11:11:36 +01:00
Duncan Frost 2e8efe8006 Decompiled to end of sprite draw. 2014-08-10 11:11:36 +01:00
Duncan Frost 206029cc7b Fixed compile error added reference to address 2014-08-10 11:11:35 +01:00
Duncan 7a04adfdb1 started decompile of paint quadrant function 2014-08-10 11:11:34 +01:00
Duncan Frost 3b7ffe8b4a Decompiled view_menu dropdown. Fixed issue when no item selected. Added a post build event to copy langauge file. 2014-08-10 09:34:27 +01:00
IntelOrca e8fa6b7c5a finish finances summary page 2014-08-09 14:47:58 +01:00
IntelOrca cc93e6b7db finish partial support for language loading... new string test in cheat window 2014-08-08 18:47:28 +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 13d95ded35 prepare for loading a language file 2014-08-07 23:20:58 +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
IntelOrca 4a89b3dd5c refactor currency 2014-08-07 21:53:22 +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
Ted John 2365563583 Merge pull request #262 from qcz/wip-stafflist 
Decompiling the staff window
 2014-08-05 22:05:54 +01:00
Dániel Tar f87202f42f Remove unused enum 2014-08-05 19:54:44 +02:00
Dániel Tar fce067e667 Arrange includes and remove an unneccessary variable 2014-08-05 19:31:29 +02:00
Dániel Tar fa931e1ff0 Decompiling window_staff 2014-08-05 19:15:28 +02:00
Duncan Frost 7384350720 Fixes combo boxes not pointing at selected item 2014-08-04 17:07:20 +01:00
adrian17 ae85c697ee Save screenshots when PrintScreen is pressed 2014-08-03 18:13:15 +02:00
adrian17 8a70730f08 Make RCT2 know if LodePNG failed 2014-08-03 17:45:19 +02:00
Duncan Frost a00ac39b7e Fixes #218 @adrian17 did all the work for this fix. 2014-08-01 09:15:43 +01:00
Duncan Frost 83c197e312 Fixes issue where sound stops working after cancel is pressed 2014-07-31 20:14:00 +01:00
Ted John 397fbefa37 Merge pull request #253 from duncanspumpkin/fix_249 
Fixes #249
 2014-07-31 18:47:31 +01:00
Duncan Frost 265ae1a544 Fixes #249 2014-07-31 17:43:57 +01:00
adrian17 02df419548 Make window resizable again. 
Note: I can't simple place SDL_WINDOW_RESIZABLE in _fullscreen_modes[] because SDL ignores this flag in SDL_SetWindowFullscreen and if the user started the game in fullscreen and switched to window, it wouldn't be resizable.
The way I did it is the only way I know to make the window resizable regardless of whether the game was first started in window or in fullscreen.
 2014-07-31 11:41:00 +02:00
anyc 305cef2f75 fix errors and warnings with mingw 2014-07-31 00:11:01 +02:00
adrian17 ba08e4480c Disable resolution option when in borderless fullscreen 2014-07-30 14:55:40 +02:00
adrian17 5df3dbe671 Add the fullscreen mode to .ini config 2014-07-30 14:55:36 +02:00
adrian17 7d3e7a596e Create a dropdown for fullscreen in options window. Uses placeholder text. 2014-07-30 14:54:24 +02:00
adrian17 b83972715f Basic support for switching window/fullscreen with Alt+Enter 2014-07-30 12:54:36 +02:00
Ted John 1ffcbde7a1 Merge pull request #247 from adrian17/border_flash_fix 
Full fix for #195 (border flash bug)
 2014-07-29 23:38:12 +01:00
Ted John 7e9d6d7c79 Merge pull request #246 from adrian17/map_scrollgetsize 
Decompiled window_map_scrollgetsize
 2014-07-29 23:37:52 +01:00
Ted John ec48d91333 Merge pull request #245 from adrian17/fix_hscrollbar 
Fixed horizontal scrollbar not drawing properly
 2014-07-29 23:37:43 +01:00
adrian17 a34430e04c Full fix for #195 (border flash bug) 2014-07-29 23:24:17 +02:00
adrian17 e3f2801ede Decompile window_map_scrollgetsize 2014-07-29 20:58:17 +02:00
Duncan Frost 101324ebc0 Implemented window_resize_gui. 2014-07-29 19:40:06 +01:00
adrian17 a72f0c95ad Fixed horizontal scrollbar not drawing properly 2014-07-29 19:14:33 +02:00
Duncan Frost 3acb1a72ba Fixes cursor error when main window is at increased size. 2014-07-29 18:05:52 +01:00
Ted John 5d255fae42 Merge pull request #242 from adrian17/viewport_cleanup 
Remove viewport_paint_underground_setup, it's just gfx_clear
 2014-07-29 16:45:11 +01:00
adrian17 bc814f395e Fix window_map_mouseup() (it was callling window_options_mouseup() instead) 2014-07-29 16:52:11 +02:00
adrian17 6b013e123d decompile window_map_scrollpaint() 
Not sure if preserving the top g1_element is of any importance;
I haven't noticed anything breaking when I removed it.
 2014-07-29 16:52:03 +02:00
adrian17 037f59cd1a Remove viewport_paint_underground_setup, it's just gfx_clear 2014-07-29 16:46:04 +02:00
Ted John 843996358e Merge pull request #241 from adrian17/master 
Partial fix to #195, added not implemented flag check
 2014-07-29 07:31:31 +01:00
adrian17 87a4f46934 Partial fix to #195, added not implemented flag check 2014-07-28 22:41:22 +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 c201ebefca Added license 2014-07-28 17:45:49 +01:00
Duncan Frost cdb60bab6c Fixed pointing locations. 2014-07-28 17:45:49 +01:00
Duncan Frost 0b5b95979e Added unload of cursors. Small cleanup 2014-07-28 17:45:48 +01:00
Duncan Frost 8f50e75859 Actually add sdl cursors 2014-07-28 17:45:47 +01:00
Duncan Frost 89ba3d1faf Add sdl cursors 2014-07-28 17:45:47 +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
Duncan Frost 2622df3777 Implemented LoadCursor function. 2014-07-28 17:45:43 +01:00
Ted John 7e8369907a Merge pull request #239 from duncanspumpkin/viewport_paint 
Viewport paint
 2014-07-27 22:54:20 +01:00
Duncan Frost e1012eaae8 Updated viewport_create function variable inputs 2014-07-27 16:29:41 +01:00
Duncan Frost d97c0b4679 First draft of draw_quadrant 2014-07-27 16:29:41 +01:00
Duncan Frost 03f4c2e57e Added note for function call 2014-07-27 16:29:40 +01:00
Duncan Frost 1b63aa6bff Decompiled second function. Function unknown 2014-07-27 16:29:40 +01:00
Duncan Frost 2f6945f270 Decompiled first func underground_setup 2014-07-27 16:29:39 +01:00
Duncan Frost d6d61c7cfc Remove warning 2014-07-27 16:29:38 +01:00
Duncan Frost 2b5e1039ed Fix final zoom related error 2014-07-27 16:29:38 +01:00
Duncan Frost 1cbcf08925 Fix small bug in zooming. Another breaking bug still exists 2014-07-27 16:29:37 +01:00
Duncan Frost 66afea46bd Fixed all remaining bugs labeled more variables 2014-07-27 16:29:36 +01:00
Duncan Frost 34e422fabe Rewrite. Potential mistake 2014-07-27 16:29:36 +01:00
Duncan Frost ede66261ef Added known addressess 2014-07-27 16:29:35 +01:00
Duncan Frost 5bbfc35565 Fixed bug causing crash 2014-07-27 16:29:34 +01:00
Duncan Frost 4562327e0f First very rough draft of viewport_paint 2014-07-27 16:29:34 +01:00
Duncan Frost e63c169664 Started decompiling viewport_paint 2014-07-27 16:29:33 +01:00
adrian17 46889b6890 Remove duplicated SCROLL_FLAGS enum 2014-07-27 16:39:20 +02:00
adrian17 c6e94ebd79 Change some comparisons in scenario_objectives_check() 2014-07-27 16:11:13 +02:00
ZedThree c9444737c9 Fix Franc and Guilder symbols, and whitespace 2014-07-27 12:22:01 +02:00
ZedThree ebe6c95a88 Add localised currency string formatting - fixes #222 2014-07-26 22:08:19 +02:00
ZedThree 6e61f73e7b Fixes #236 - `strcat` used instead of `strcpy` 2014-07-26 22:08:19 +02:00
ZedThree 32b53ad968 Change format_currency functions to use format_integer functions 2014-07-26 22:08:18 +02:00
ZedThree bba524a7a9 Bug fix: in-line sprites in text not rendered correctly 2014-07-26 22:08:18 +02:00
Ted John ed079819fc Merge pull request #235 from duncanspumpkin/fix_footpath_update 
Fixes issue with footpath closing
 2014-07-25 21:42:35 +01:00
Duncan Frost f5f7e942c0 Fixes issue with footpath closing 2014-07-25 19:24:39 +01: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
adrian17 65b17cbd5d Used defined flags macros. (and fixed indentation) 2014-07-25 17:56:43 +02:00
adrian17 6922a771f3 Use defines for options window size. Fixes #231. 2014-07-24 16:57:02 +02:00
Ted John 2f2dff48ea Merge pull request #230 from duncanspumpkin/fix_draw_string 
Partial fix to #223
 2014-07-23 20:56:03 +01:00
Duncan Frost e897301ff4 Fixes highlighting error 2014-07-23 18:45:19 +01:00
Duncan Frost d68e716cd8 Removed compile errors. Implemented changes to window.h 2014-07-23 18:07:38 +01:00
Duncan Frost 4263e64f32 Merge branch 'window_h' of https://github.com/duncanspumpkin/OpenRCT2 into window_h 2014-07-23 17:36:18 +01:00
Duncan 105624d915 Added viewport_target_sprite variable name. 2014-07-23 16:17:13 +01:00
Duncan 6ff915ec2f Added variable names for window items. 
Has not been tested will require modificaiton of any references to these items.
 2014-07-23 12:23:15 +01:00
Duncan Frost 73a9ceb65d Fix ride list. Update variable names. 2014-07-22 21:03:59 +01:00
Ted John 88ad431818 Merge pull request #221 from marcotc/rain 
Small refactor on climate_update
 2014-07-22 07:29:42 +01:00
Marco Costa 73dda39374 Small refactor on climate_update 
* Extracted the logic of stepping "weather level" variables.
* Simplified the rain stepping code, as "rain level" is always between 0 and 2.
 2014-07-22 00:05:32 -04:00
adrian17 3b6c0d4bbc Reworked viewport_render() 2014-07-21 22:38:52 +02: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
wolfreak99 2b438c89b4 Update ride.h 2014-07-20 13:58:23 -04: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
Ted John a2240932e2 Merge pull request #213 from duncanspumpkin/game_cleanup 
Implemented check affordability and clean up
 2014-07-19 11:12:36 +01:00
Ted John 01e62c1769 Merge pull request #212 from marcotc/rain 
Implemented draw_rain_animation
 2014-07-19 11:12:30 +01:00
Ted John fb76c022e8 Merge pull request #211 from duncanspumpkin/viewport_create 
Viewport create
 2014-07-19 11:12:20 +01:00
Ted John 94bb349d24 Merge pull request #144 from MaciekBaron/master 
Labelling addresses, adding initial happiness calculation
 2014-07-19 11:11:16 +01:00
Marco Costa a13da0f7ec Rename variables in draw_rain_animation 
Renamed variables to better represent their meaning.
Use global g_window_list instead of manually fetching it.
 2014-07-18 19:36:06 -04:00
adrian17 843c45aafc Use address names from addresses.h 2014-07-18 22:28:15 +02:00
Marco Costa 2130c85e90 Implemented draw_rain_animation 
Implemented the first level of the rain drawing routine.
Still not sure what the parameter means, so I keep its register name.
 2014-07-17 23:29:39 -04:00
Duncan Frost a51d057ded Fixed bugs related with last commit 2014-07-17 18:41:23 +01:00
Duncan Frost 2bbcf146c6 Finished first draft of viewport_create 2014-07-17 17:59:49 +01:00
Duncan Frost 9d9f3424cf Added error_string_quit and a litle part of viewport_create 2014-07-16 21:39:39 +01:00
wolfreak99 a9091b41b6 Cheats, temporary cheat placement macro for convenince, audio option, copiedunlimited land tool to water tool. 2014-07-15 22:41:12 -04:00
Duncan Frost 9e566b876b Added stub viewport_paint function 2014-07-15 18:11:32 +01:00
Duncan Frost 52f96a262c Fixed small bug causing a crash when resizing. 2014-07-15 17:56:42 +01:00
Duncan Frost 05a71929b6 Fix small errors. Does not work with window resize. 2014-07-15 17:40:05 +01:00
Duncan 3506899261 Now uses viewport functions. 2014-07-15 14:59:43 +01:00
Duncan c5c4127194 Add description comment for viewport_create 2014-07-15 14:58:43 +01:00
Duncan Frost 7a60b0d53b Implemented check affordability and cleanedup some function calls to use openrct 2014-07-14 19:46:45 +01:00
Ted John 9de7af5075 Merge pull request #208 from duncanspumpkin/window_tooltip_cleanup 
Window tooltip cleanup
 2014-07-14 07:31:27 +01:00
Ted John 5a6d40b82e Merge pull request #206 from AngeloG/formatting 
Consistency in window_dropdown_show_image in relation to 0x009DE518 flags
 2014-07-14 07:31:18 +01:00
Ted John 830f881f3c Merge pull request #209 from duncanspumpkin/viewport_render 
Viewport render
 2014-07-14 07:30:54 +01:00
Duncan Frost 0d144540cc Fixed gfx_wrap_string error. Cleanedup tooltip 2014-07-13 13:10:14 +01:00
Duncan Frost 5232fc378b Trying to use the gfx wrap functions. 2014-07-13 12:24:27 +01:00
Angelo Geels 51d9db9f73 Consistency in window_dropdown_show_image in relation to 0x009DE518 flags 2014-07-13 13:11:38 +02:00
Angelo Geels 3e30e147cf Formatting 2014-07-11 21:49:01 +02:00
Angelo Geels 4e7883f20b Implemented input_vscrollbar_bottom_trough 2014-07-11 21:43:51 +02:00
Angelo Geels e691f86780 Implemented input_vscrollbar_top_trough 2014-07-11 21:39:54 +02:00
Angelo Geels e01cce4918 Implemented input_hscrollbar_right_trough 2014-07-11 21:36:11 +02:00
Angelo Geels f3caea6bae Some consistency cleanup 2014-07-11 21:22:26 +02:00
Angelo Geels 3bca6b699a Implemented input_hscrollbar_left_trough 2014-07-11 21:21:17 +02:00
Duncan Frost 87fe239ac0 Switched to g_viewport_list 2014-07-11 19:00:26 +01:00
Duncan Frost 144470e5aa Finished viewport_render decompile. 2014-07-11 18:32:32 +01:00
Angelo Geels 0081a7581c Implemented scrollbar buttons left, right, up, down 
input_hscrollbar_leftbutton, input_hscrollbar_rightbutton,
input_vscrollbar_topbutton, input_vscrollbar_bottombutton
 2014-07-11 14:41:42 +02:00
Duncan Frost 3a3cbbc7c4 Fixed another small window bug and changed to using global window list var 2014-07-10 21:22:32 +01:00
Ted John ca82c74244 Merge pull request #201 from JeroenSack/master 
Found a little inconsistency in window_find_by_id
 2014-07-10 07:47:44 +01:00
Jeroen Sack 540bbc18b4 bug in window_find_by_id 
Looking at the assembly it seems there is an inconsistency in the code.
 2014-07-09 23:03:55 +02:00
Angelo Geels 981141b03f Fix bottom toolbar not invalidating on finance payment 2014-07-09 17:00:39 +02:00
Duncan Frost fbd4476a5f Fix issue in non MSC_VER 2014-07-07 19:10:04 +01:00
Duncan Frost b383280c3c Fixed bottom toolbar tooltip issues. Fixes #196 2014-07-07 19:07:46 +01:00
Duncan Frost 62398e14ca Added missing function calls 2014-06-29 15:55:02 +01:00
Duncan Frost 8b97931491 Swapped sprite list to use global var 2014-06-29 14:51:18 +01:00
Duncan Frost 32624b912c Tried swaping to a global variable for ride_list 2014-06-29 14:38:38 +01:00
Duncan Frost 3f91db2109 added notes for widgets 2014-06-28 21:34:58 +01:00
Duncan Frost 23549f42fc Fix var name errors 2014-06-28 21:34:57 +01:00
Duncan c6e7fb0ebe Added more to window_peep 
Has not been tested. This will likely fail as the function calls are not in.
 2014-06-28 21:34:56 +01:00
Duncan Frost 2e849668c8 Added more to window_peep 2014-06-28 21:34:56 +01:00
Duncan 451f4cce26 Input first two fields to widget array 
Consider splitting up into separate pages once the widgets are properly decompiled. See park_window.
 2014-06-28 21:34:55 +01:00
Duncan Frost 3455cd654e Actually add the file 2014-06-28 21:34:54 +01:00
Duncan Frost eec5f80bfc Added window_peep. Widget array not finished 2014-06-28 21:34:53 +01:00
Patrick Wijnings 0a9d6f4caa Merge branch 'master' into get_file_path 2014-06-28 20:48:36 +02:00
Patrick Wijnings eee3118a3a rct2.c: port check_file_paths and check_file_path. 2014-06-28 20:46:39 +02:00
Patrick Wijnings 7cf1f98827 rct2.c: make naming inside check_files_integrity consistent with get_file_path. 2014-06-28 20:44:33 +02:00
IntelOrca 5bf6a717a3 invalidate park window on change of entrance fee 2014-06-28 16:08:47 +01:00
Ted John db475f54c0 Merge pull request #192 from duncanspumpkin/free_park_cheat 
Added ability to switch between a free and paid to enter park
 2014-06-28 16:04:10 +01:00
Duncan Frost 3f1be48241 Added ability to switch between a free and paid to enter park 2014-06-28 14:44:48 +01:00
Duncan Frost 9561b92957 Fix small bug caused by dropdown box not being fully reversed 2014-06-28 12:16:49 +01:00
Duncan Frost 817c319083 Fix dropdown mistake added note to prevent other people falling for it 2014-06-27 18:44:41 +01:00
Duncan Frost 339bfa1198 Fix little bug in peep thought updates. Fix compile issues 2014-06-27 18:28:50 +01:00
Duncan c3eaf36e6d Now uses known item string offsets. 2014-06-27 15:48:54 +01:00
Duncan debbe7cc44 Added offsets for item start 2014-06-27 15:47:23 +01:00
Duncan c69dec0802 Fixed logic mistake in thoughts 
Has not been tested.
 2014-06-27 15:33:31 +01:00
Duncan 5a32c8770b Update string_ids.h 2014-06-27 15:06:05 +01:00
Duncan 025fa81663 Now uses known peep state values. 
Note peep_state_moWing not moPing. Will require checking to make sure it doesn't break anything.
 2014-06-27 15:05:03 +01:00
Duncan 0b9a47ca95 Now uses string id references. 
This can be used to identify a few more variables.
 2014-06-27 14:27:51 +01:00
Duncan ab38c956eb Added action string ids. 2014-06-27 14:25:37 +01:00
Duncan Frost e48bab50d3 Fix errors. Tested code all working 2014-06-26 18:02:44 +01:00
Duncan 578b4eaa44 Re-factor of argument_from_thought to use ridelist 
Has not been tested. Could use this to work out what Var_4A and Var_4C(32bit) are.
 2014-06-26 16:18:38 +01:00
Duncan 32e8726a98 Paint function now uses get_arguments 
Has not been tested. Possible problem caused by endianess.
 2014-06-26 12:50:59 +01:00
Duncan Frost 96abc93c79 Added get_arguments_from_action 2014-06-24 20:12:44 +01:00
Duncan Frost 97894a648e Added get_argument_from_thought 2014-06-24 20:12:43 +01:00
Duncan Frost 54e46c044a Fix small ) mistake 2014-06-24 20:12:42 +01:00
Duncan 044a0b72e8 Re-factor of 0x69B7EA into get_arguments_from_peep 
Has not been tested. This should remove a few global variables 0x13CE952 and 0x13CE954. (Note these globals are also used for drawing strings so will still be relevant elsewhere.)
 2014-06-24 20:12:42 +01:00
Duncan Frost e32293f6b0 Fixed compile error 2014-06-24 20:12:41 +01:00
Duncan 78845ca165 is_peep_in_filter updated to use decompiled func 
Has not been tested. Considering redoing all of these functions removing hard to understand variables.
 2014-06-24 20:12:40 +01:00
Duncan Frost ee4d8238d2 Fix #169 2014-06-23 21:12:00 +01:00
Duncan Frost cbdffd193c Attempted fix of thunder crash 2014-06-23 18:18:59 +01:00
Ted John 2dfc1aba2e Merge pull request #188 from duncanspumpkin/fix_guest_list 
Fix guest list
 2014-06-22 22:06:47 +01:00
Duncan Frost d5c865b856 Fixed graphical bug in faces. Fixes #102 2014-06-22 19:01:48 +01:00
Duncan Frost b31f1f00b2 Fixed guest list groups. There is still a graphical glitch 2014-06-22 18:14:49 +01:00