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
IntelOrca
f2be32eadb
Merge branch 'testing' of https://github.com/anyc/OpenRCT2 into anyc-testing
2014-05-28 00:06:22 +01:00
IntelOrca
cc85e93e9e
add initial s6 structure
2014-05-28 00:05:11 +01:00
Duncan Frost
07e5b58982
Merge to gfx_unstable
2014-05-27 22:37:16 +01:00
anyc
4c9c1fa5bd
save_prompt actually opens save dialog
2014-05-27 23:33:16 +02:00
IntelOrca
74f5db4ebd
Merge branch 'master' into gfx_unstable
2014-05-27 22:28:45 +01:00
Duncan Frost
ba9d33de10
Merge
2014-05-27 22:22:57 +01:00
Duncan Frost
a3b33c4656
Split draw_string in two for draw_sprite and others to jump in. Started decoding top and trousers code.
2014-05-27 22:20:00 +01:00
IntelOrca
65e579045c
show full date in bottom right panel
2014-05-27 21:28:16 +01:00
IntelOrca
20a18a8ba3
fix awards window and remove original call
2014-05-27 21:02:20 +01:00
atmaxinger
15e5a8b3cf
Initial support for saving settings to config.ini
...
Supported settings:
* currency
* measurement_format
* temperature_format
* sound_quality
2014-05-27 21:55:53 +02:00
IntelOrca
014a2245f4
remove original call for awards
2014-05-27 20:46:45 +01:00
IntelOrca
4e7ec2feb6
finish award checks
2014-05-27 20:45:40 +01:00
IntelOrca
1321892024
Merge branch 'os-specific' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-os-specific
2014-05-27 18:59:47 +01:00
IntelOrca
fcb9a407f5
fix peep loop bug
2014-05-27 18:28:24 +01:00
atmaxinger
a0380fc1f8
travis doesn't like capitalized <Windows.h> ...
2014-05-27 19:28:22 +02:00
atmaxinger
66e6dfc3f9
clean up header files, keep windows.h for MAX_PATH
2014-05-27 19:22:06 +02:00
IntelOrca
72b2272b1f
apply loop macros and implement more awards
2014-05-27 18:03:25 +01:00
atmaxinger
cdee1dddea
replaced WIN32 file i/o in config_save()
2014-05-27 19:00:21 +02:00
Duncan
1aa7e33aae
Added notes about splitting gfx_draw_sprite
2014-05-27 16:35:11 +01:00
atmaxinger
76a7cc98b8
replaced WIN32 file i/o in config_load()
2014-05-27 17:14:27 +02:00
atmaxinger
a70021d53a
Add function for checking wether file exists to osinterface, BMP screenshots can now be saved without WIN32 specific methods.
2014-05-27 16:48:15 +02:00
IntelOrca
30e6358fd4
implement more awards WIP
2014-05-27 15:14:45 +01:00
IntelOrca
ebcbc2d2f1
Merge branch 'master' into awards
2014-05-27 14:03:05 +01:00
IntelOrca
88ffb17a4a
add initial update awards implementation
2014-05-27 14:00:13 +01:00
Kevin Burke
1df8b061d8
Document RIDE_RATING macro
2014-05-27 20:57:27 +09:00
Kevin Burke
b036a51cfd
Move build instructions from travis into shell scripts
...
fix syntax
use elif
run it with bash
fix directory incantations
add missing build steps
dont use colors if not terminal
update install.sh
add sanity check
changes
set verbose mode
enable debug output
changes to get it working on mac
Platform specific cmakelists
fix issue with intptr_t not being found/defined
update build scripts
see if it can find the pkg-config
try running it outside of cmake
check whether excho works way we expect
try -e
remove debug info
2014-05-27 12:36:56 +09:00
IntelOrca
6d824fd3a8
fix compile error and add update history placeholder
2014-05-27 00:35:14 +01:00
IntelOrca
a8182b945b
improve guest generation with comments
2014-05-27 00:09:33 +01:00
IntelOrca
1b3c46c17d
implement park_calculate_guest_generation_probability
2014-05-26 23:44:47 +01:00
Duncan Frost
b8887876ea
Cleaned up more asm code
2014-05-26 22:28:26 +01:00
anyc
fafc8083ac
don't show confirmation prompt for loading on title screen, fixes #145
2014-05-26 22:22:25 +02:00
anyc
c07edd0d10
fix warning
2014-05-26 20:20:48 +02:00
IntelOrca
7190e4c3f6
implement object_get_scenario_text
2014-05-26 17:59:42 +01:00
IntelOrca
c783898b36
fix #143 , incorrect object entry group addresses
2014-05-26 14:36:07 +01:00
IntelOrca
a22534e099
free path in screenshot.c
2014-05-26 14:14:03 +01:00
IntelOrca
70d3d652c5
add saving of screenshots in subfolder
2014-05-26 14:12:43 +01:00
Maciek Baron
69a819c029
Fixing spelling mistake (guest)
2014-05-26 14:08:19 +01:00
IntelOrca
17a567292d
Merge branch 'master' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-master
2014-05-26 13:54:58 +01:00
IntelOrca
c2d5ec4381
fix #146 , broken ride structure
2014-05-26 13:50:37 +01:00
Maciek Baron
b5e6058cde
Fixing spelling mistake
2014-05-26 13:29:30 +01:00
atmaxinger
16c0bde2f4
Check if path could be allocated, initialize it with an empty string.
2014-05-26 09:34:14 +02:00
atmaxinger
35ff9a510d
Fixed returning pointer from a local buffer
2014-05-26 09:27:54 +02:00
IntelOrca
ab697f8f93
add more to finances window
2014-05-26 01:29:59 +01:00
IntelOrca
8271ed5022
add finances window widgets
2014-05-26 00:55:46 +01:00
IntelOrca
bfc35511f2
Merge branch 'master' of https://github.com/adrian17/OpenRCT2 into adrian17-master
2014-05-25 23:18:47 +01:00
IntelOrca
092764ea6b
separate marketing and add finances window
2014-05-25 23:17:55 +01:00
IntelOrca
4b55a116fe
add comma2dp and currency formatting
2014-05-25 22:47:08 +01:00
IntelOrca
8bf7c1e025
add sound enum
2014-05-25 22:08:36 +01:00
atmaxinger
bbae0af0ef
Save screenshots in home folder, Add functions for path separator and detection of homefolder to osinterface
2014-05-25 22:27:28 +02:00
adrian17
735c42e628
Fixed a typo in comment
2014-05-25 21:54:47 +02:00
IntelOrca
5b568f376c
add peep_applause
2014-05-25 19:47:11 +01:00
Maciek Baron
aaef0e5e64
Labelling addresses, adding initial happiness calculation
2014-05-25 19:15:41 +01:00
IntelOrca
275f66d287
add vehicle_update_all
2014-05-25 18:40:11 +01:00
IntelOrca
73c5184f44
Merge branch 'testing' of https://github.com/anyc/OpenRCT2 into anyc-testing
2014-05-25 14:02:01 +01:00
IntelOrca
249567e99a
fix peep_update_crowd_noise compile problems
2014-05-25 14:00:39 +01:00
IntelOrca
6d7b4b1808
add park update and guest generation
2014-05-25 13:59:31 +01:00
Duncan Frost
2a77380bcb
Messing about
2014-05-25 11:41:57 +01:00
anyc
30fe4361eb
fixed RCT2_ERROR with GCC; added missing include
2014-05-25 11:47:22 +02:00
Duncan Frost
775ce9e83d
Added comments to code
2014-05-25 09:42:29 +01:00
Duncan Frost
af33568f01
Cleaned up functions brought two identical ones together
2014-05-25 09:30:54 +01:00
IntelOrca
ba77a2916b
add changing of game speed
2014-05-25 03:02:48 +01:00
IntelOrca
f57222d93b
add peep_update_crowd_noise
2014-05-25 01:08:08 +01:00
IntelOrca
d5ad84a7d1
clean up scenario loading some more
2014-05-24 22:14:42 +01:00
anyc
769297c905
fix to enable rotate station/building button
2014-05-24 21:29:41 +02:00
anyc
271f9911d5
initialize config with default values; new switch: confirmation_prompt
2014-05-24 21:29:36 +02:00
anyc
277f0ff4a5
GCC fixes
2014-05-24 21:24:25 +02:00
anyc
88a0359cf6
added quit_prompt to save_prompt; proper case handling except save operation
2014-05-24 21:23:01 +02:00
anyc
a83c3141a7
better solution to fix window_save_prompt
2014-05-24 21:23:01 +02:00
Duncan Frost
fdca2fb275
Even more c clean up
2014-05-24 20:18:48 +01:00
IntelOrca
36144b85be
clean up loading of g1.dat
2014-05-24 18:41:38 +01:00
Duncan Frost
08dcee5d92
Translated more into C
2014-05-24 18:35:33 +01:00
IntelOrca
27a5761499
add unload objects
2014-05-24 18:07:29 +01:00
IntelOrca
72a615c530
Merge branch 'travis' of https://github.com/anyc/OpenRCT2 into anyc-travis
2014-05-24 16:49:11 +01:00
IntelOrca
759673f9a0
add object_read_and_load_entries
2014-05-24 16:48:13 +01:00
anyc
b53dea17c6
add GCC asm, new RCT2_ERR macro for non-variadic error reporting
2014-05-24 16:23:30 +02:00
Duncan Frost
b3ced1eedc
more C cleanup
2014-05-24 14:41:33 +01:00
IntelOrca
7ba03880b5
fix spelling mistakes
2014-05-24 14:40:16 +01:00
IntelOrca
466f9ccf62
Merge branch 'travis-yml' of https://github.com/kevinburke/OpenRCT2 into kevinburke-travis-yml
2014-05-24 14:36:03 +01:00
IntelOrca
aba9a10f6a
Merge branch 'map-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-map-window
2014-05-24 14:34:31 +01:00
IntelOrca
13d6fa5a61
add ride_rating type and fix new ride headers
2014-05-24 14:31:42 +01:00
IntelOrca
99ca1c2b90
Merge branch 'crooked-house-excitement' of https://github.com/kevinburke/OpenRCT2 into kevinburke-crooked-house-excitement
2014-05-24 14:21:08 +01:00
Duncan Frost
20d136bacf
Started to turn the buffer code into legable C
2014-05-24 10:53:34 +01:00
Kevin Burke
f68bd7013b
oops. need to actually make it
2014-05-24 12:31:10 +09:00
Kevin Burke
6f800ba98c
introduce syntax error
2014-05-24 12:28:26 +09:00
IntelOrca
36e2cce045
add object list load
2014-05-24 01:34:17 +01:00
IntelOrca
98b01edaaa
clean up scenario list
2014-05-23 23:52:13 +01:00
ddevrien
1249a09373
some more work on map window
2014-05-24 00:00:08 +02:00
IntelOrca
bfb74ec39e
add string format and SDL get audio devices
2014-05-23 20:04:42 +01:00
IntelOrca
b2b4647570
Merge branch 'testing' of https://github.com/anyc/OpenRCT2 into anyc-testing
2014-05-23 14:36:51 +01:00
Duncan Frost
0b20f94182
Added more readable variable names
2014-05-23 13:57:47 +01:00
Kevin Burke
de3ab24fa1
fix more build errors
2014-05-23 05:37:52 -07:00
anyc
03db2f6106
Readme update and small fix for mingw
2014-05-23 14:29:09 +02:00
Kevin Burke
75f90559a5
Fix build errors.
2014-05-23 05:19:05 -07:00
Duncan Frost
296e014ac0
Added palette pointer
2014-05-23 13:03:26 +01:00
Kevin Burke
9592ed0e53
move the last bit of data into a table
2014-05-23 20:57:50 +09:00
IntelOrca
39581f265a
Merge branch 'bug_fixes' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-bug_fixes
2014-05-23 12:16:26 +01:00
IntelOrca
01da128c14
add money types
2014-05-23 12:15:08 +01:00
Duncan Frost
503826e762
Cleaned up comments added enums to make code easier to read
2014-05-23 12:08:20 +01:00
Duncan Frost
dc3804bfa2
Fixes one of the issues of #121 but 526 cannot be easily fixed
2014-05-23 11:28:35 +01:00
Duncan Frost
f7b8d4567b
Fixed #122 . Changed config to use better sounding settings.
2014-05-23 11:14:34 +01:00