mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,020 Commits 8 Branches 39 Tags 360 MiB
Commit Graph

96 Commits

Author SHA1 Message Date
Alexander Overvoorde bb059a2741 Resolves #4559: Changes land rights buttons to be disabled if no tiles for sale remain 
This commit changes the land rights button in the park window to be
disabled if there are no more land rights and construction rights for
sale. It also disables the individual land rights and construction
rights buttons in the land rights window itself if that specific type of
tile is no longer for sale.

This is implemented by introducing two new global variables called
gLandRemainingOwnershipSales and gLandRemainingConstructionSales. These
are updated by map_count_remaining_land_rights() to contain the number
of land rights and construction rights that remain for sale. This
function is called when a scenario is loaded and whenever the game
command to buy land rights or construction rights is invoked.

It also introduces three new tooltip strings that explain why the
buttons are disabled.
 2016-10-31 20:21:10 +01:00
Marijn van der Werf 487d6d8f15 Remove unnecessary addresses.h imports 2016-09-17 20:59:55 +01:00
Ted John d0950af9df Integrate gClearSceneryCost and gLandRightsCost 2016-09-10 12:28:01 +01:00
Ted John 248424e6ad Remove uses of 0x009BC677 buffer 2016-09-05 23:00:17 +01:00
Marijn van der Werf 3a7fa512a2 Use `rct_string_id` as type where applicable 2016-08-21 16:33:37 +02:00
Michał Janiszewski 0ece63a7f6 Wrap RCT2's addresses in RCT2_ADDRESS macro 2016-08-06 21:38:46 +01:00
Marijn van der Werf 51f4988e06 Clean/include peep/staff vars 2016-08-02 23:32:58 +02:00
Michał Janiszewski a6d0e6916e Fix function definitions to match their declarations 
This makes sure every function is properly declared, which includes
proper `extern` wrappers.
 2016-07-14 14:11:49 +02:00
Marijn van der Werf 5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02:00
Ted John 04340021f6 Fix #4071: Guests paid when free entry park flag 
Make most usages of park entrance fee use a common function which does the necessary checks.
 2016-07-13 19:48:42 +01:00
