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 358 MiB
Commit Graph

1109 Commits

Author SHA1 Message Date
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
Kevin Burke e9751e00b6 move some data tables into C 2014-05-23 19:09:16 +09:00
Duncan Frost d5586aabfe Merge to gfx_unstable 2014-05-23 11:01:19 +01:00
Duncan Frost cd3db82343 Added notes for what has been tested. 2014-05-23 10:54:31 +01:00
anyc 7811497e8c rudimentary save prompt 2014-05-23 11:31:54 +02:00
Kevin Burke e701209282 clean up upkeep function a little more 2014-05-23 18:26:49 +09:00
Duncan Frost 9f3bdff3c9 Added alternitive image_types to 2nd buffer function 2014-05-23 10:22:31 +01:00
Kevin Burke 33e2326070 add data about moving track 2014-05-23 18:14:52 +09:00
Kevin Burke 1d0a24e419 replace on ride photo value with simpler constant 2014-05-23 17:49:42 +09:00
Duncan Frost b144147400 Added last parts to main buffer function 2014-05-23 09:45:18 +01:00
Duncan Frost 8bc3ac03c4 Added more buffer of the buffer function 2014-05-23 09:05:21 +01:00
IntelOrca b3c852a074 change exe to console subsystem and print launch info. 2014-05-23 00:53:52 +01:00
IntelOrca fec1edb51e Merge branch 'mingw' of https://github.com/anyc/OpenRCT2 into anyc-mingw 2014-05-22 23:32:45 +01:00
anyc 932add79e5 bug fixes and more error reporting 2014-05-22 23:47:23 +02:00
anyc 7504018373 fix skipping intro 2014-05-22 23:47:23 +02:00
anyc 656a0aafbf check SDL return values 2014-05-22 23:47:23 +02:00
anyc 95a56b1d1e make code compatible with mingw64 2014-05-22 23:47:23 +02:00
anyc d34e2db9e1 added GCC/MinGW-compatible assembler 2014-05-22 23:47:18 +02:00
Duncan Frost 5a5a5409a2 Started implementing next set of buffer functions. Cleaned up some comments and code paths 2014-05-22 19:18:50 +01:00
anyc 872f4521a0 fixed strcat and rct2_startup_checks() 2014-05-22 20:18:42 +02:00
anyc e95e6310dc use SDL_HasMMX() do detect MMX capability 2014-05-22 20:17:13 +02:00
Duncan Frost 5c927eb418 Fixed small graphical glitch caused by too small a variable 2014-05-22 17:51:15 +01:00
Kevin Burke cf5556d2fe feedback from code review 2014-05-22 21:16:22 +09:00
Kevin Burke 74b41b08ea it is used for upkeep 2014-05-22 09:13:53 +09:00
Kevin Burke 7483ac2307 refactor, fix tabbing 2014-05-22 09:02:55 +09:00
Kevin Burke 2c03908700 revert change in config.c 2014-05-22 08:59:58 +09:00
Duncan Frost e5a9426203 Added final part of main code section. 2014-05-21 18:57:56 +01:00
Duncan Frost e11e9d78f9 Fixed small bug due to wrong constant. 2014-05-21 18:21:49 +01:00
Kevin Burke cd414e98f6 minor changes to get it to compile 2014-05-21 09:06:38 -07:00
Kevin Burke c374536cbb more work on crooked house 2014-05-22 01:00:58 +09:00
Kevin Burke 5fbe85aded WIP: add ratings for crooked house 2014-05-21 23:27:31 +09:00
Kevin Burke 2d08752a04 comment ride status 2014-05-21 11:59:05 +09:00
Duncan Frost 0a8a56d4b0 Bug in buffer code changing the colour of peep 2014-05-20 18:32:42 +01:00
anyc e6c90c6ebb fixed static enums; added missing headers 2014-05-20 17:55:39 +02:00
anyc 82fa4439bf renamed strings.[ch] to string_ids.[ch] due to name collision 2014-05-20 17:55:39 +02:00
IntelOrca 5823e9dac1 Merge branch 'c_based_window_event_handlers' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-c_based_window_event_handlers 2014-05-20 03:18:18 +01:00
IntelOrca 827537945b Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-20 03:17:10 +01:00
Duncan Frost 9270aa6aae Fixed tab background bug. 2014-05-19 22:06:01 +01:00
Duncan Frost 400351a38c Finally found bug. It was caused by the wrong offset in the calling sub. 2014-05-19 21:12:00 +01:00
Duncan Frost 87d855b95d Fixed bug due to options window calling update on WM_INVALIDATE 2014-05-19 19:14:29 +01:00
Duncan Frost d077beea20 Changed window_update to use cdecl where possible 2014-05-19 18:47:14 +01:00
Duncan Frost aaca1d2ece Started switch over to c based window event handlers with backwards compatibility 2014-05-18 20:32:50 +01:00
Duncan Frost a4645ec806 Trying to locate bug in drawing ready code. 2014-05-18 19:27:00 +01:00
Duncan Frost 69b9c45a40 Started adding in the rest of draw sprite function added in stub function for 2nd draw to buffer func 2014-05-18 09:30:13 +01:00
Duncan Frost 0fa9e6ebb9 Finished turning the code into C removed all present bugs. Buffer draw code for basic images is done. 2014-05-18 08:14:47 +01:00
Duncan Frost 5eb445857b Trying to find bug in new version of code 2014-05-17 17:40:55 +01:00
Maciek Baron d5d352cd41 Implementing small loan & cheat detection related routine 2014-05-17 16:04:19 +01:00
Maciek Baron 9e0c310320 Labelling path construction related addresses 2014-05-17 15:21:34 +01:00
Duncan Frost 001ccc3945 Started cleanup of code introduced a bug at some point 2014-05-16 19:06:35 +01:00
ZedThree e209e370be Tidy up gfx_fill_rect_inset 
Give names to flags and different tones
 2014-05-16 19:53:12 +02:00
