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

1109 Commits

Author SHA1 Message Date
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
Duncan Frost 37ca25170e Fixed graphical drawing bug. Detection of groups still incorrect 2014-06-22 10:24:19 +01:00
Duncan Frost f2bfaa06a4 Fixes #179 multiple handyman crash. 2014-06-21 21:37:32 +01:00
Duncan Frost 8bd4e85764 Widgets now use draw_sprite 2014-06-21 16:20:05 +01:00
Duncan Frost 79e52e823a Updated missing function calls 2014-06-21 16:04:13 +01:00
Duncan Frost 1aaa88afae Added 0x69E9A7 2014-06-21 15:50:13 +01:00
Duncan Frost 9c4f06a04b Added another reset function 2014-06-21 13:31:28 +01:00
Duncan Frost e46abd0f4c Added sprite list reset function. Identified more fields. 2014-06-20 15:31:28 +01:00
Patrick Wijnings e259421db6 Merge branch 'master' into get_file_path 2014-06-19 13:55:05 +02:00
Patrick Wijnings 14aba8e7d9 rct2.c: port check_files_integrity(). 2014-06-19 13:52:34 +02:00
Patrick Wijnings bf8bc151b9 rct2.c: port check_mutex(). 2014-06-19 13:51:54 +02:00
Duncan Frost 76c07fc278 Added paletts to sprite list. 2014-06-19 10:33:14 +01:00
Duncan Frost f68ab9162d Added 0x97FCBC table for getting palettes from g1 elements 2014-06-19 10:27:35 +01:00
Duncan Frost 5de7cac882 Fixed pattern bugs in new code 2014-06-19 09:25:50 +01:00
Duncan Frost 9c051a0a22 Fixed zooming code. Its still not working quite right 2014-06-18 19:19:27 +01:00
Duncan Frost e2d5c9904c Fixed compile bugs. Zooming code is broken 2014-06-18 18:24:52 +01:00
Duncan b6274a72a0 Added note about possible issue in draw_sprite. 2014-06-18 16:35:26 +01:00
Duncan 759268c1f5 Started adding final pattern code 
Has not been tested. Looping code not implemented.
 2014-06-18 16:22:45 +01:00
Duncan 31bf6bf4b3 Re-factor of gfx_transpose_palette 
Requires testing i feel as though osinterface call might be incorrect.
 2014-06-18 13:03:37 +01:00
Duncan 4b02a71692 Changed layout of gfx_fill_rect 
Now in a more logical state. Ready for being reimplemented as a switch with multiple functions.
 2014-06-18 12:22:15 +01:00
Duncan 6f528664fe Add Author 2014-06-17 16:47:32 +01:00
Duncan 3e6ee0d3b1 Re-factor of gfx_fill_rect. 
Moved cross_hatching code. Renamed some of the variables to make it easier to follow. Possible future change into big switch statement.
 2014-06-17 16:29:07 +01:00
Duncan 28c2d6430d Re-factored part of gfx_fill_rect added zooming 
Added notes for future work as well.
 2014-06-17 12:39:56 +01:00
Duncan aaaf06e94d Fixed bug in gfx_fill_rect 
As expected _left was incorrect.
 2014-06-17 12:20:34 +01:00
Duncan f0fb16d1b2 Re-factored part of gfx_fill_rect 
Removed references to global vars that are not required. Possible bug in line 416 will require looking at.
 2014-06-17 12:15:58 +01:00
Duncan 4f77ba0698 Added extra zoom code 
This is some sort of short cut code. I think some of the more common sprites are precomputed for zoomed images.
 2014-06-16 16:09:29 +01:00
Duncan f45ec1976a Corrected mistake with zoom_level 
Has not been tested. Still requires looking at x, y initial values i think they might be >> as well.
 2014-06-16 12:44:23 +01:00
Duncan 38df54167e Merge pull request #1 from IntelOrca/master 
Test pull request
 2014-06-16 09:40:52 +01:00
Duncan 66d185712e Fix gfx_clear bug not using zoom level 
There is a strong possibility that i have implemented all zooming code incorrectly. This will require looking at.
 2014-06-16 09:25:42 +01:00
Patrick Wijnings f8f70d8d08 rct2.c: port get_file_path. 2014-06-15 15:10:35 +02:00
Duncan Frost d0fa292129 Now using sprite refs 2014-06-15 10:45:22 +01:00
Duncan Frost e931da1ca9 Simplified buffer interaction 2014-06-15 10:31:10 +01:00
Duncan Frost ce0321aba7 Cleaned up gfx notes 2014-06-15 10:22:39 +01:00
Duncan Frost 7128ca9f5d Fix small bug with adjust palette 2014-06-15 10:15:23 +01:00
Duncan Frost 61a30b16fb Tidied up gfx_string. Deleted control char enum. Now uses string_ids enum to prevent multiple defs. 2014-06-15 10:09:28 +01:00
Maciek Baron 455a1e7b06 Forgot to save before merge.. 2014-06-14 15:57:05 +01:00
Maciek Baron 8a39d9d026 Merge with upstream 2014-06-14 15:55:07 +01:00
Ted John dbe0fc2a16 Merge pull request #181 from duncanspumpkin/master 
Added text info to cheat tab
 2014-06-14 15:03:39 +01:00
