mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,949 Commits 9 Branches 41 Tags 388 MiB
Commit Graph

1373 Commits

Author SHA1 Message Date
IntelOrca 9b833e5f93 shorten path for scenario select debug 2016-01-02 23:14:41 +00:00
IntelOrca 9eacd3532b use correct window variable for highlighted scenario 2016-01-02 21:13:24 +00:00
IntelOrca ededc82cba add DLC and Build your own scenario classification 2016-01-02 21:06:46 +00:00
IntelOrca d147f516db fix default selected tab on scenario select 2016-01-02 21:05:57 +00:00
IntelOrca aeda8d68f9 add logic for unlocking mega park and making it invisible 2016-01-02 21:05:37 +00:00
IntelOrca 82b05950ff add RCT1 title sequence 2016-01-02 21:05:33 +00:00
IntelOrca f2c5ce32f2 improve options window for scenario options 2016-01-02 21:05:33 +00:00
IntelOrca 950722292c use user path for default scenario save location 2016-01-02 21:05:31 +00:00
IntelOrca 95ee0be3c5 handle scenario conflicts 2016-01-02 21:05:08 +00:00
IntelOrca af67cf5703 refactor scenario sources and improve scenario select window 2016-01-02 21:04:44 +00:00
IntelOrca 72e820dead add horizontal rule headings to scenario list 2016-01-02 21:04:44 +00:00
IntelOrca 6a768c4a3c redo entire scenario highscore load / saving 
- load and save highscores to new file format (highscores.dat)
- scan scenarios from RCT2 data and user data
- load highscores from legacy file (scores.dat)
- fix various issues with new scenario select window
 2016-01-02 21:04:10 +00:00
IntelOrca 63529a5213 fix option widgets for scenario grouping 2016-01-02 21:03:39 +00:00
Aaron van Geffen f7d33f3cab Rename constants et al per code reviewer's request. 2016-01-02 21:03:38 +00:00
Aaron van Geffen f49e3eea1c WIP: misery: adding scenario options to options screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen 15782b88c4 Experimental: optional unlocking of scenarios ("campaign mode") in scenario select screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen 3bb1588cfa Shrink window when showing scenarios by difficulty level. 2016-01-02 21:00:07 +00:00
Aaron van Geffen eb87c5284f Adapt scenario select screen based on scenario source game. 2016-01-02 21:00:06 +00:00
Aaron van Geffen 3bad0870fb Added routines to find scenario index and source from predefined listings. 2016-01-02 21:00:05 +00:00
Aaron van Geffen cf935d45c6 Add configuration bits for scenario select mode and unlocking. 
Note this lacks an interface in the options window as of yet.
 2016-01-02 21:00:05 +00:00
Aaron van Geffen 3999ebd031 WIP: adding new tabs to scenario select window; extended window size. 2016-01-02 21:00:03 +00:00
Hielke Morsink bc2ac2e28b Split extension setter into two functions 2016-01-02 20:45:00 +01:00
Hielke Morsink f31a5f2248 More secure checks for removing and setting file extensions. 2016-01-02 18:57:11 +01:00
Hielke Morsink eadb03426e fix #2620 and preventing names with dots from breaking. 2016-01-02 14:59:16 +01:00
Duncan 5b9a98a0f9 Merge pull request #2588 from HaasJona/refactor2 
Refactor peep code
 2016-01-01 22:22:18 +00:00
Hielke Morsink 560a435748 Drawing checkmarks for set flags 2016-01-01 21:29:10 +01:00
Hielke Morsink 829c3a3339 Added correct tooltips for moving up/down buttons. 2016-01-01 21:29:09 +01:00
Hielke Morsink bf7e45939a Pixel correct paddings for list and column headers 2016-01-01 21:29:08 +01:00
Hielke Morsink ae4ff5fc6c Redesigned UI to be more consistent with the ride/staff windows. 2016-01-01 21:29:07 +01:00
Hielke Morsink a1f506df58 Fix all buttons after deleting a map element. 2016-01-01 21:29:06 +01:00
Hielke Morsink 2b7a88297f Moved some UI elements and changed default size. Updated changelog. 2016-01-01 21:29:05 +01:00
Hielke Morsink 05e807a9ca Displayng ride type for tracks 2016-01-01 21:29:04 +01:00
Hielke Morsink 389249abfd Better UI spacing. 2016-01-01 21:29:03 +01:00
Hielke Morsink 6f824c9c2e Resolved warnings. 2016-01-01 21:29:02 +01:00
Hielke Morsink 38867b7462 Fixed old typo in string ID name. 2016-01-01 21:29:00 +01:00
Hielke Morsink 64312957a0 Added column headers instead of labels, and added columns for the flags. 2016-01-01 21:28:59 +01:00
Hielke Morsink db270d85c2 automatically en/disabling buttons when needed. Selecting corrupt element when added. 2016-01-01 21:28:58 +01:00
Hielke Morsink 2a3aefdb4e fixed list issue after removing element. 2016-01-01 21:28:57 +01:00
Hielke Morsink d226012d94 Function to remove elements using the tile inspector. 2016-01-01 21:28:56 +01:00
Hielke Morsink d68ed36147 Recreated UI for tile inspector. Added swap functionality. 2016-01-01 21:28:55 +01:00
Hielke Morsink 35bf18bcb6 Added empty button that swaps the top two map elements 2016-01-01 21:28:54 +01:00
Hielke Morsink f04c97fbc1 Getting path scenery type and index using helper functions throughout the entire project. 2016-01-01 21:28:53 +01:00
Hielke Morsink b82504c5e4 Better consistensy with already existing helper functions 2016-01-01 21:28:51 +01:00
Hielke Morsink 370c08f796 Added comments to path info 2016-01-01 21:28:50 +01:00
Hielke Morsink 955bf7b26f Displaying more path info for queue. Added some helper functions. 2016-01-01 21:28:49 +01:00
Hielke Morsink 855e122b55 Printing path and addition names in tile inspector. 2016-01-01 21:28:48 +01: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
Michał Janiszewski 8a5d066efe Fix strict aliasing violations 
Compiler only guarantees proper accesses to variables when using
variable's native type or `char` (i.e. single byte type) [1].