ZedThree 4fae966855 Bug fix: pressed buttons not the right colour 2014-05-16 19:53:11 +02:00
ZedThree 67980e2f5f Fix bug with transparency 2014-05-16 19:53:11 +02:00
ZedThree 088ac32da3 Add gfx_fill_rect 
Still a little buggy for transparent colours
 2014-05-16 19:53:11 +02:00
Duncan Frost 1aa3bc0232 Started clean up of buffer interaction code.Still a little buggy 2014-05-15 22:15:29 +01:00
ddevrien 962ee0f98f fix compile error 2014-05-15 13:13:58 +02:00
ddevrien 134391a120 map window: invalidate method implemented 2014-05-15 12:58:20 +02:00
IntelOrca 19dd6b1bde Merge branch 'duncanspumpkin-gfx_draw_sprite' into gfx_unstable 2014-05-15 00:25:47 +01:00
IntelOrca 12dfd1e644 fix warnings 2014-05-15 00:23:50 +01:00
Duncan Frost 7f20fa9338 Skipping buggy code for now. Will be looked at some time later 2014-05-14 22:14:46 +01:00
Duncan Frost 84c7f33ba1 Changed to memset to make code look a bit simpler 2014-05-14 22:07:59 +01:00
Duncan Frost ff86f7e9e9 sub0x67a934 turned into almost proper C code 2014-05-14 21:58:35 +01:00
ddevrien 0dac34dd2a map window paint method 2014-05-14 19:07:21 +02:00
Duncan 2c7118c01b Added guess about G1 dpi. 
Warning not tested.
 2014-05-14 17:01:13 +01:00
ddevrien 9fc3756c92 map window work + identified window var 4AC (selected tab idx) 2014-05-14 15:58:14 +02:00
ddevrien a8a0dbc073 sprite id error 2014-05-14 14:07:21 +02:00
ddevrien be52e47040 map widgets + identified spinner widget 2014-05-14 14:06:39 +02:00
ddevrien 90b7174a21 map window basic stuff done 2014-05-14 12:49:40 +02:00
ddevrien c069d0fa50 Started work on map window 2014-05-14 12:43:14 +02:00
IntelOrca 5498172a0c improve config_parse_currency 2014-05-14 12:14:03 +01:00
Jørn Lomax 3fb61984f2 removed unwanted spaces 2014-05-14 12:28:03 +02:00
Jørn Lomax a682a5e9a5 more configuration moved to new format. Started separating setings into 
categories (general and sound so far)
 2014-05-14 12:25:35 +02:00