Duncan Frost 80cdcb6fbf Added text info to cheat tab 2014-06-14 10:19:42 +01:00
Duncan Frost b0475b3f15 Labeled global vars, removed obselete comments and changed to local text_palette. 2014-06-14 09:46:04 +01:00
Duncan Frost 80b8ef29bd Fix merge fail 2014-06-14 09:05:33 +01:00
Duncan Frost 331159c9e6 Wrap string refactored to match other width functions. Error clean up. 2014-06-14 09:01:59 +01:00
Duncan cbd97facfd Added Char_control_code enum. Refactor of draw string 2014-06-14 08:34:58 +01:00
Duncan a39485fcc6 Added notes for what unknown functions do. 2014-06-14 08:33:43 +01:00
Duncan 0afec9c3e8 Cleaned up clip_string and string_width 
Both functions are very similar. They now have the same bugs fixed.
 2014-06-14 08:33:42 +01:00
Duncan db2f855579 Small bug fix in char width. Switched to C99 inits 
4th character type has to have the width increased from the g1 elements width rather than decreased.
 2014-06-14 08:32:47 +01:00
Duncan Frost 960307e3bc Fixed bug in create window due to uninitialised data. Finished load_character_width function 2014-06-14 08:32:47 +01:00
Duncan Frost ba1c414165 Started decompiling character width loading function 2014-06-14 08:32:46 +01:00
Jeroen Sack 91cae10a1f Revert indention 
Don't know what happened here, but was not meant to happen.
 2014-06-13 22:57:51 +02:00
Jeroen Sack aa5209d9f0 Remove commented function 
Remove a forgotten commented function
 2014-06-13 22:47:14 +02:00
Jeroen Sack a91c5532d1 Port function widget_scroll_get_part 
replace 6E9F92 with widget_scroll_get_part
 2014-06-13 22:40:15 +02:00
anyc 2e7261e9cf fix GCC compilation 2014-06-13 16:43:52 +02:00
Duncan 2e0f34222c Added Char_control_code enum. Refactor of draw string 2014-06-13 15:02:34 +01:00
Patrick Wijnings 4485e3dd72 osinterface: use FAILED macro to check for success of CoInitializeEx / SHGetMalloc. 2014-06-13 14:44:40 +02:00
Duncan 92d8e0cf34 Added notes for what unknown functions do. 2014-06-13 13:04:09 +01:00
Duncan a73ed7ce94 Cleaned up clip_string and string_width 
Both functions are very similar. They now have the same bugs fixed.
 2014-06-13 12:57:05 +01:00
Duncan 04facd2fcd Small bug fix in char width. Switched to C99 inits 
4th character type has to have the width increased from the g1 elements width rather than decreased.
 2014-06-13 12:49:35 +01:00