This commit fixes violations of this rule. In most cases changing code
to a simple cast was enough, some required a bit deeper modifications.

This fixes #2596.

[1] http://blog.qt.io/blog/2011/06/10/type-punning-and-strict-aliasing/
 2015-12-31 13:27:26 +01:00
Michał Janiszewski 5f66cd48f8 Merge branch 'develop' into vehicle-update 
Conflicts:
	openrct2.vcxproj.filters
 2015-12-31 11:41:23 +01:00
IntelOrca 64b589770a remove obsolete callprocs 2015-12-29 11:57:47 +00:00
IntelOrca c6b023df86 fix warnings 2015-12-29 11:39:06 +00:00
Ted John 69f0e9d55d Merge pull request #2398 from Broxzier/comments_and_optimizations 
Refactored some util functions and some minor tweaks for saving tracks
 2015-12-29 11:31:58 +00:00
Michał Janiszewski bcfdbbd25b Minor fixes for mapgen 2015-12-29 12:03:38 +01:00
IntelOrca 292ce3b103 don't show IP address when hovering over servers for basic security 2015-12-29 01:01:26 +00:00
IntelOrca 43b31c25a1 use sprite constants for tab animations 2015-12-28 19:44:43 +00:00
IntelOrca 08d47e26a7 improve player list 
- animate tab
- show number of players
 2015-12-28 19:44:43 +00:00
IntelOrca 1a5c5a5017 fix #2577: interest rate can be set to -1 and no protection from erroneous values 2015-12-28 18:43:11 +00:00
LRFLEW 50a1f588ec Disable chain button on steep slopes that cannot have one 2015-12-27 17:31:43 -06:00
Duncan 1c41b513b4 Merge pull request #2561 from HaasJona/refactor 
Refactor Ride Customer History
 2015-12-27 17:52:52 +00:00
Michał Janiszewski 4c6ee9570c Merge branch 'develop' into vehicle-update 
Conflicts:
	openrct2.vcxproj.filters
 2015-12-27 18:11:13 +01:00
Ted John ce0442f4a2 Merge pull request #2559 from janisozaur/map-assert 
Add mapElementType entry for corrupt element
 2015-12-27 15:47:21 +00:00
Michał Janiszewski e3f5ea25ae Map unknown elem type to corrupt, update tile inspector 
In map view, all unknown types are mapped to MAP_ELEMENT_TYPE_CORRUPT,
the type that prevents rendering of all following elements on given
tile.

Tile inspector now displays element type (numeric value) for unknown
types.
 2015-12-27 10:34:02 +01:00
Gymnasiast f87bdb0eda Sort load/save window on open, fixes #2477 2015-12-27 10:28:10 +01:00
Jonathan Haas b71c649d45 Refactor ride customer count 
Renamed some confusing ride fields, extracted function to get recent ride customer count.
 2015-12-26 22:03:33 +01:00
IntelOrca 574774b2af add notification conditions 2015-12-26 17:33:33 +00:00
IntelOrca cd99b87de6 add UI for notification settings 2015-12-26 17:30:13 +00:00
IntelOrca 6240f063f1 fix a couple of sprite ID definitions 2015-12-26 17:19:25 +00:00
IntelOrca 4eb8192549 replace tutorial button with new multiplayer button 
tutorial button and multiplayer button can be enabled / disabled easily, window auto resizes etc.
 2015-12-26 17:09:37 +00:00
Michał Janiszewski 53970c2d77 Add tile type for corrupt element 
Fixes #2558
 2015-12-26 13:36:32 +01:00
Michał Janiszewski 79e5bb758d Add an assert for getting proper mapElementType 2015-12-26 13:16:03 +01:00
Aaron van Geffen 3d99b73ae1 Name enabled widgets on scenario select screen. 2015-12-26 18:46:19 +09:00
Aaron van Geffen 020334fa18 Name rct_window's var_494: highlighted_item. 2015-12-26 18:46:19 +09:00
Aaron van Geffen 9232a9906f Inventarised instances of RCT2_ADDRESS_COMMON_FORMAT_ARGS 2015-12-26 18:24:36 +09:00
Ian Spence 434b62436c Addresses code review comments 2015-12-24 08:44:12 -08:00
Ian Spence ba038c10ab Automatically open shops & stalls 
- Added a new option under misc to automatically open shops and stalls
 - Option is disabled by default
 - When enabled, shops & stalls are automatically opened right after being placed on the map
 2015-12-24 00:00:41 -08:00