Jørn Lomax a104b4dd55 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/addresses.h
	src/config.c
 2014-05-14 12:19:39 +02:00
IntelOrca cc850159e4 Merge branch 'duncanspumpkin-gfx_draw_sprite' into gfx_unstable 2014-05-14 11:02:16 +01:00
Jørn Lomax d1cec342f8 intermidiate commit 2014-05-14 11:54:56 +02:00
IntelOrca b2c983713d Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window 2014-05-14 02:57:20 +01:00
ddevrien 92a803075c implemented options window update method 2014-05-14 00:59:34 +02:00
adrian17 31424b6a06 Use macros defined in addresses.h where possible. Removed one doubled macro. 2014-05-13 23:37:45 +02:00
Duncan Frost 8ecde8f07a Moved around logic so it runs correctly 2014-05-13 20:10:49 +01:00
Duncan Frost 92386e5758 Fix sketchy line bug that i introduced 2014-05-13 19:12:18 +01:00
Duncan Frost 20c7b98c88 merge 2014-05-13 19:06:15 +01:00
Duncan Frost eb2682fbd4 Fix merge error 2014-05-13 19:03:23 +01:00
Duncan Frost ba16b197e3 Bug found in the first test doh. 2014-05-13 19:01:59 +01:00
Duncan Frost 1d754dc390 Still searching for bug 2014-05-13 18:32:57 +01:00
IntelOrca 3b6069fab6 Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window 2014-05-13 01:23:36 +01:00
IntelOrca 98ab959ef9 fix warnings in options window 2014-05-12 23:19:36 +01:00
IntelOrca d2b8446e15 Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window 2014-05-12 23:17:56 +01:00
ddevrien e71170334f options window mouseup code 2014-05-13 00:13:23 +02:00
Duncan Frost 756f21b427 Trying to understand how the drawing function works 2014-05-12 22:04:07 +01:00
IntelOrca 4a85a8b738 Merge branch 'master' of https://github.com/adrian17/OpenRCT2 into adrian17-master 2014-05-12 22:00:23 +01:00
adrian17 62c9069c9f Increase the warning_throttle array size to hold all 7 values 2014-05-12 22:22:20 +02:00
Duncan Frost 72d9d17bf7 Added some more sprites and changed get_guest_face to use them 2014-05-12 21:06:02 +01:00
adrian17 0e02787bf3 Prefer the RCT2_GLOBAL macro 2014-05-12 22:03:24 +02:00
ddevrien 4550a1de68 More work on options window 
dropdown function
 2014-05-12 21:18:27 +02:00
Jørn Lomax 6b7cdf539b added missing file from commit 2014-05-12 17:31:57 +02:00
Jørn Lomax fcfe5f271d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/config.c
 2014-05-12 17:31:25 +02:00
Jørn Lomax 3382be1430 intermidiate comit 2014-05-12 17:29:16 +02:00
ddevrien 942b722b28 some work on options window 2014-05-12 16:59:20 +02:00
ddevrien df97c22dae some strings added 2014-05-12 16:56:28 +02:00
ddevrien c6fc8c634b celsius fix 2014-05-12 16:51:40 +02:00
ddevrien 85a1e4aa6d config addresses 
test
 2014-05-12 16:50:13 +02:00