IntelOrca 521dadfd7b Merge branch 'gfx_strings' of https://github.com/ZedThree/OpenRCT2 into ZedThree-gfx_strings 2014-06-13 01:26:34 +01:00
Duncan Frost 583d769ad1 Fixed bug in create window due to uninitialised data. Finished load_character_width function 2014-06-13 00:02:52 +01:00
Duncan Frost 0e3702f463 Started decompiling character width loading function 2014-06-12 21:49:59 +01:00
ZedThree 08b69b6361 Bug fix: off-by-one 2014-06-12 21:19:13 +02:00
Duncan Frost 6f65ba5714 Fix a few bugs to do with the buffer being incremented at start of loop 2014-06-11 19:08:00 +01:00
ZedThree 121990d68f Replace unneeded addresses with variables 2014-06-11 19:50:31 +02:00
ZedThree d2c80229c1 Fixes #171 2014-06-11 19:50:30 +02:00
ZedThree 74f5fbc31a Bug fix for strings with non-char sprites 2014-06-11 19:50:30 +02:00
ZedThree 0f0351d341 Byte width bug fixes 2014-06-11 19:50:29 +02:00
ZedThree fcc5e29b76 Add comments, removed unused vars 2014-06-11 19:47:49 +02:00
ZedThree 89b199a6c8 Tidy up 2014-06-11 19:47:48 +02:00
ZedThree 46965b0575 Finish wrap_string 2014-06-11 19:44:31 +02:00
ZedThree 1e23390406 First pass of gfx_wrap_string 2014-06-11 19:44:31 +02:00
IntelOrca f83ca084cf Merge branch 'gfx_unstable' 2014-06-10 23:08:07 +01:00
Duncan Frost 842cbe5b58 Fix bug #114 2014-06-10 22:47:47 +01:00
Duncan Frost b073c8eaef Finished last part of zooming code. Appears to work good. 2014-06-10 22:20:44 +01:00
Duncan Frost 2b9d7af156 Messing with zooming code currently breaks. 2014-06-09 23:10:54 +01:00
Jan Horava 100228b887 fix comment typo and unclear abbreviation 2014-06-07 21:14:55 -07:00
Duncan Frost 490fe70db8 Trying different zoom technique 2014-06-07 21:34:24 +01:00
Duncan Frost 9f01c5d6bf Fixed small positioning bug in draw_string due to incorrect signness. 2014-06-06 10:18:39 +01:00
Duncan Frost c158d98e5c Fixed graphical text glitch. Due to not copying whole dword 2014-06-06 09:54:30 +01:00
Duncan f6a3c2dd04 Fix small palette issue. 2014-06-05 16:49:30 +01:00
Duncan Frost c333e9f042 Fix small dereference mistake 2014-06-04 19:47:46 +01:00
Duncan 55e8fe74ff more small changes 2014-06-04 17:04:33 +01:00
Duncan 8b233c2f79 More gfx_draw_string notes. 2014-06-04 12:30:53 +01:00
Duncan 49432dd96f Added a few notes to draw_string. 2014-06-03 12:57:58 +01:00
ZedThree bf2227437b String control codes skip wrong number of chars 2014-06-02 20:03:48 +02:00
Duncan 1629b3fce7 Fixed possible small palette bug. 
Added notes on what is happening in draw_string.
 2014-06-02 16:55:02 +01:00
IntelOrca 3aa2d4ace9 fix #163 2014-06-01 16:23:15 +01:00
ZedThree e7688ad51b Fix monthyear format bug 2014-06-01 14:35:03 +02:00
Duncan Frost f1c8981e79 Switched to draw_sprite in draw_string function. Added freeing of zoomed image 2014-06-01 09:25:53 +01:00
Duncan Frost 6bd6971cb2 Merged in gfx_unstable 2014-05-31 20:56:57 +01:00
IntelOrca 95b761d921 Merge branch 'master' into gfx_unstable 2014-05-31 17:11:47 +01:00
IntelOrca b701eb8222 fix format_string currency 2014-05-31 17:11:26 +01:00
IntelOrca 21ff16e804 Merge branch 'master' into gfx_unstable 2014-05-31 16:57:17 +01:00
IntelOrca 7ae52df001 fix format_string currency 2dp 2014-05-31 16:57:00 +01:00
IntelOrca 35c8f64fff Merge branch 'master' into gfx_unstable 2014-05-31 16:48:16 +01:00
IntelOrca b5575d31eb fix more format string bugs 2014-05-31 16:47:30 +01:00
ZedThree 8b1c76b1b6 Replace pad_0E with zoom_level 2014-05-31 16:43:39 +02:00
ZedThree a06f6ade8b String functions for wrapped text 2014-05-31 16:40:44 +02:00
ZedThree 583fbaa2a4 Fix some pointer issues 2014-05-31 16:40:43 +02:00
ZedThree 5b41528e2e Rename variables in get_width to align with clip_string 2014-05-31 16:40:43 +02:00
ZedThree 1dc794b038 Finish clip string 2014-05-31 16:40:43 +02:00
ZedThree 9c9ece2d7b clip text mostly working 2014-05-31 16:40:42 +02:00
ZedThree 9fecf42e51 Tidy up loop on pointer 2014-05-31 16:40:42 +02:00
ZedThree b5d11159b3 Start of clip_text 2014-05-31 16:40:41 +02:00
ZedThree 130796052f More string functions 2014-05-31 16:40:41 +02:00
ZedThree 4fdba86b01 Add address for common string format buffer 2014-05-31 16:40:40 +02:00
ZedThree 55183d0589 draw_string_centred 2014-05-31 16:40:40 +02:00
ZedThree 504ce150ea Fix bug in gfx_get_string_width 2014-05-31 16:40:40 +02:00
ZedThree 67b7ca8d1e Fix use of g1_elements and tidy comments 2014-05-31 16:40:39 +02:00
ZedThree c3ea45062b gfx_draw_string complete. Needs tidying 2014-05-31 16:40:39 +02:00
ZedThree 702a97b185 Fix some bugs, tidy up 
Still buggy...
 2014-05-31 16:40:38 +02:00