Josue Acevedo c17a89707c Fix #4031: Costs of land rights not displayed when hovering a tile 2016-07-11 09:31:42 +01:00
Martin Černáč 6e9d1bf1ea Refactor more string & sprite hard-coded ids (#3670) 2016-05-19 18:22:24 +01:00
Martin Černáč 3bdc06dc25 Refactor hard-coded strings to use string_ids.h constants (and couple sprites too) (#3658) 2016-05-18 21:51:37 +01:00
Ted John 1cc35dfe6e integrate common format args 2016-05-15 22:03:53 +01:00
Ted John 81efb92d53 integrate map selection variables 2016-05-14 00:54:13 +01:00
Ted John 3105d62d3b add global macro for gTotalAdmissions, gTotalIncomeFromAdmissions 2016-05-09 21:05:17 +01:00
janisozaur 68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Michael Steenbeek 142c54852d Clean up some residual usages of old config (#3484) 2016-05-03 22:36:29 +01:00
Ted John cea0f30121 integrate variable: gLandToolSize 2016-04-24 18:02:37 +01:00
Ted John 6c25c85363 add variable pointers for park entrance position 2016-04-24 10:53:04 +01:00
Ted John 98f732aaf7 integrate screen variables (#3411) 2016-04-24 00:36:39 +01:00
Ted John a1150d31cf add global macros for more scenario variables 2016-04-23 18:07:07 +01:00
Ted John ef7dd83735 add pointer variables for scenario name and details 2016-04-23 17:53:25 +01:00
Ted John 66855e41e5 add global macro: gParkNameArgs 2016-04-23 02:28:11 +01:00
Ted John 463a2f4533 add global macro: gScenarioObjectiveCurrency 2016-04-23 02:23:17 +01:00
Ted John 1f6081c0d9 add global macro: gScenarioObjectiveNumGuests 2016-04-23 02:18:45 +01:00
Ted John 17f5d8cb48 add global macro: gScenarioObjectiveYear 2016-04-23 02:16:32 +01:00
Ted John 35e5c49454 add global macro: gScenarioObjectiveType 2016-04-23 02:14:14 +01:00
Ted John 0971d8ad51 add global macro: gParkRating 2016-04-23 01:47:03 +01:00
Ted John fda4542d63 add global macro: gParkName 2016-04-23 01:40:11 +01:00
Ted John b59f5c17ca add global macros for park... 
- gParkSize
- gParkEntranceFee
- gNumGuestsInPark
 2016-04-23 01:00:00 +01:00
Ted John 307cb9e08b add global macro: gParkFlags 2016-04-23 00:51:22 +01:00
Ted John f73e3ab0e1 integrate footpath construction variables 
- uint8 gFootpathProvisionalFlags
- rct_xyz16 gFootpathProvisionalPosition
- uint8 gFootpathConstructionMode
- uint16 gFootpathSelectedId
- uint8 gFootpathSelectedType
- rct_xyz16 gFootpathConstructFromPosition
- uint8 gFootpathConstructDirection
- uint8 gFootpathConstructSlope
- uint8 gFootpathConstructValidDirections

Also fix some previous variable integrations that had been forgotten to change.
 2016-04-15 19:16:48 +01:00
Ted John 84edd049d9 integrate current tool variables: 
- gCurrentToolId
- gCurrentToolWidget
 2016-04-15 18:26:47 +01:00
Ted John 1b3f46f960 integrate game command error string variables 
- gGameCommandErrorTitle
- gGameCommandErrorText
 2016-04-15 17:54:46 +01:00
Jacob Wallraff dbdf76649e Moving total admissions from park finance tab to stats tab 2016-02-05 19:32:07 -08:00
IntelOrca caf9bd9939 get game working with new theme manager 
Theme editor currently unavailable.
 2016-02-03 18:23:44 +00:00
Michał Janiszewski ec2387082c Remove cheats from config 2016-01-25 21:44:13 +01:00
duncanspumpkin ba314c6fc8 Fix dropdown default highlight regression 2016-01-25 17:11:56 +00:00
Michał Janiszewski 3bf1e0e06d Rename `safe_strncpy` to `safe_strcpy` 2016-01-18 20:49:52 +01:00
Marijn van der Werf e961cc885a Use RCT2_ADDRESS_COMMON_FORMAT_ARGS instead of raw address 2016-01-11 12:55:33 +01:00
IntelOrca f0adf90660 integrate variable: gInputFlags 2016-01-04 22:53:03 +00:00
Jonathan Haas 4d26e4c4a1 Refactor peep code 
Name various fields and constants related to peeps. This includes:
  - Flags for flashing peeps in map window
  - Animation frames for picked up peeps
  - Function checking if peep should start to fall
  - Special sprite handling for slide boards and lawn mowers
  - Created array for peep sprite entries, renamed some variables and constants
 2015-12-31 13:57:06 +01:00
Aaron van Geffen 9232a9906f Inventarised instances of RCT2_ADDRESS_COMMON_FORMAT_ARGS 2015-12-26 18:24:36 +09:00
IntelOrca 22b4df1a99 implement SI units for distance / speed measurement, closes #2496 2015-12-18 21:12:30 +00:00
Michał Janiszewski 075b98e209 Minor cleanups 
Mostly just setting variables to better define game state, with one
minor update of decompilation where an `or` instruction was used in
place of `mov` (in `sub_6CBCE2`).
 2015-11-12 12:19:40 +01:00
Michał Janiszewski c0e2a5c7be Add get_current_rotation function and DEBUG_LEVEL macros 2015-11-02 22:58:15 +01:00
Michał Janiszewski 9284930d7e Add safe_strncpy function 
safe_strncpy is similar to strncpy, but makes sure buffer is
null-terminated. Update most of project to use this updated function to
prevent illegal memory accesses.
 2015-10-30 16:01:00 +01:00
Alexander Overvoorde 01793e11b7 Replace RCT2_GLOBAL magic numbers with address identifiers and string ids 2015-10-29 09:44:46 +01:00
Michał Janiszewski 7d0ce00bab Strip all whitespace 2015-10-20 20:48:51 +02:00