IntelOrca 7c6a193b42 remove all remaining warnings 2014-05-12 02:18:08 +01:00
IntelOrca 8dcca91092 mass clean up and reduce warnings 2014-05-12 01:45:45 +01:00
lnz bb12fc1a42 Implement update for ride favourited numbers 2014-05-11 23:21:26 +02:00
lnz 19a475f05a Implement ride upkeep payments 2014-05-11 23:17:20 +02:00
IntelOrca 1cead7ad38 Merge branch 'master' into gfx_unstable 2014-05-11 21:29:07 +01:00
IntelOrca e4aaeded5f Merge branch 'gfx_draw_line' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_line 2014-05-11 21:27:27 +01:00
Duncan Frost 84342b07d2 Replaced decompiled code with bresenhams algorithm. Gfx_draw_line finished. 2014-05-11 21:25:18 +01:00
ZedThree ea83381e4c Add author 2014-05-11 22:19:01 +02:00
ZedThree 7f4e21f334 Bug fix: cross-hatch loop was wrong 
Also rename and tidy up a bunch of variables
 2014-05-11 21:31:31 +02:00
Duncan Frost 45532da9c6 Rewrote gfx_draw_line_on_buffer after realising how it works 2014-05-11 20:10:32 +01:00
IntelOrca 01fb20e397 Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options 2014-05-11 19:23:57 +01:00
ZedThree 1e8f80fa5c Bug fix - memset doesn't increase pointer 2014-05-11 18:42:28 +02:00
ZedThree ba6263d2bd Cross-hatching branch 2014-05-11 18:42:27 +02:00
ZedThree ce0df83298 Formatting 2014-05-11 18:42:27 +02:00
ZedThree 6f1421117b Some tidying up. Scrollbars don't work 2014-05-11 18:42:27 +02:00
ZedThree 705af9377b Start decompiling gfx_fill_rect 
Section starting 0x00678C83 complete and works, but needs better comments/names
 2014-05-11 18:42:26 +02:00