ZedThree 99c7b23452 Second pass of gfx_draw_string. Still buggy 2014-05-31 16:40:38 +02:00
ZedThree 6e778006a5 First pass for gfx_draw_string() 2014-05-31 16:40:37 +02:00
ZedThree 34a9f94ac1 Add gfx_get_string_width() 2014-05-31 16:40:37 +02:00
IntelOrca 883ca8939d Merge branch 'master' into gfx_unstable 2014-05-31 14:47:42 +01:00
IntelOrca b1e9c5c786 fix format string bugs 2014-05-31 14:43:29 +01:00
IntelOrca 6a1c5fa6eb add initial start to peep update 2014-05-30 23:27:11 +01:00
Duncan Frost ed31f96c33 Added sprite zoom function. No freeing yet leaks memory like a sive 2014-05-30 17:28:06 +01:00
Duncan 81fe1d3494 Added more draw_string reaches first draw_sprite_call 2014-05-30 15:33:10 +01:00
Duncan e69b354055 Added a small bit more to draw_string 2014-05-30 12:42:39 +01:00
IntelOrca ccc9843633 Merge branch 'master' into gfx_unstable 2014-05-30 08:24:44 +01:00
lnz d5f374d38c Fix station_heights bug and use FOR_ALL_RIDES in ride_check_all_reachable 2014-05-30 00:24:44 +02:00
lnz 35b38f3c16 Remove debug statements and add string_ids for ride connected functions. 2014-05-30 00:12:29 +02:00
lnz a4d4e55541 Merge remote-tracking branch 'upstream/master' into scenario_stuff 2014-05-30 00:07:21 +02:00
IntelOrca bad9e8b7bd fix bug in format string 2014-05-29 23:05:55 +01:00
lnz 978bc39d25 Name various ride variables, clear a warning in map.c, add a note in 
scenario
 2014-05-29 23:42:24 +02:00
lnz 6e32406e7b Cleanup and documentatin of ride connected functions 2014-05-29 23:07:20 +02:00
lnz 3a3694a480 More critical bugfixes for the reachability code. 2014-05-29 23:07:20 +02:00
lnz ce270dbe19 Fix lots of disgusting bugs 2014-05-29 23:07:19 +02:00
lnz 5e104477d3 Cleanup and refactoring of ride reachability stuff 2014-05-29 23:07:19 +02:00
lnz 64bece0246 Initial implementation of ride reachability checks 2014-05-29 23:07:19 +02:00
Duncan Frost 33833b413f Added more gfx_draw_string 2014-05-29 17:55:52 +01:00
Duncan Frost a691216044 Fixed small issue with mouse down code 2014-05-29 17:22:32 +01:00
anyc 2a27ea0689 fix ASM for MinGW 2014-05-29 15:35:51 +02:00
IntelOrca d1c0ab28f2 Merge branch 'c_based_mouse_down' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-c_based_mouse_down 2014-05-28 22:58:16 +01:00
IntelOrca 423db67148 add climate_update_sound 2014-05-28 22:53:28 +01:00
Duncan Frost 7dc750bd55 Switched to cdecl for mouse down. 2014-05-28 22:22:09 +01:00
Duncan Frost c006e27700 Started adding draw_string 2014-05-28 21:15:19 +01:00
Duncan Frost 0715a5122e Added unknown pointer as variable. Will be named when function determined 2014-05-28 20:52:32 +01:00
IntelOrca e489b999f3 fix picked-up staff and rain drawing 2014-05-28 18:11:33 +01:00
Duncan Frost 9779128fba Added peep_palette rewrote top and trouser code 2014-05-28 18:00:28 +01:00
IntelOrca dee0c6c730 fix warnings 2014-05-28 16:06:04 +01:00
IntelOrca 015b067f7e Merge branch 'config-save-ini' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-config-save-ini 2014-05-28 16:03:42 +01:00
atmaxinger d8b735a1ef New setting: save_plugin_data 2014-05-28 11:19:49 +02:00
atmaxinger 4ae98b18e6 New setting: show_height_as_units 2014-05-28 11:12:12 +02:00
atmaxinger 098fe08fdf New setting: landscape_smoothing 2014-05-28 10:55:35 +02:00
Kevin Burke fe9757acff add note about debugging routines 2014-05-28 17:39:58 +09:00
atmaxinger 0e6e11798b New setting: always_show_gridlines. 2014-05-28 10:36:55 +02:00
atmaxinger c89cd803f6 edge_scrolling and forced_software_buffering can now be edited ingame. 
* edge_scrolling
* forced_software_buffering
 2014-05-28 09:56:49 +02:00
IntelOrca d8a61d9792 fix award window bug and clean reset history 2014-05-28 01:50:50 +01:00