Commit Graph

91 Commits

Author SHA1 Message Date
Patrick Wijnings 81163506e9 Merge remote-tracking branch 'IntelOrca/master'
Conflicts:
	src/game.c
	src/park.h
2014-08-30 15:18:31 +02:00
Patrick Wijnings 5e96da6634 Fix definition of PARK_FLAGS_NO_MONEY flag and clean up related code. 2014-08-30 15:11:19 +02:00
adrian17 b6f98167c4 Use macros from addresses.h 2014-08-28 17:27:48 +02:00
Marco Costa bb81bfd5d0 Created named address RCT2_ADDRESS_SCENARIO_TICKS
* 0x00F663AC is now named RCT2_ADDRESS_SCENARIO_TICKS. This variable
starts at an arbitrary value, defined by the current scenario, and
increments by 1 on every game tick.
* Also, added meaningful name to some variables in draw_light_rain and
draw_heavy_rain.
2014-08-24 21:27:56 -04:00
IntelOrca 16b552270b add rct_ride_type structure 2014-08-24 23:02:19 +01:00
IntelOrca 96aaa87543 make both game commands use same call and rename / use more commands in enum 2014-08-07 22:25:51 +01:00
adrian17 c6e94ebd79 Change some comparisons in scenario_objectives_check() 2014-07-27 16:11:13 +02:00
Duncan Frost d68e716cd8 Removed compile errors. Implemented changes to window.h 2014-07-23 18:07:38 +01:00
adrian17 843c45aafc Use address names from addresses.h 2014-07-18 22:28:15 +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
Duncan Frost 32624b912c Tried swaping to a global variable for ride_list 2014-06-29 14:38:38 +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
lnz 35b38f3c16 Remove debug statements and add string_ids for ride connected functions. 2014-05-30 00:12:29 +02: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 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
IntelOrca d8a61d9792 fix award window bug and clean reset history 2014-05-28 01:50:50 +01:00
IntelOrca 65e579045c show full date in bottom right panel 2014-05-27 21:28:16 +01:00
IntelOrca 72b2272b1f apply loop macros and implement more awards 2014-05-27 18:03:25 +01:00
IntelOrca 30e6358fd4 implement more awards WIP 2014-05-27 15:14:45 +01:00
IntelOrca 88ffb17a4a add initial update awards implementation 2014-05-27 14:00:13 +01:00
IntelOrca 6d824fd3a8 fix compile error and add update history placeholder 2014-05-27 00:35:14 +01:00
IntelOrca 1b3c46c17d implement park_calculate_guest_generation_probability 2014-05-26 23:44:47 +01:00
IntelOrca 7190e4c3f6 implement object_get_scenario_text 2014-05-26 17:59:42 +01:00
IntelOrca 092764ea6b separate marketing and add finances window 2014-05-25 23:17:55 +01:00
IntelOrca 5b568f376c add peep_applause 2014-05-25 19:47:11 +01:00
IntelOrca 6d7b4b1808 add park update and guest generation 2014-05-25 13:59:31 +01:00
IntelOrca d5ad84a7d1 clean up scenario loading some more 2014-05-24 22:14:42 +01: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
IntelOrca 01da128c14 add money types 2014-05-23 12:15:08 +01:00
anyc d34e2db9e1 added GCC/MinGW-compatible assembler 2014-05-22 23:47:18 +02: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
Maciek Baron d5d352cd41 Implementing small loan & cheat detection related routine 2014-05-17 16:04:19 +01:00
adrian17 31424b6a06 Use macros defined in addresses.h where possible. Removed one doubled macro. 2014-05-13 23:37:45 +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 70e7660d0b add park_reset_awards_and_history 2014-05-11 01:18:56 +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
Maciek Baron 0c34c3791c Cleaning up files and code related to windows 2014-05-08 21:48:31 +01:00
IntelOrca 9e6d19a672 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-07 22:42:01 +01: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
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
lnz 589118d66d Implement some finance functions and added a few addresses & tables 2014-05-05 22:14:45 +02:00