ddevrien 81f2bfed35 Implemented checkbox widget draw function 2014-05-11 18:42:26 +02:00
IntelOrca bf8a032553 fix dropdown argument arrays 2014-05-11 16:50:29 +01:00
ddevrien 0ba23fe886 Some work on options window 2014-05-11 17:24:52 +02:00
Duncan Frost cd8587243c Initial rewrite of gfx_draw_line 2014-05-11 13:14:43 +01:00
IntelOrca 8a6ad40c5d Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options 2014-05-11 11:56:35 +01:00
IntelOrca 5a26d064d6 Merge branch 'gfx_draw_sprite' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_sprite 2014-05-11 11:49:21 +01:00
IntelOrca 081a88d069 Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options 2014-05-11 11:40:46 +01:00
Duncan Frost 6d97593093 Bug in main draw_sprite func for now skipping code 2014-05-11 10:14:38 +01:00
ddevrien 52c95e4154 little addition to checkbox widget 2014-05-11 10:57:56 +02:00
ddevrien 5c5c5373cd Implemented checkbox widget draw function 2014-05-11 10:51:05 +02:00
ddevrien 580035fdef Fix groupbox widget draw issue (issue #91) 2014-05-11 09:45:03 +02:00
ddevrien 977fe5f485 forgot debug code 2014-05-11 09:04:25 +02:00
ddevrien b39cf4d1af Started work on options window 2014-05-11 09:01:01 +02:00
IntelOrca 70e7660d0b add park_reset_awards_and_history 2014-05-11 01:18:56 +01:00
IntelOrca f8363e098b add park_init 2014-05-11 00:35:45 +01:00
Duncan Frost 26f4b35e61 Cleaned up code so that it makes more sense. 2014-05-10 12:26:19 +01:00
Duncan Frost 16ed98348a Found bug due to signness on global var 2014-05-10 10:16:23 +01:00
Duncan Frost 601305a4e3 Still searching for bug. Must be some external memory not set 2014-05-10 10:12:48 +01:00
ddevrien 5f690ac134 Added basic code for banner window 2014-05-10 09:27:19 +02:00
Duncan Frost 1086c4e524 added notes to help find bug 2014-05-10 07:14:12 +01:00
IntelOrca 61ceee26a7 remove extra scenario name address macro 2014-05-10 00:40:47 +01:00
Maciek Baron d3382e3a38 Renaming ride construction content 2014-05-09 23:43:10 +01:00
Maciek Baron 73d06418b6 Adding ride build date, reset function 2014-05-09 23:40:38 +01:00
IntelOrca 3b8f0d685b convert handling shortcut keys to switch 2014-05-09 23:05:50 +01:00
IntelOrca 10b4c3cfab Merge branch 'shortcuts' of https://github.com/ZedThree/OpenRCT2 into ZedThree-shortcuts 2014-05-09 22:28:26 +01:00
IntelOrca b8dd77c1d7 Merge branch 'window_banner' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_banner 2014-05-09 22:25:10 +01:00
ZedThree 2523b1f328 Fix a couple of window bugs 2014-05-09 23:10:26 +02:00
ZedThree 93d062704d Add code to handle shortcuts 2014-05-09 23:10:25 +02:00
ZedThree bc413fede9 Add helper function for calling widget events 
Add window_event_helper
 2014-05-09 23:10:13 +02:00
ZedThree b2d1f0dfd6 Add functions for closing top/all window(s) 2014-05-09 22:53:26 +02:00
ddevrien b280675ab5 cleanup 2014-05-09 21:03:00 +02:00
ddevrien 6ddeb610f0 Some additions to window_banner 2014-05-09 20:59:41 +02:00
IntelOrca f813a70cd6 Merge branch 'os-specific' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-os-specific 2014-05-09 14:39:27 +01:00
IntelOrca f315013e76 Merge branch 'master' of https://github.com/mzmiric5/OpenRCT2 into mzmiric5-master 2014-05-09 14:36:49 +01:00
atmaxinger 45f78eded4 Moved platform specific UI code (MessageBox, DirectoryChooser) into osinterface.c 2014-05-09 11:40:06 +02:00
Duncan Frost f3e7c6c23c Added more of draw_sprite still needs work. Function call does not work 2014-05-09 09:18:49 +01:00
ddevrien 3eff5ebf6f Added basic code for banner window 2014-05-09 10:11:31 +02:00
Maciek Baron 0c34c3791c Cleaning up files and code related to windows 2014-05-08 21:48:31 +01:00
Duncan Frost 2276c198fd Removed a pointless call in palette tried to make draw sprite more understandable 2014-05-08 20:43:10 +01:00
Duncan Frost f448929f73 First couple lines decoded 2014-05-08 20:13:58 +01:00
Miso Zmiric (Mike Squinter) 240662ee39 another typo fixed :) 2014-05-08 19:55:35 +01:00
IntelOrca 62df9a91bd Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master 2014-05-08 19:47:47 +01:00
Duncan Frost 63681f6877 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-08 19:16:34 +01:00
Duncan Frost d3be99cc98 Added get_guest_face_sprite small and large functions. 2014-05-08 19:15:31 +01:00
IntelOrca 1523ac818d Merge branch 'open_news_item' of https://github.com/ZedThree/OpenRCT2 into ZedThree-open_news_item 2014-05-08 17:48:57 +01:00
ZedThree 85b102c5b0 Change NEWS_ITEM_SCENERY to NEWS_ITEM_RESEARCH 2014-05-08 17:53:57 +02:00
ZedThree c1ac6edb96 Add function to open park window to guests tab 2014-05-08 17:35:32 +02:00
ZedThree c94fd53022 Add news_item_open_subject() 2014-05-08 17:14:08 +02:00
ZedThree a35289fc9f Add functions to open park window to awards/rating 
Also update replace some address that have constants/functions
 2014-05-08 17:11:26 +02:00
IntelOrca 231777d131 clean up config 2014-05-08 16:07:57 +01:00
IntelOrca 0e7283679b Merge branch 'master' of https://github.com/mzmiric5/OpenRCT2 into mzmiric5-master 2014-05-08 15:58:31 +01:00
Miso Zmiric (Mike Squinter) b1017a839f fix late night typo 2014-05-08 13:06:36 +01:00
Jørn Lomax 7d4a80cea2 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/config.c
	src/config.h
 2014-05-08 11:09:31 +02:00