IntelOrca ce0f7ab426 fix #2536: Client crashes when building new Rides 2015-12-24 01:35:14 +00:00
Michał Janiszewski cd2ec16290 Merge branch 'develop' into vehicle-update 
Conflicts:
	openrct2.vcxproj.filters
	projects/openrct2.vcxproj
 2015-12-23 19:47:16 +01:00
Aaron van Geffen 2c5651614c Corrected misspellings of "substitute". 2015-12-23 00:40:36 +09:00
Michał Janiszewski e666a24c82 Merge branch 'develop' into vehicle-update 
Conflicts:
	projects/openrct2.vcxproj.filters
	src/audio/mixer.cpp
	src/windows/ride.c
 2015-12-22 14:57:40 +01:00
IntelOrca db18fa8f14 finally fix #1619: Can't place any path 
RCT2_ADDRESS_TOOL_WIDGETINDEX was being read as an int32 sometimes
 2015-12-21 22:28:34 +00:00
Ted John 569fd7771c Merge pull request #2532 from LRFLEW/newline 
Added newlines at end of files
 2015-12-21 21:36:05 +00:00
Michał Janiszewski 5d227d8fc8 Safe handling of malformed server entries 
Refuse to add a nameless server or one without version specified, but
allow description missing.
 2015-12-21 22:14:24 +01:00