Jørn Lomax 4e13b24104 Revamped the config system. Now enables sections and comments. 
Also enables some validation checking of the config file
 2014-05-08 11:05:07 +02:00
Miso Zmiric (Mike Squinter) b04b25d013 Add directory_browser to config_create_default 
partially resolves #42 [https://github.com/IntelOrca/OpenRCT2/issues/42]
 2014-05-08 07:10:26 +01:00
IntelOrca d5927e415f use finance_payment in do_game_command 2014-05-07 23:45:16 +01:00
IntelOrca 9e6d19a672 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-07 22:42:01 +01:00
IntelOrca 3792b2b72e Merge branch 'scenario_update' of https://github.com/lnz/OpenRCT2 into lnz-scenario_update 2014-05-07 22:40:23 +01:00
IntelOrca 8fff53f043 Merge branch 'fix_park_rating' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-fix_park_rating 2014-05-07 22:38:22 +01:00
IntelOrca 604f61732c Merge branch 'master' of https://github.com/ddevrien/OpenRCT2 into ddevrien-master 2014-05-07 22:36:47 +01:00
ZedThree 76611d054a Fix bug in open_load_game_dialog() 
Should return the result of osinterface_open_common_file_dialog()
 2014-05-07 23:11:23 +02:00
Maciek Baron c70865457c Adding window_ride_init_vars and various enums 
Adding window_ride_init_vars and various enums, also decompiled one
unknown function.
 2014-05-07 21:17:26 +01:00
Duncan Frost dc1386cca2 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into fix_park_rating 2014-05-07 19:58:55 +01:00
ddevrien 15c1213fb5 Identified WWT_6, added some strings 
WWT_6 is used for signs, it's the color selection button
 2014-05-07 20:53:33 +02:00
Duncan Frost bfd4dbcbe9 Changed litter var_24 to unsigned 2014-05-07 19:46:30 +01:00
Duncan Frost 4e4fa93e14 Fixed litter bug. Removed debug notes. Made rides code more readable 2014-05-07 19:44:13 +01:00
Duncan Frost 8ddfc136f6 Fixed bug in second ride related equations 2014-05-07 18:57:50 +01:00
lnz 840c76b68e Fix month not changing bug and wage cost bug. 2014-05-07 16:28:42 +02:00
lnz 169a3b6b72 Implement Peep problem warnings update. 2014-05-07 16:24:36 +02:00
IntelOrca 18d95968f2 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-07 00:37:13 +01:00
Maciek Baron aef83362bc Cleaning up small shared functions 
Cleaning up small shared functions and moving them to appropriate files
 2014-05-06 22:04:09 +01:00
Duncan Frost b52c5c0b2d Peeps part now working 2014-05-06 21:54:42 +01:00
Duncan Frost 3629247056 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into fix_park_rating 2014-05-06 21:18:17 +01:00
Duncan Frost eb828c0041 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-06 21:14:02 +01:00
Duncan Frost c26b944b6e Now uses string references 2014-05-06 21:13:38 +01:00
Duncan Frost da0236ef84 Labeled init values for Shearwood Forest 2014-05-06 21:09:08 +01:00
IntelOrca d74bae8023 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-05 23:30:04 +01:00
Maciek Baron 1f00ad9110 Implemented a few functions in editor.c 2014-05-05 23:10:47 +01:00
lnz 9de233e34b Actually add finance code. 2014-05-05 22:16:34 +02:00
lnz 589118d66d Implement some finance functions and added a few addresses & tables 2014-05-05 22:14:45 +02:00
lnz 48caec8b58 Label unimplemented functions in scenario_update 2014-05-05 22:14:17 +02:00
Duncan Frost 2b900bebb3 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-05 20:27:40 +01:00
Duncan Frost 5ca2b1a7fd Added more strings 2014-05-05 20:27:06 +01:00
IntelOrca 726c1a2312 fix peep structure 2014-05-05 20:16:27 +01:00
IntelOrca 73d9be16ab Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master 2014-05-05 20:14:53 +01:00