LRFLEW e6f771ec90 Added newlines at end of files 2015-12-20 22:03:37 -06:00
Gymnasiast dd460300ca Extend fast lift hill cheat and update description 2015-12-20 21:12:24 +01:00
IntelOrca 785d54aa04 fix #2502: Update current pressed footpath direction when camera rotates 2015-12-19 22:54:15 +00:00
IntelOrca 4f5f0820d5 fix track manage delete prompt window position 2015-12-19 12:17:42 +00:00
IntelOrca 22b4df1a99 implement SI units for distance / speed measurement, closes #2496 2015-12-18 21:12:30 +00:00
Linus Unnebäck e1938bb17a trap-mouse: cleanup 2015-12-18 09:13:26 +01:00
Rune Laenen 1a4ebcc0f7 Add option to trap mouse cursor 2015-12-18 09:13:26 +01:00
LRFLEW d769a13206 Fixed extern and enum name usage 2015-12-16 14:48:27 -06:00
IntelOrca 12fdf1f5e7 name vehicle entry flags 2015-12-16 19:12:58 +00:00
duncanspumpkin c00669c942 Merge sub_6DAB4C into vehicle-update 2015-12-14 21:56:00 +00:00
Michał Janiszewski a5b465fad1 Fix some compiler warnings 2015-12-14 22:52:27 +01:00
Kyle Kirby caf07c2064 Clean up the comments a litte 
• Make comment heads be /**
• Make rct2 addresses be double spaced indented
• Make there be a space afte rct2: and the address
• Make single-line rct2 addresses be full block comments
• Move description of method to top of comment
 2015-12-11 16:19:46 -06:00
IntelOrca ca01e55fa8 add show fps, #2223 2015-12-09 21:42:46 +00:00
Linus Unnebäck 16e5ace672 use RCT2_ADDRESS_TRACK_LIST 2015-12-06 18:49:35 +01:00
Linus Unnebäck bd82b7a297 use RCT2_ADDRESS in track_manage.c 2015-12-06 18:22:33 +01:00
Ted John ebcde1b231 Merge pull request #2418 from janisozaur/fixes 
fix remaining suspicious left shifts
 2015-12-05 14:20:29 +00:00
Ted John 8e3bfb7a58 Merge pull request #2409 from Gymnasiast/track-designs-manager-close 
Add close button to track designs manager, closes #1807
 2015-12-05 13:31:31 +00:00
duncanspumpkin 53fa41f2b1 Implement ride lift data 2015-12-05 10:49:12 +00:00
Duncan Frost 79fb099c21 Added more of update measurements 2015-12-05 10:48:53 +00:00
Duncan Frost 5e198dfa1f Add known ride offsets 2015-12-05 10:48:52 +00:00
duncanspumpkin 11398cf60f Fix warning. 2015-12-04 16:57:43 +00:00
IntelOrca 9426170918 fix #2425: ride campaign list corrupted if over 40 rides 2015-12-02 17:50:32 +00:00
Michał Janiszewski 796021cfdc fix suspicious left shifts 
See b5b1957f5
 2015-12-02 08:32:15 +01:00
Hielke Morsink 90e67772e0 Resolved warnings, and removed duplicated function. 2015-12-01 12:03:34 +01:00
Gymnasiast 3f6990dac9 Add close button to track designs manager, closes #1807 2015-11-30 22:53:28 +01:00
Hielke Morsink 666da74beb Changed missleading variable name from 'filename' to 'path'. 2015-11-29 19:59:15 +01:00
Hielke Morsink 5b1d93805d More consistent use between name and paths. Improved path_get_* functions. 2015-11-29 19:41:06 +01:00
duncanspumpkin b9f7f6f4a2 Fix #2395. Fix pressing construct twice 2015-11-29 17:18:42 +00:00
duncanspumpkin 4527aa263e Added check to match mechanic fix 2015-11-29 17:18:41 +00:00
duncanspumpkin cae7b03bdf Fix #1717. Fixes fix ride from failing to fix safety cut out. 
As the code to fix rides has not been completed yet it was unknown that safety cutout had so many flags requiring reseting
 2015-11-29 17:18:40 +00:00
duncanspumpkin b1c8275ec0 Disable tracks for networked games until fixed 2015-11-29 17:18:40 +00:00
IntelOrca c6056cbb6c Merge branch 'pre-release-0.0.3' into develop 
Conflicts:
	src/audio/audio.c
 2015-11-27 22:05:40 +00:00
IntelOrca 674ff839bb add icons to server list for password and version 2015-11-27 18:54:59 +00:00
IntelOrca 46924bc9eb support unicode currencies with ascii fallback 2015-11-25 22:31:00 +00:00
duncanspumpkin 5bd3b8d6af Implement util_rand due to rand having a poor range on some platforms 2015-11-20 21:40:36 +00:00
IntelOrca 67b6aa7513 fix #2330: Clear button in Object Selector doesn't refresh item list 2015-11-18 23:19:25 +00:00
duncanspumpkin 6c8c5a157f Fix #2335. Increase land window size to show price correctly. 2015-11-18 17:48:14 +00:00
Duncan e36ed5e732 Merge pull request #2325 from BodrickLight/refactor 
Refactor audio.c and audio.h
 2015-11-18 17:33:21 +00:00
Dom Light bb62b7561a Replace some uses of play_sound_panned with play_sound_at_location 2015-11-18 00:03:15 +00:00
Dom Light e9b7e41635 Refactor audio_sound_play_planned 2015-11-17 23:05:24 +00:00
Hielke Morsink 68b0068a22 Resolved warnings 2015-11-17 19:40:48 +01:00
Hielke Morsink 504f551eec Avoiding the use of strlen 2015-11-17 19:40:47 +01:00
Hielke Morsink 063a568a72 Searching through rides now also checks their type. 2015-11-17 19:40:44 +01:00
Ted John 50edff6158 Merge pull request #2314 from Gymnasiast/obsolete-tooltip 
Remote obsolete date tooltip
 2015-11-17 18:21:29 +00:00
Dom Light b9d48d2f9b Document audio.h 2015-11-17 01:05:22 +00:00
Dom Light b736de003e Sanitize audio.c 2015-11-17 01:05:21 +00:00
Dom Light 3a8b25a0ee Sanitize audio.h 2015-11-17 01:05:14 +00:00
Alexander Overvoorde 0f065cf4a9 Add string ids for scenario name window 2015-11-16 20:30:38 +00:00
Alexander Overvoorde b83e570230 Fix length of max scenario name in scenario editor 2015-11-16 20:30:26 +00:00
Alexander Overvoorde 994dd1f945 Add string ids for scenario name window 2015-11-16 17:56:51 +01:00
Alexander Overvoorde 3ba35745c8 Fix length of max scenario name in scenario editor 2015-11-16 17:50:52 +01:00
Gymnasiast 2afed6a4de Remote obsolete date tooltip 2015-11-16 11:04:00 +01:00
duncanspumpkin cd07fd5d4e Fix #1565. Construction window now checks to see if it has control of tool before canceling it 2015-11-15 09:12:19 +00:00
duncanspumpkin 331d75e5f7 Fix signs. Broken by #2172 2015-11-14 12:40:40 +00:00
duncanspumpkin 45c4dfe12d Merge branch 'develop' into pre-release-0.0.3 2015-11-13 23:30:13 +00:00
Duncan bc9a28d7ae Merge pull request #2261 from osconnoisseur/fix_2233 
Add buttons for Up and New File in the load/save dialog and fix #2233
 2015-11-13 22:50:46 +00:00
Duncan 86fdd6d1f6 Merge pull request #2280 from janisozaur/highdpi 
Highdpi
 2015-11-13 18:39:24 +00:00
duncanspumpkin aa55ca6b62 Refactor banner_remove. Fixed an original bug. 
Banners that are placed on two different heights that face the same direction will end up bugging out. This has now been fixed. This required modification of the top toolbar code in order to correctly set the z variable.
 2015-11-13 18:30:14 +00:00
Michał Janiszewski b5b1957f58 Fix some left-shifts 
An explicit `1` is considered signed by compiler, if `int` is 32 bit
long, a left shift `1 << 31` is undefined. Since the type of result is
the type of left shift operand, make sure we shift unsigned int so that
the behaviour is defined correctly.

Also one fix in peep code, where it would use too big value for
`item_extra_flags`.
 2015-11-12 13:38:10 +01: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
osconnoisseur b5c04a79e5 Added buttons for "up" and "new file" and fixed #2233 2015-11-11 21:51:21 -06:00
Michał Janiszewski 80510c91bd Add ui option to change scale in run-time 
Doesn't let user go lower than 0.5f
 2015-11-12 01:18:42 +01:00
IntelOrca 7f541240e2 fix #2279, make game remember save path rather than filename 2015-11-11 21:37:26 +00:00
Duncan bcc7e2f5a1 Merge pull request #2147 from Overv/develop 
Fix confusing errors appearing when building a flat ride partially outside the park #2129
 2015-11-09 12:39:41 +00:00
Alexander Overvoorde 3f00ec42f1 Replace trackPlaceZ RCT2_GLOBALs with define for clarity 2015-11-08 23:44:41 +01:00
IntelOrca 2e55495470 improve master server to POST json 2015-11-08 22:03:35 +00:00
Alexander Overvoorde b20a844982 Fix "land not owned" errors being overridden by "can't construct here" 
I'm not entirely sure what the "hmm" check is about, but it caused
track_place() to return early when called from
window_ride_construction_construct(), so I moved up the owned land check
to give it a higher priority.
 2015-11-08 21:47:18 +01:00
Ted John c70880c0a5 Merge pull request #2251 from Broxzier/fix_filename 
Fixed filenames being cut off when there's a dot in them
 2015-11-08 19:04:45 +00:00
Ted John a24844a6ee Merge pull request #2247 from Gymnasiast/ride-entry-flag-15-and-17 
Identify RIDE_ENTRY_FLAG_15 and 17, fix 'Show all operating modes' cheat
 2015-11-08 18:57:03 +00:00
IntelOrca 48e3d70e57 refactor colour maps 2015-11-08 18:55:32 +00:00
Hielke Morsink b929a27595 Fixed filenames with dots not being displayed completely. 2015-11-08 18:21:55 +01:00
IntelOrca 141705fe6b disable peep watching thought for multiplayer as its client specific 2015-11-08 15:15:10 +00:00
IntelOrca 12a6ec2fef stop desynchronisation when placing scenery, fixes #2111 2015-11-08 15:01:30 +00:00
IntelOrca 6fe2340dfe stop clients from pausing multiplayer games 2015-11-08 14:32:22 +00:00
Gymnasiast 4ba83b0418 Rename RIDE_ENTRY_HIDE_LAST_OPERATING_MODE to RIDE_ENTRY_DISABLE_LAST_OPERATING_MODE 2015-11-08 15:01:40 +01:00
Gymnasiast e749c1a82c Identify RIDE_ENTRY_FLAG_15 and 17, fix 'Show all operating modes' cheat 2015-11-08 14:55:01 +01:00
Gymnasiast 4e5b8a1a19 Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232 2015-11-08 11:46:11 +01:00
IntelOrca d2aa736492 fix master server communication 2015-11-08 04:02:23 +00:00
IntelOrca 782d3e63b2 add new master server functionality 2015-11-08 02:12:12 +00:00
IntelOrca 9bad4183a7 add default master server url and refactor 2015-11-07 23:56:16 +00:00
IntelOrca 74fe482a62 improve game info json 2015-11-07 23:47:50 +00:00
zsilencer 1e9381ef97 master server list 2015-11-07 22:27:51 +00:00
zsilencer 9acfd27735 password prompt for client 2015-11-07 22:26:46 +00:00
zsilencer 3b639ced47 allow host to specify password #2072 2015-11-07 22:25:47 +00:00
duncanspumpkin 983436d425 Implemented a insert corrupt element button on the tile inspector 2015-11-07 10:04:57 +00:00
IntelOrca daf95940ac add warning message for two unstable cheats 2015-11-06 18:46:18 +00:00
duncanspumpkin 13e2f8e9ed Fix #2210. Reverts from a0909a2 that cause the up button to load the same directory 2015-11-06 18:02:27 +00:00
Duncan db356290ba Merge pull request #2204 from janisozaur/language-check 
Early out and report error if langauge files are missing
 2015-11-05 22:02:25 +00:00
Michał Janiszewski 2d62c356c3 Early out and report error if langauge files are missing 
This is a common problem if you don't set up your paths properly on
Linux, so be nice and try to provide helpful message why we failed to
load instead of crashing on user a moment later.
 2015-11-05 22:41:20 +01:00
duncanspumpkin ce06ee8681 Fix #1523. Water tool selection now the correct colour. 2015-11-05 18:02:21 +00:00
Duncan 0f14d33cc6 Merge pull request #2184 from duncanspumpkin/fix_2151 
fix #2151.
 2015-11-04 19:42:34 +00:00
IntelOrca 800e80aeb3 fix demolish track piece as client on multiplayer 2015-11-03 22:58:30 +00:00
Flukiestemperor c8701ef01e partially fix #2181 
create common function
 2015-11-03 16:11:11 -06:00
duncanspumpkin d5688cdc4e Fix #2189. Map owned area not shown correctly. 
Issue was caused by doubling up a bit of code and combining it with the next line when implementing it.
 2015-11-03 18:19:23 +00:00
duncanspumpkin bbe2a34714 Fix #2151. 
I think this fixes the issue but its hard to understand from the original
issue.
 2015-11-03 14:39:33 +00:00
Michał Janiszewski c0e2a5c7be Add get_current_rotation function and DEBUG_LEVEL macros 2015-11-02 22:58:15 +01:00
IntelOrca a0909a242d fix several safe_strncpy calls 2015-11-02 21:23:01 +00:00
IntelOrca 45bfdad4e3 fix #1144 2015-11-02 20:43:55 +00:00
duncanspumpkin d21e5a3b8c Fix #2136. Issue caused by missing branch. 2015-11-01 21:03:50 +00:00
Michał Janiszewski 9a981ef68f Fix variable not being shifted 
When decompiled, at 0x6AA8ED, there's `shr edi,0x4`, which is not
reflected in sources.

The `type` without that shift could easily become a value large enough
to point to memory beyond object entries and modify those values. In my
case, it was modifying `RCT2_ADDRESS_OBJECT_LIST_NO_ITEMS` from 2122 to
2123 (by setting lowest bit), which luckily, is used later in
`setup_in_use_selection_flags`. For this reason, I believe it could be a
major source of other problems, possibly also recent `MAP_ANIMATION`
ones, although I haven't checked.

I also put an assert in place to validate type against max available
count.
 2015-11-01 18:53:47 +01:00
Ted John caa5f870c5 Merge pull request #2175 from zsilencer/network 
Network
 2015-11-01 11:24:04 +00:00
Jonathan Haas d2ec665ae4 Fix Bug #2138 2015-11-01 09:59:13 +01:00
zsilencer d18adc80de fix small error 2015-10-31 17:43:36 -06:00
zsilencer a95357a32d signs and banners editable in multiplayer 2015-10-31 11:07:36 -06: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
zsilencer 00e2ca43a1 ipv6 support, non-blocking address resolve and connect 2015-10-26 22:35:34 -06:00
Gymnasiast 9504f3f10d Replace missed occurrence of magic numbers with defines 2015-10-26 13:53:26 +01:00
Gymnasiast 61444c8518 Display the visible/practical map size instead of the technical size, fixes #2133 2015-10-26 10:21:04 +01:00
IntelOrca 8d84b540ad add vehicle struct and enum labels from vehicle-update branch. 2015-10-25 21:26:03 +00:00
IntelOrca 4ac42ff1b2 add vehicle struct, enum labels and helper functions from implement-ride-create-vehicles branch. 2015-10-25 16:00:21 +00:00
Michał Janiszewski fcd22dd8ca Memory handling fixes 2015-10-25 01:15:52 +02:00
Hielke Morsink e5ce186534 Wrapped new widget with () 2015-10-24 17:23:34 +02:00
Hielke Morsink dc8e197799 Added 10-minute inspections cheat. 2015-10-24 17:10:33 +02:00
Ted John 5e9912e880 Merge pull request #2038 from HaasJona/restart_required 
Require a restart after changing hardware rendering
 2015-10-24 14:44:01 +01:00
Jonathan Haas 475466dcd9 Require a restart after changing hardware rendering setting, decouple setting from active status 2015-10-24 12:50:28 +02:00
Michał Janiszewski 79552feb54 Only copy strings when they're different 
When called from window_loadsave_scrollmousedown,
window_loadsave_populate_list will try to strncpy a string over itself.
This commit prevents that.
 2015-10-23 17:22:31 +02:00
Michał Janiszewski 11fb15bba7 Add casts for types 2015-10-22 23:51:05 +02:00
IntelOrca 00ff795d04 hide multiplayer button if network is disabled 2015-10-21 21:06:15 +01:00
Michał Janiszewski 8e45cccb7a Minor fixes 
Includes (mostly) type fixes, dead code removal, signed vs unsigned
comparison fixes, memory leaks removal.
 2015-10-21 08:47:09 +02:00
Michał Janiszewski 7d0ce00bab Strip all whitespace 2015-10-20 20:48:51 +02:00
Sam Horn 7250adaf71 Identify peep->var_C6 2015-10-19 18:36:45 +10:00
IntelOrca 8c276acde7 fix #2085 2015-10-18 21:16:00 +01:00
Sam Horn 34e1e773a7 Fixes #2080 2015-10-18 22:40:07 +10:00
Duncan 45d3fbf10d Merge pull request #2061 from clamburger/update_peep_on_enter_ride 
Cleaned up peep_on_enter_ride
 2015-10-18 10:21:04 +01:00
Sam Horn 05f6ea96a0 Fixed inconsistent use of peep->rides_been_on 2015-10-18 02:32:26 +10:00
IntelOrca 341b658ed0 add gui option for stay_connected 2015-10-16 22:45:17 +01:00
IntelOrca 6c6fa1d444 add ability for server to kick player, closes #2071 2015-10-16 22:20:16 +01:00
duncanspumpkin ee1e71f287 Fix loadlandscape breaking enabled tabs 
Issue was caused by not calling sub_6DFED0 when loading the landscape. I assume in vanilla this would happen as part of the loading but due to the way loadsave now works it doesn't happen. In the process I also labelled the offset for editor step.
 2015-10-15 22:16:27 +01:00
Ted John fdfe52fc19 Merge pull request #2057 from Gymnasiast/show-vehicles-from-other-track-types 
Show vehicles from other track types
 2015-10-15 12:57:57 +01:00
IntelOrca 0442f08aae remove redundant dropdown assignment 2015-10-14 21:16:10 +01:00
IntelOrca 3855d70d1a fix dropdown 64 item support and remove old RCT2 addresses 2015-10-14 21:01:04 +01:00
Gymnasiast d71ca1f376 Extend dropdowns to hold up to 64 items (with bugs) 2015-10-14 16:19:50 +02:00
Duncan d2398b65bb Merge pull request #2048 from clamburger/update_sub_6960AB 
Clean up sub_6960AB function (peep_should_go_on_ride)
 2015-10-12 21:49:46 +01:00
Gymnasiast a1cc3e4759 Fix vehicle dropdown when 'Select-by-track-type' off and 'Show vehicles from other track types' on 2015-10-12 16:01:58 +02:00
Gymnasiast 105280a082 Introduce cheat option to show vehicles from other track types 2015-10-12 15:58:15 +02:00
IntelOrca d5ae4a55ff allow 1 to 64 mountain tool size 2015-10-11 12:26:33 +01:00
Sam Horn 58b7df8fd7 Renamed ride->first_peep_in_queue to last_peep_in_queue 2015-10-11 03:03:59 +10:00
Ted John 5405cf7efd Merge pull request #2012 from Overv/develop 
Add Steam overlay detection that pauses the game (#1903)
 2015-10-05 00:07:10 +01:00
duncanspumpkin 36917bd75a Fix #1661. Track direction now remembered when deleteing last section 2015-10-04 20:52:27 +01:00
duncanspumpkin 9017e5ff86 Fix #1899. Prevent mountain tool from being possible for land ownership tool. 2015-10-04 20:44:17 +01:00
Alexander Overvoorde 51377fc960 Add setting for Steam overlay pausing and add extra check 2015-10-03 23:10:56 +02:00
Jonathan Haas ae82ffcd96 Rename window flags 2015-10-03 17:20:53 +02:00
Alexander Overvoorde 377650d9f5 Change autosave system to use wall-clock time based frequencies 
The autosave system will now use frequencies based on wall-clock
time rather than in-game time, for example every 15 minutes. This
frequency is not affected by pausing the game or changing the game
speed. The default frequency is every 5 minutes.
 2015-10-03 14:25:59 +02:00
Rune Laenen 7ac930c318 errorfix guest_list 2015-10-02 13:49:13 +02:00
Rune Laenen 5d75fa4464 var_2A to outside_of_park 2015-10-02 13:41:13 +02:00
duncanspumpkin eaa44ab1e1 Fix #1854. Special track elements disable correctly. 
Issue was caused by a change I asked to be done a month back. Dropdowns are awkward windows the global array for dropdown content should be populated before creating them but not anything else as that will get reset. In this case the disabled items were reset. The same happens for highlighted index if that is specified before window creation
 2015-09-27 21:55:48 +01:00
nightroan 8d3f7600fb As a multiplayer client, don't select the next track piece if is is unaffordable. 2015-09-26 16:01:04 -07:00
IntelOrca a04663368e add two new date formats, y/m/d and y/d/m, closes #1900 2015-09-26 14:35:26 +01:00
nightroan bd51c7ed80 Fixed #1939 by adding a callback to delay selection of the next piece until the server sends back the placement command. 2015-09-25 23:57:15 -07:00
zsilencer 9ac89c2b5e remove directsound and get sound working for linux native 2015-09-23 09:42:55 -06:00
YamaArashi 7c8b0641d9 replace viewport flags numeric literals with constants 2015-09-22 15:30:19 -07:00
Michał Janiszewski 5ceafd66a3 Fix memory leak in screenshot.c and guest.c 2015-09-22 22:58:20 +02:00
Gymnasiast e2ec6e0970 Move 'show all operating modes' to Cheats window 2015-09-18 11:55:52 +02:00
Gymnasiast 4909272a44 Add cheat option to show all operating modes; cleanup 2015-09-18 10:54:48 +02:00
Gymnasiast a6ee08de11 Fix filter buttons in RC designer and TD manager, clean up some strings 2015-09-11 16:21:27 +02:00
IntelOrca 4dd95c650b implement RideData4 data 2015-09-10 22:16:41 +01:00
IntelOrca 88db4f12aa fix #1910 2015-09-09 20:25:34 +01:00
Ted John 2a0366721e Merge pull request #1896 from janisozaur/some_fixes 
assorted fixes
 2015-09-07 20:11:29 +01:00
Michał Janiszewski 52252f82b3 assorted fixes 2015-09-07 20:51:21 +02:00
Gymnasiast 3ddddec21c Fix some warnings 2015-09-07 14:57:39 +02:00
IntelOrca 8c44ddac17 fix 2nd problem of #1848 2015-09-05 20:06:58 +01:00
Gymnasiast d849e3378c Keep track list responsive in pause mode, fixes #1493 2015-09-03 12:12:21 +02:00
Ted John a8fbc479d0 Merge pull request #1869 from LRFLEW/color_labels 
Added tooltip to colour selector
 2015-09-02 17:49:33 +01:00
Gymnasiast ea9f87d0f3 Remove faulty copy-and-pasted check on secondary items, fixes #1866 2015-09-02 12:42:43 +02:00
LRFLEW 7ef15a4326 Added tooltip to colour selector 2015-09-01 00:08:28 -06:00
Ted John e80d935964 Merge pull request #1867 from Gymnasiast/fix-select-by-track-type-research 
Don't apply select by track type to research, fixes #1733
 2015-08-31 20:06:00 +01:00
Gymnasiast 8490a19328 Don't apply select by track type to research, fixes #1733 2015-08-31 20:20:36 +02:00
Gymnasiast 2ff3e33e3e Add cheat to disable vandalism 2015-08-31 11:13:19 +02:00
IntelOrca dd5d607724 fix typo 2015-08-31 00:41:58 +01:00
IntelOrca 401a389e73 fix #1843 2015-08-30 23:45:45 +01:00
IntelOrca bea74ee261 make all file IO utf8 compatible, fixes #1847 2015-08-29 13:13:23 +01:00
Gymnasiast 20c7267b53 Don't show the Network status toolbar button in the Editors 2015-08-28 23:27:31 +02:00
Ted John 0c3fd7cd2f Merge pull request #1851 from Gymnasiast/network-button 
Move network button to first group and adjust colours, fix debug menu colours, closes #1850
 2015-08-27 17:17:12 +01:00
Gymnasiast 4d7a81bfe0 Remove unnecessary duplicate address, use more string constants 2015-08-27 16:44:18 +02:00
Gymnasiast 308b086c55 Name some addresses, clean up strings ids and usage 2015-08-27 16:19:17 +02:00
Gymnasiast cc705d9a1f Move network button to first group and adjust colours, fix debug menu colours 2015-08-27 13:27:46 +02:00
Gymnasiast 4733979df5 Fix crash when attempting to build a new ride when having the Ride construction window open, fixes #1844 2015-08-25 19:08:17 +02:00
Ted John 6a88ca17d0 Merge pull request #1835 from medsouz/cleanupscenery 
Add names for all memory addresses in world/scenery.c
 2015-08-22 17:43:28 +01:00
medsouz e9269cb882 Finish naming scenery.c addresses 2015-08-22 12:03:40 -04:00
IntelOrca 1a877e637d refactor sprite_invalidate 2015-08-22 11:56:32 +01:00
Gymnasiast 11fa6bbab7 Fill ride construction dropdown properly before drawing it, fixes #1793 2015-08-21 09:34:58 +02:00
Gymnasiast 93d49e314e Fix file menu for editor, restore menu order, add shortcut for quick saving 2015-08-20 12:13:08 +02:00
zsilencer abcd0afa9a make setting player name actually work 2015-08-19 18:26:42 -06:00
zsilencer be42f10d7a fix crash in server_list_save_saved_servers 2015-08-19 18:13:38 -06:00
Runelaenen d34a446d61 Easier saving 
Replace Save game functionality and add 'save game as' function
 2015-08-19 22:02:06 +02:00
medsouz 4207b41855 Name more addresses 2015-08-18 23:53:24 -04:00
Gymnasiast 59202f97f8 Make the string for 'Default audio device' translatable, fix comment 2015-08-18 21:55:04 +02:00
Ted John 4ee28af18c Merge pull request #1816 from Gymnasiast/allow-incorrect-checksum 
Add option to allow loading scenarios with an incorrect checksum, closes #1790
 2015-08-18 19:52:46 +01:00
Gymnasiast 9c23414fbe Keep the same orientation as in the preview when placing track, fixes #1817 2015-08-18 18:22:23 +02:00
Gymnasiast e8cc1738ca Fix saving of feature 2015-08-18 15:49:16 +02:00
Gymnasiast 8cf34ca662 Add option the Options window, clean up some string ids in that window 2015-08-18 11:58:47 +02:00
medsouz 958f2fb296 Document some scenery memory addresses 2015-08-17 23:05:46 -04:00
IntelOrca 23fcefd7eb fix saving of servers 2015-08-17 08:13:39 +01:00
medsouz 3b845a67ed Add option for handymen to mow grass by default 2015-08-16 19:26:42 -04:00
medsouz 02e2ebec9a Restore globals 2015-08-16 18:35:47 -04:00
medsouz 7071bd9353 Document more addresses 
Created defines for all the memory addresses I could find in peep/staff.c
and updated everywhere they're being used.
 2015-08-16 18:25:17 -04:00
xperia64 4733ea28c0 Add a cheat so guests ignore intensity and nausea ratings 2015-08-16 16:02:41 -04:00
Ted John 5452eb9b73 Merge pull request #1798 from medsouz/documentaddresses 
Document various memory addresses
 2015-08-16 18:43:20 +01:00
IntelOrca 90bf4c6836 fix #1797 2015-08-16 18:42:30 +01:00
medsouz ca1a1e0ddd Document various memory addresses 2015-08-16 13:05:49 -04:00
IntelOrca 4f8e289e79 finish server list and fix a couple of multiplayer issues 2015-08-16 17:29:47 +01:00
IntelOrca 094cc19411 allow joining of servers in server list window 2015-08-16 16:37:08 +01:00
IntelOrca a3450a4bf8 add loading / saving of servers 2015-08-16 15:27:21 +01:00
Gymnasiast c00e044b6c Multiplayer interface improvements, cleanup 2015-08-16 13:14:04 +02:00
IntelOrca f072440d18 add server list window (WIP) 2015-08-16 03:07:00 +01:00
IntelOrca 3f31221973 fix network merge issues, fix #1785 2015-08-14 22:06:15 +01:00
zsilencer c1e802e361 fix text for utf8 2015-08-14 09:15:07 -06:00
zsilencer a4267990b8 detect desyncs 2015-08-14 09:13:40 -06:00
zsilencer 584b34e6d5 fix game_command_create_ride for network 2015-08-14 09:13:39 -06:00
zsilencer 3b4a4fcdac network status window 2015-08-14 09:13:39 -06:00
zsilencer 1d811a5692 improve chat feature 2015-08-14 09:13:39 -06:00
zsilencer 56f8954e27 fix clear scenery for network 2015-08-14 09:13:39 -06:00
zsilencer d772f8b5fb measure and display ping 2015-08-14 09:13:39 -06:00
zsilencer 7ccb0eb655 basic player list 2015-08-14 09:13:38 -06:00
zsilencer 73211b4215 fix chat window for new window code 2015-08-14 09:13:30 -06:00
zsilencer 21334e307c move chat window to separate file 2015-08-14 09:13:30 -06:00
zsilencer df7f576e05 map loading over network 2015-08-14 09:13:29 -06:00