mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
12,415 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

1469 Commits

Author SHA1 Message Date
spacek531 f5bc1b598c removed extra newline, changed tabs to spaces 2017-07-07 17:35:31 +01:00
spacek531 bb8160fa3b Remove extra newline in math.hpp 2017-07-07 17:35:31 +01:00
spacek531 b460401ab6 Removed redundant Ceil 2017-07-07 17:35:31 +01:00
spacek531 ec0f35fe7b added comment 2017-07-07 17:35:31 +01:00
spacek531 cbe154f63b I hope this isn't a joke of a commit 
I have no idea.
 2017-07-07 17:35:31 +01:00
Richard Jenkins e5b39846b0 Merge pull request #5812 from janisozaur/fix-5795-v2 
Fix #5795: Implement sprite cycle checking v2
 2017-07-07 17:24:42 +01:00
wolfreak99 6633588179 Add missing cheat_reset toggle 2017-07-07 09:20:27 +02:00
wolfreak99 e5eefca5c0 Add missing cheat log strings 2017-07-07 09:20:27 +02:00
Michał Janiszewski 8d02ce37b5 Fix compilation on MSVC 2017-07-07 07:56:45 +02:00
rwjuk d364b2824f Remove needless null check 2017-07-06 23:35:00 +01:00
Michał Janiszewski a3414502a6 Update network version 2017-07-07 00:17:36 +02:00
Michał Janiszewski 12500dd802 Fixup the disjoint null sprites 2017-07-07 00:14:45 +02:00
Michał Janiszewski f6cb731476 Merge pull request #5802 from rwjuk/fix5800 
Fix #5800: Crash when opening server from command line
 2017-07-06 23:39:26 +02:00
rwjuk f28db5731f Guard against NULL in fix_invalid_vehicle_sprite_sizes() 2017-07-06 22:29:51 +01:00
Michał Janiszewski 22d0cb99f9 Load title sequence when invalid path was given 2017-07-06 23:25:38 +02:00
Michał Janiszewski ab95988c66 Improve error reporting for detected cycles 2017-07-06 22:28:10 +02:00
Michał Janiszewski 029aea0fc2 Remove reset_empty_sprites 
Leave in sprite_clear_all_unused as the safer version
 2017-07-06 22:20:07 +02:00
Michał Janiszewski bed085d329 Remove unneeded sprite reset 
This is done in all exports now
 2017-07-06 22:18:05 +02:00
Michał Janiszewski 07faba7aa5 Re-add sprites that got disconnected in a looped list 2017-07-06 22:17:02 +02:00
rwjuk 00848ca629 Correct sprite cycle fixing algorithm 2017-07-06 19:57:59 +02:00
rwjuk 67cbe2a2a1 Fix compilation issues and restore line that went astray 2017-07-06 19:57:55 +02:00
rwjuk 72a1ad89a3 Remove superfluous parameter 2017-07-06 19:57:52 +02:00
rwjuk 28789c3767 Restore resetting of sprite index 2017-07-06 19:57:46 +02:00
rwjuk 372781cc74 Code quality improvements 2017-07-06 19:57:41 +02:00
rwjuk 247d72b1aa Implement sprite cycle checking 2017-07-06 19:57:37 +02:00
rwjuk 5c0a85df5e Bump network version 2017-07-06 13:22:48 +01:00
rwjuk cc95aa0433 Fix visual corruption caused by zero sprite dimensions 
Sprite corruption issue highlight

Fix already bugged saves

Fix visual corruption caused by zero sprite dimensions
 2017-07-06 13:22:24 +01:00
Michał Janiszewski aac81163d0 Update network version to avoid confusion 2017-07-06 11:14:42 +02:00
Michał Janiszewski ec7bcfce34 Revert "Fix #5795: Implement sprite cycle checking" 2017-07-06 11:13:12 +02:00
rwjuk ab6d4ee240 Fix black screen on loading file with invalid extension 2017-07-05 23:54:43 +01:00
rwjuk 8224e715d8 Network version bump 2017-07-05 23:34:47 +01:00
rwjuk a586c961fb Correct sprite cycle fixing algorithm 2017-07-05 23:34:47 +01:00
rwjuk 9d338101b9 Fix compilation issues and restore line that went astray 2017-07-05 23:34:47 +01:00
rwjuk 30648df16a Remove superfluous parameter 2017-07-05 23:34:47 +01:00
rwjuk 5cc188076c Restore resetting of sprite index 2017-07-05 23:34:47 +01:00
rwjuk 89bfe1d1bd Code quality improvements 2017-07-05 23:34:47 +01:00
rwjuk 22f88f80b0 Implement sprite cycle checking 2017-07-05 23:34:47 +01:00
Tomas Dittmann 446796db4b Prevent integer overflow in interest calculation (#5724) 
Fixes #5635
 2017-07-06 00:30:10 +02:00
rwjuk e7512c58ac Fix whitespace 2017-07-05 22:47:53 +01:00
rwjuk 7c2e1b626d Fix #5800: Crash when opening server from command line 2017-07-05 22:08:02 +01:00
Tomas Dittmann 14d14de911 Fix #5205: Prevent the paint loop becoming an infinite loop (#5771) 2017-07-05 18:00:30 +01:00
Gymnasiast ee58ac4882 Fix #4512: invisible map edge tiles corrupted 2017-07-05 18:37:39 +02:00
Michael Steenbeek ae3bc6183f Bump network version 2017-07-05 09:32:50 +02:00
rwjuk 2fb1e40f1a Guard against nullptr in AudioMixer.cpp 2017-07-05 09:32:50 +02:00
rwjuk 68c819c01f Log to console when invalid objects found during check 2017-07-05 07:28:46 +02:00
rwjuk fe140c5c20 Fix #5789: No missing obj notification when loading from cmd line 2017-07-05 07:28:46 +02:00
Richard Jenkins 4e4022d693 Fix #5790: Ride list window does not force refresh on view change (#5791) 2017-07-04 23:03:43 +01:00
Ted John 705ad7c85d Fix #5787: Opening an incomplete ride moves the viewport to unrelated place 
Remove ghost elements for track before validating it.
 2017-07-04 22:25:23 +01:00
Ted John a558423794 Invalidate missing object list on item click 2017-07-04 21:52:11 +01:00
Gymnasiast b0fece095c Raise maximum entrance fee to £200 
It could even be higher, depending on the initial guest cash, but this should do for now
 2017-07-04 15:23:12 +02:00
Yaroslav Tretyakov 56987960b3 Add better fix for #3846 #5749 (#5781) 2017-07-04 12:15:15 +01:00
Yaroslav Tretyakov c7de74f132 Fix #3846, #5749: ride_create_vehicles_find_first_block could not handle diagonal blocks (#5778) 
* Fix #3846: Testing or opening (certain) rollercoaster causes game to hang
* Fix #5749: Game Crash when I test the roller coaster
 2017-07-04 07:43:25 +01:00
Richard Jenkins 048c543fe2 Fix needless double invocation of Memory::Set 
Memory::Set() invocations moved to InitialiseEntryMaps() function.
 2017-07-03 23:59:19 +01:00
Ted John 0422699539 Fix #5381: Game crashes in editor when scenery or pathing is clicked 
Add more defensive checks for when there are no objects loaded.
- Do not open footpath window if there are no footpath objects loaded.
- Prevent crash in scenery window if no scenery groups loaded.
 2017-07-03 21:46:07 +01:00
Richard Jenkins aec214c684 Fix #5767: Importing AA/LL SC4s causes a crash 2017-07-03 17:32:05 +01:00
rwjuk dd2ab63b26 Fix #5765: Peep purchase animation shows for $0.00 2017-07-03 15:50:50 +02:00
Ted John 32e8737796 Merge pull request #5758 from rwjuk/fix5756 
Fix #5756: Only refresh ride list window every 64 ticks for performance
 2017-07-03 07:57:04 +01:00
Ted John 146982d4b0 Fix #5750: OpenRCT2 locking up consistently, no reports (#5757) 
Prevent freezing on corrupted ride queues by ignoring sprites that are not guests when a guest re-joins the front of the queue.
 2017-07-03 07:56:34 +01:00
rwjuk a941400403 Refactor window_ride_list_refresh_list() to single loop 2017-07-02 21:32:20 +01:00
rwjuk 398004901b Only refresh ride list window every 64 ticks for perf. 2017-07-02 20:49:39 +01:00
Ted John cb28381990 Merge pull request #5746 from IntelOrca/fix/5507 
Fix #5507: RCT1 path check is case-sensitive on Linux
 2017-07-02 12:18:40 +01:00
Ted John 09bb7bfd6c Allocate strings with new instead of malloc 2017-07-02 11:37:01 +01:00
Ted John fd2eda921f Merge pull request #5705 from Broxzier/hardcoded-values 
Replace -1 with SPR_NONE for viewport sprite, sort some includes
 2017-07-02 00:08:33 +01:00
Ted John 46d8287bd9 Merge pull request #5624 from rwjuk/objectwindow 
Implement window displaying object load failures
 2017-07-02 00:07:17 +01:00
Ted John 14443b30f1 Fix #5751: Title sequence seconds are about 0.8 seconds 2017-07-02 00:04:32 +01:00
Ted John 3ca84dcc17 Refactor vehicle logic related to #5749 2017-07-01 12:24:38 +01:00
Broxzier 29fb31c69c Remove 'static const' that slipped in 2017-07-01 11:45:43 +02:00
Luke Lau 027be6010d Fix #5583: Right click to drag camera after menu (#5748) 
Reset the input state to normal after receiving a right click outside of a dropdown.
 2017-07-01 01:35:51 +01:00
Ted John 5db0a05f11 Fix #5658: Assertion failed errors in peep.c (#5747) 
Protect edge cases that occur in various hacked parks:
* Current station <-> ride exits
* Current seat <-> peep load positions
 2017-07-01 01:31:19 +01:00
Ted John ddb96ec267 Refactor load park result 
Use a C++ struct and pass that to C.
 2017-07-01 01:29:35 +01:00
Ted John d75295b027 Move handle_park_load_failure into game.c 2017-07-01 01:29:34 +01:00
Ted John c3356d457e Fix S4s never loading if no object errors 2017-07-01 01:29:34 +01:00
rwjuk ab38c07fb9 Make object window work with S4s and scenarios 2017-07-01 01:29:34 +01:00
rwjuk 214bf3988b Implement 'missing objects' window 
Implement 'missing objects' window

Basic implementation of 'bad objects' window

Add new object_load_error.c

Add object_load_error.c

Faffing about

String stuff

Stuff

Get window basically displaying

Proper col header for object

Display object types

Display file name and explanatory message

Probably about time I added myself to the dev list

Cleanup and comments

Make bad object window work with SC6

Fix whitespace, string IDs, flip core function sense

Fix spacing in string_ids.h

Fix string ID snafu

Fix HasNoInvalidObjects() sense

Attempt to refactor this to pass data properly

Move typedefs to separate header

Fix up signatures

Add park_load_result_types.h

Clean up includes and remnants of prev implementation

Split duplication into function, free invalid entries list on close

Use pointer for object_validity_result param

Fixup string IDs

Use LoadObject() directly

Use dependency injection, fix string termination

Xcode fix, make helper function static

Fix buffer overrun and memory leak

Use SDL for clipboard functionality

Fix function & variable declarations

Rework editor_read_s6() to use new park load result type

Update changelog for #5624

[ci skip]

Fix mem leak, function signature and whitespace
 2017-07-01 01:28:51 +01:00
Ted John 52555df089 Merge pull request #5738 from Gymnasiast/fix/5253 
Fix #5253: RCT1 park value conversion factor too high
 2017-06-30 23:13:19 +01:00
Michael Steenbeek bcbccba3e6 Create track sequence direction flags (#5744) 2017-06-30 23:11:47 +01:00
Michael Steenbeek 44af1653a6 Replace 'center' with 'centre' (#5745) 2017-06-30 23:11:28 +01:00
Ted John f515314a2d Only warn if object export can not fix checksum 2017-06-30 22:25:27 +01:00
Ted John e9519d2d8b Fix #5507: RCT1 path check is case-sensitive on Linux 
If the csg path does not exist, find the first file in the directory that matches (case insensitive).
 2017-06-30 21:11:35 +01:00
Gymnasiast 6206fbda80 Do not reuse _parkValueConversionFactor of previous S4 2017-06-30 16:02:57 +02:00
Gymnasiast fea2c66036 Name remaining TRACK_ELEM_FLAGs 2017-06-30 14:37:26 +02:00
Ted John 659ccc03d0 Merge pull request #5740 from OpenRCT2/bugfixes 
Fix chat sounds
 2017-06-30 00:22:53 +01:00
zsilencer ef6ecc8900 Set correct pan for chat sound. 2017-06-29 15:54:21 -06:00
Michał Janiszewski 1e21b150ae Fix missing newlines in various files 2017-06-29 23:31:03 +02:00
zaxcav b39723a0a8 Allow mechanics to walk over wide tiles on the edge of the patrol zone 2017-06-29 20:34:37 +02:00
Ted John 50c8fefb35 Fix bug in sprite_move, add sprite null check 2017-06-29 19:25:59 +01:00
Ted John 2fffeb9470 Set the map to blank if no title sequences can load 2017-06-29 19:24:28 +01:00
Reece f581d52355 Disable money effect in pause mode 2017-06-29 20:12:36 +02:00
Gymnasiast 50a7c40fbd Fix #5253: RCT1 park value conversion factor too high 2017-06-29 20:08:59 +02:00
Gymnasiast 9148b98928 Fix #667: Incorrect banner limit calculation 2017-06-29 19:18:08 +02:00
Gymnasiast 4e87ad6ac3 Properly check 'Finish 5 roller coasters' criteria, fixes #597 
This fixes the following things:
- The objective was not available when using money (despite it being used on such scenarios in RCT1)
- The scenario editor set the 'partially finished flag' on every single ride
- The scenario editor did not check if there were five finished roller coasters
- When checking the goal, there was no check if the ride was a roller coaster
- When checking the goal, there was no check if the ride was one of the roller coasters to be completed
 2017-06-29 17:32:12 +02:00
Richard Jenkins 74a14505cd Fix #578: Ride ghosts show up in ride list during construction 2017-06-29 16:39:48 +02:00
Ted John e265fa8948 Fix crash when headless server creates money fx (#5729) 
Ensure headless instances of the game, which do not have graphics loaded, do not try to measure the string for new money effect sprites.
 2017-06-29 12:30:49 +01:00
Gymnasiast 6483705d2c Make CIs happy about return paths 2017-06-29 12:06:29 +02:00
Gymnasiast 194cc4dcb3 Fix #5730: Unable to uncheck 'No money' in the Scenario Editor 2017-06-29 12:01:30 +02:00
Michael Steenbeek 251ead0531 Fix #441: Construction rights over entrance path discarded; refactor 2017-06-29 11:30:18 +02:00
Ted John 4cc6743446 Merge pull request #5714 from Gymnasiast/refactor-land-rights-window 
Refactor land rights window
 2017-06-28 12:42:42 +01:00
Zeh Matt a8efd2cc4d Fix #5676: Last action issues 
LastActionTime using server tick instead of real time platform ticks. (#5722)
 2017-06-27 14:50:21 +01:00
Ted John f08db17d94 Merge pull request #5713 from rwjuk/fix5707 
Fix #5707: Usernames aren't detected for multiplayer
 2017-06-27 13:27:21 +01:00
Richard Jenkins 1893326b62 Check for file existence before releasing config in config_open() (#5712) 2017-06-27 13:23:16 +01:00
David CARLIER 04ed2d78d2 Fix building on FreeBSD 2017-06-27 08:56:03 +02:00
rwjuk c904fa9fe2 Duplicate string literal for assignment to utf8* var 2017-06-26 20:58:36 +01:00
Gymnasiast 51f5a4ff7b Fix whitespace 2017-06-26 20:59:52 +02:00
Gymnasiast 65a3d4551b Name buy land rights flags 2017-06-26 20:56:32 +02:00
rwjuk 3162b9c221 Use String::IsNullOrEmpty() 2017-06-26 19:10:55 +01:00
Gymnasiast b806ded6a4 Refactor land rights window 2017-06-26 20:01:35 +02:00
rwjuk 3236701d51 Fix #5707: Usernames aren't detected for multiplayer 2017-06-26 18:59:01 +01:00
Gymnasiast 9b25a45e90 Remove call to non-existant window class 77 2017-06-26 16:07:42 +02:00
Ted John 06859c90c2 Merge pull request #5708 from IntelOrca/reduce-headless-memory-footprint 
Reduce memory footprint for headless instances
 2017-06-26 14:41:55 +01:00
Michael Steenbeek ce16693da0 Merge pull request #5706 from ibara/develop 
Add OpenBSD support.
 2017-06-26 15:02:40 +02:00
ZehM4tt 0a633647e4 Fix ghost scenery removing objects with "Disable Clearance check" enabled. 
Fix footpath_remove ignoring the ghost flag removing the wrong path.
Replaced some constants with the known flags.
 2017-06-26 14:58:07 +02:00
wolfreak99 27f5773e4d rename event unknown_14 to viewport_rotate 2017-06-26 10:06:58 +02:00
Ted John 4f1cfb4631 Don't load graphics for headless 2017-06-25 23:19:24 +01:00
Brian Callahan 46ae0578e4 Add a note for OpenBSD and getting path names of running executables. 2017-06-25 23:26:26 +02:00
Brian Callahan e5d305f9e7 Use cstdarg instead of stdarg.h 2017-06-25 23:25:46 +02:00
Brian Callahan fe8f949b3f Add OpenBSD support. 2017-06-25 23:25:46 +02:00
Broxzier 9e204c11a9 Replace newly added SPR_NONE's with SPRITE_INDEX_NULL, remove new includes 
needed to change its type to match .
 2017-06-25 22:44:58 +02:00
Broxzier 71a922b3f5 Replace 4 more occurances of -1 with SPR_NONE 2017-06-25 21:37:51 +02:00
wolfreak99 0dbe8f32e5 Allow Construction rights to be placed on park entrance 2017-06-25 21:19:03 +02:00
Broxzier 36fb2c42d9 Replace -1 with SPR_NONE for viewport sprite, sort some includes 2017-06-25 21:13:04 +02:00
Gymnasiast 2f3b5d1c7a Add IDs for null sound IDs 2017-06-25 20:45:38 +02:00
Ted John f275e5ba9b Remove all platform.h includes from header files 
System headers, particularly windows.h polute the namespace too much with macros and unwanted definitions. Do not use them in header files.
 2017-06-25 18:59:56 +01:00
Ted John 9c269ae94b Fix #5489: Sprite index crash for car view on car ride 2017-06-25 17:53:51 +01:00
Ted John acf3b0cf83 Only include FindPkgConfig once 2017-06-25 14:28:25 +01:00
Ted John c4ad6571ea Remove speex dependency from libopenrct2 2017-06-25 12:03:20 +01:00
Ted John 95514b9cbc Remove SDL2 dependency from libopenrct2 2017-06-25 12:03:20 +01:00
Ted John 89d43c1120 Merge pull request #5702 from IntelOrca/refactor/nosdl/freetype2 
Remove SDL2_ttf dependency, replace with some code form SDL2_ttf without SDL2 dependencies and instead only requiring freetype alone.
 2017-06-25 11:35:06 +01:00
Michael Steenbeek 8333266ca5 Name several ride construction flags, clean up ride_data.c, fix "mini coaster" boosters 2017-06-25 12:14:39 +02:00
Tomas Dittmann f9be3c0046 Identify _trackDesignPlaceSceneryZ and fix #259 
Add the SceneryZ-value to the TrackZ value to compute the correct value for window_track_place_get_base_z(). Fixes issue #259.
 2017-06-25 11:17:25 +02:00
Ted John 6368a29d39 Fix NO_TTF builds 2017-06-25 00:18:08 +01:00
Ted John 16d6ddd22b Remove unused code from SDL_ttf 2017-06-24 23:40:46 +01:00
Ted John 8046cbc707 Replace SDL2 calls 2017-06-24 23:31:40 +01:00
Ted John b7fd89361b Use complete SDL_ttf code 2017-06-24 23:13:07 +01:00
ZehM4tt efa0275104 Fix client not resuming when server toggles pause. 2017-06-24 23:30:53 +02:00
camthesaxman c301e83a64 fix water rendering 2017-06-24 18:53:25 +02:00
Gymnasiast c9b5ec4172 Guard against NULL ObjectRepositoryItem, fixes #5614 2017-06-24 17:45:04 +02:00
Ted John 9ee1bbe4b5 Add some TTF code, poor 2017-06-24 14:50:30 +01:00
Ted John 2c07a55696 Refactor TTF into new source and remove SDL2_ttf 2017-06-24 14:50:30 +01:00
Ted John b9e9ddfc1c Use more dependency injection 2017-06-24 09:56:51 +02:00
Ted John 3003393c87 Allow re-creation of object manager 
Removing lazy initialisation of it.
 2017-06-24 09:56:51 +02:00
Gymnasiast 55977997fd Fix #1705: Time Twister's Medieval entrance has incorrect scrolling 2017-06-23 23:17:22 +02:00
Gymnasiast db091032cc Put .DAT fixes into their own method, fix max cars on the Crocodile Ride 2017-06-23 17:29:51 +02:00
Gymnasiast 234bedb8b8 Replace more occurences of vehicles per ride entry 2017-06-23 17:19:51 +02:00
Matte A a1c456f607 Fix clipping in text for some translations (#5692) 2017-06-23 09:54:05 +02:00
Gymnasiast 8561f3774e Raise friction cap on the Junior Roller Coaster to 18 2017-06-23 09:41:45 +02:00
Matte A 92426994af Giving the cheat "Own all land" a tool-tip 2017-06-23 08:18:45 +02:00
RMcTn 92988a6020 Moved peep release balloon code into a function 2017-06-22 22:55:19 +02:00
Michael Steenbeek fef10c1f60 Clean up windows using land tools 2017-06-22 20:49:13 +02:00
Michael Steenbeek 1f00469b26 Replace free+null with SafeFree, allow freeing NULL 
free(NULL) is perfectly fine, no need to check
 2017-06-22 12:49:33 +02:00
ZehM4tt 81572e9592 Fix game crashing/freezing when kicking players in MP. 2017-06-21 12:02:37 +02:00
Gymnasiast 8ffe50728a Bump network version 2017-06-21 09:56:23 +02:00
Gymnasiast 16900dd618 Avoid booster speed overflows and undefined behaviour, fixes #5679 2017-06-21 09:54:54 +02:00
Gymnasiast 1f180c19b3 Clean up crooked house and top spin vehicle update 2017-06-21 09:54:53 +02:00
Gymnasiast 77481847ca Refactor Giga and Junior booster speed factor 2017-06-20 19:12:49 +02:00
Gymnasiast 176fe0d036 Replace OPENSSL_{malloc,free} with the standard C versions 2017-06-20 18:49:43 +02:00
Michał Janiszewski 9bfc9a91e3 Pre-emptively reset sprites on export for higher compression ratios (#5668) 
The sprites need to be reset anyway before they get used, so reset them
on every export just so they can be compressed better
 2017-06-20 16:34:04 +02:00
Gymnasiast 8b6ecc76d2 Clean up boosters 2017-06-20 14:24:10 +02:00
Gymnasiast 412332a3a5 Use constants for the max amount of stations and colour schemes in the rct_ride struct 2017-06-20 13:39:12 +02:00
Gymnasiast f2f8cec944 Clean up dropdowns 2017-06-20 13:38:51 +02:00
Gymnasiast 0db5bc6bd2 Define max vehicles per ride entry, use SPRITE_INDEX_NULL more 2017-06-20 13:38:23 +02:00
Gymnasiast d6488f34a8 Remove unused NUM_COLOURS 
It's the same as COLOUR_COUNT, which _is_ used
 2017-06-20 10:44:59 +02:00
Michał Janiszewski 5f1e62721a Merge pull request #5655 from janisozaur/gfxbench 
Add support for benchmarking park rendering
 2017-06-20 08:10:56 +02:00
Gymnasiast 53be8da368 Fix incorrect constant 2017-06-19 22:44:06 +02:00
Gymnasiast 5db6e5afa1 Use constants for number of marketing campaigns and expenditure table 2017-06-19 22:17:05 +02:00
Gymnasiast 65806a55db Create and use defines for the amount of surface and edge textures 2017-06-19 22:16:34 +02:00
Hielke Morsink d68bed10cd Readd call to network_process_game_commands (#5662) 2017-06-19 22:16:19 +02:00
ZehM4tt def76edd55 Ignore UI-only flag in sprite checksum 
Ignore peep.window_invalidate_flags in sprite checksum to prevent
false positivie desync alerts, flag does not affect game state.
 2017-06-19 17:42:51 +02:00
ZehM4tt 10740106f2 Fix causing asserts with DEBUG_DESYNC and loading new maps. (#5650) 
Moved input handling out of game_logic_update back to game_update,
should be executed per frame not tick.
Placed gInUpdateCode at the proper locations.
 2017-06-19 17:41:28 +02:00
Michał Janiszewski 990a153b82 Add support for benchmarking park rendering 2017-06-19 12:37:50 +02:00
Michael Steenbeek 9c3a16b6e0 Merge pull request #5611 from OpenRCT2/android 
Android
 2017-06-19 10:25:18 +02:00
Marijn van der Werf ddff36c9ee tabs to spaces 2017-06-19 02:54:21 +02:00
Richard Jenkins 306d2623ef Fix #5617, PLATFORM_MODIFIER defined twice for macOS correctly (#5633) 
* Fix #5617, PLATFORM_MODIFIER defined twice for macOS correctly

And revert incorrect 'fix'

* Remove all keyboard defines from platform.h
 2017-06-18 21:47:51 +02:00
ZehM4tt 08230f047c Fix desync if "Handyman mow grass by default" is checked. (#5652) 2017-06-18 20:43:15 +02:00
Gymnasiast 595e73e2d9 Name GAME_COMMAND_FLAG_7 2017-06-18 18:25:49 +02:00
duncanspumpkin e9038e5a92 Remove unneccesary casts. 
Casts had previously been used when the types were unknown. They are now known and can be removed
 2017-06-18 08:07:29 +01:00
ZehM4tt efdac19f3b Extract game commands execution​ from within network_update. (#5642) 
* Moved out command processing from network_update into its own function. This should fix some false positives calling scenario_rand from a command callback.

* Fix Server_Handle_GAMECMD to use the command queue instead of executing directly.

* Exit the queue processing to still check for desync
 2017-06-18 08:03:37 +02:00
Gymnasiast 9f5d1cf40a Fix ride naming in S4 import, cleanup 2017-06-17 19:10:53 +02:00
Richard Jenkins 312adaf8e7 Merge pull request #5644 from Gymnasiast/max-stations 
Add define for number of colour schemes, correct several cases of max stations per ride
 2017-06-17 14:32:36 +01:00
Gymnasiast 631f4d8907 Add a constant for RIDE_ENTRY_INDEX_NULL 2017-06-17 14:32:15 +02:00
Gymnasiast ed905f3c68 Add define for number of colour schemes, correct several cases of max stations per ride 2017-06-17 14:31:48 +02:00
Gymnasiast 26cd0da5be Check the first non-null ride type in object selection 2017-06-17 13:52:17 +02:00
Michał Janiszewski 9903c15e2a Remove various trailing whitespaces 
[ci skip]
 2017-06-17 13:41:40 +02:00
Gymnasiast d782018a8f Fix trailing whitespace and RIDE_TYPE_NULL in new_ride.c 2017-06-17 13:33:25 +02:00
ZehM4tt f05e94c1c6 Fixed a desync that would happen when having the guests list open. (#5632) 
* Fixed a desync that would happen when having the guests list open.
* Refactored the flashing state of peeps to not affect the flags.
* Added deprecation info for SPRITE_FLAGS_PEEP_FLASHING.
* Removed unused line that used the old flag.
* Update network version
 2017-06-17 12:55:41 +02:00
rwjuk 7094bbf74a Fix #5635, overflow when calculating loan interest 
Introduces 64-bit money type
 2017-06-17 12:20:22 +02:00
ZehM4tt 5bb8dfb49c Remove queued game commands that would be impossible to execute. 
Added a warning instead of assert for commands that are discarded.
 2017-06-17 11:49:26 +02:00
ZehM4tt 4362314f70 Clarified the comment. 2017-06-17 11:49:26 +02:00
ZehM4tt ea59769cfd Fixes clients receiving commands before the map data is sent and loaded. 2017-06-17 11:49:26 +02:00
Marijn van der Werf 0341841cf7 Remove commented function 2017-06-16 22:55:08 +02:00
ZehM4tt 9e1711c345 Fix some scenery, path placement and construction mode desyncs 2017-06-16 09:45:00 +02:00
wolfreak99 69a800f285 remove unused gRCT2AddressSavedGamesPath2 (#5626) 2017-06-16 07:53:09 +01:00
Michał Janiszewski 5077f2d78a Mark Path::Combine template as static 2017-06-15 22:55:33 +02:00
Marijn van der Werf 8766ec37a1 Add Android project 2017-06-15 14:22:15 +02:00
rwjuk 5f5f12a63c Fix #5617: PLATFORM_MODIFIER defined twice for macOS 2017-06-15 07:47:31 +02:00
Marijn van der Werf 297d6ba1d5 Add virtual destructor 2017-06-15 00:16:55 +02:00
Michał Janiszewski 4851a45a83 Detect warnings for all parts of compilation (#5618) 2017-06-15 00:08:41 +02:00
Ted John 1dae7f9f32 Move SDL_LoadBMP call to libopenrct2ui (#5616) 2017-06-14 19:47:22 +01:00
wolfreak99 46b575ee18 Remove unnecessary gFirstTimeSaving call, handle gFirstTimeSaving in game_load_save 2017-06-14 16:28:11 +02:00
wolfreak99 67160d2f70 Rename sint32 gFirstTimeSave to bool gFirstTimeSaving 2017-06-14 16:28:11 +02:00
Gymnasiast f3f15d18f7 Replace more occurrences of scenery IDs 2017-06-14 16:06:43 +02:00
Christian F. Coors c506c4be2d Add defines for scenery IDs 2017-06-14 16:06:43 +02:00
Gymnasiast 4059d9e8a7 Clean up boosters, ride_type_null, max rides per entry, formatting 2017-06-14 16:06:43 +02:00
Michael Steenbeek 96a7a8ab50 Sort rides into ride groups when in select-by-track-type mode 
* Add ride groups

* Convert ride groups to C++

* Fix linking and crashes in Xcode

* Comment out .field syntax to make Visual Studio happy

* Fix alignment, fix changelog, cleanup

* Properly save ride group index in the ride object repository and bump its version

* Fix fallback behaviour when the ride entry is not available or not invented

* Fix include

* Rename RideGroup to RideGroupManager, add const, cleanup

* Break after finding matching ride group
 2017-06-14 13:31:27 +02:00
Ted John fda2f38097 Merge pull request #5589 from duncanspumpkin/remove_win32_debug 
Remove Win32 debug special builds as they no longer work and we will soon be removing RCT2 interop entirely.
 2017-06-14 07:45:15 +01:00
Michał Janiszewski 9d5a86d0ae Fix condition checks for being in logic update code (#5610) 2017-06-14 07:44:23 +01:00
Richard Jenkins 3952971920 Fix peep sounds persisting during pause (#5612) 2017-06-14 07:43:41 +01:00
duncanspumpkin e70a96c04f Remove Win32 debug special builds 
Win32 debug previously built a special .dll build to allow calling into RCT2. This has been broken for a while and has little use anymore. It has therefore been removed.
 2017-06-13 12:23:26 +01:00
Ted John f76ca6ea8b Fix #5603: Game fails on startup (#5604) 
The game tries to use a ui context while setting up a platform environment. Let the platform environment be created before looking for the RCT2 directory. This is a bit hacky at the moment, but a necessary fix until it can be cleaned up.
 2017-06-13 00:38:56 +01:00
Ted John 29f0372da8 Reduce SDL2 in headers 2017-06-12 19:56:32 +01:00
Ted John 7e9f7df7d1 Use standard platform defines 2017-06-12 18:01:51 +01:00
Ted John 25b6c613b9 Merge pull request #5597 from IntelOrca/refactor/nosdl/remaining-platform 
Remove remaining SDL from platform code
 2017-06-12 17:52:11 +01:00
Ted John 407e99bbc2 Fix mingw builds 2017-06-12 17:13:18 +01:00
Richard Jenkins 4c67ef1d6a Implement persistent 'real names of guests' setting 2017-06-12 14:05:19 +02:00
Richard Jenkins 5db340743f Merge pull request #5599 from Gymnasiast/fix/5596 
Fix #5596: Incorrect colours in the Map window
 2017-06-12 11:26:11 +01:00
ZehM4tt 60bf5083fc Fixed few multiplayer desync issues. (#5578) 
This addresses some of the desync causes:

* `vehicle_create_car` was using `scenario_rand` when it shouldn't have
* ghost elements affected grass growth
* ghost elements affecting peep logic[1]

It also adds some desync debug facilities, enabled at compile time.

It also reverts part of change introduced in
https://github.com/OpenRCT2/OpenRCT2/pull/5185,
namely reorder of desync check vs call to `ProcessGameCommandQueue();`

[1] It is not ideal to have this check in multiple locations, it is prone
to human error. We already have `map_remove_provisional_elements`,
but it is possible it does not work as well as it should. This needs
further investigation.
 2017-06-12 12:11:01 +02:00
Gymnasiast a586a6e15d Fix #5596: Incorrect colours in the Map window 2017-06-12 11:59:53 +02:00
Michał Janiszewski 0757582c93 Add missing include 2017-06-12 11:53:26 +02:00
Michał Janiszewski 4547dfab95 Prevent a crash in headless mode when showing error 2017-06-12 11:52:04 +02:00
Ted John 902bba6906 Fix compiler errors, add ctype.h in required source files 2017-06-11 23:43:28 +01:00
Ted John 36cfc1bb29 Remove remaining SDL from platform code 2017-06-11 23:26:14 +01:00
Ted John ee7c97b7be Move scancode to key to openrct2ui 2017-06-11 23:22:32 +01:00
Ted John 31c2b9c6b7 Move remaining SDL in input.c to openrct2ui 2017-06-11 21:18:56 +01:00
Ted John 3988b7797e Fix display of chat shortcut on network games (#5593) 2017-06-11 18:19:15 +01:00
Ted John 7a86fc2cb5 Link back shortcut functions 
Some of this will be temporary until input and windows move over to libopenrct2ui.
 2017-06-11 17:23:52 +01:00
Ted John cbd53f920c Create IWindowManager to open window from libopenrct2 2017-06-11 17:23:51 +01:00
Ted John f62a6713ff Fix libopenrct2.vcxproj 2017-06-11 17:23:51 +01:00
Ted John dfa1b47a4f Move keyboard shortcut code to libopenrct2ui. 2017-06-11 16:52:15 +01:00
Ted John c8e4e6dae1 Remove usages of MAX_PATH 2017-06-11 15:42:06 +01:00
Ted John 0d8f9d6618 Refactor IPlatformEnvironment (#5590) 2017-06-11 12:53:37 +01:00
Ted John b563d26ffe Fix #5588: crash in object selection 
Add more safety guards for -1 image IDs which can happen if images were unsuccessfully allocated during object load.
 2017-06-11 11:14:58 +01:00
Ted John 5bb48f3539 Move SDL part of lightfx blend to drawing engine 2017-06-10 22:18:54 +01:00
Ted John 90aad2e2ec Use rct_palette instead of SDL 2017-06-10 22:18:54 +01:00
Ted John fc899d15ef Remove SDL_Window from IDrawingEngine and UiContext 2017-06-10 22:18:54 +01:00
Ted John b32f0b276d Merge pull request #5574 from IntelOrca/fix/screenshot 
Fix screenshot command and refactor drawing engine
 2017-06-10 20:06:26 +01:00
Ted John 202cc269a7 Remove more SDL stuff from old platform code 2017-06-10 17:14:07 +01:00
Ted John a52190ae44 Create C version of FULLSCREEN_MODE enum 2017-06-10 17:14:07 +01:00
Ted John 47e6f1d139 Rename our version of SDL_MIX_MAXVOLUME to MIXER_VOLUME_MAX 
Keep an assert to make sure its the same as SDL in the mixer. If SDL changes it, we can either change ours or convert the number proportionally.
 2017-06-10 17:14:07 +01:00
Ted John abb857e51d Remove platform_get_non_window_flags 2017-06-10 16:40:08 +01:00
Ted John 9bb055acc0 Remove unnecessary SDL.h include 2017-06-10 16:40:08 +01:00
Ted John 9cd8fd1498 Remove need of SDL in chat.c 2017-06-10 16:19:46 +01:00
Ted John a9e5a58d28 Remove need of SDL in console.c 2017-06-10 16:13:07 +01:00
Ted John a5e4a0965f Ignore final warnings for X8DrawingEngine 2017-06-10 15:48:05 +01:00
Ted John 97d68957f0 Fix segfault in screenshot command 2017-06-10 15:48:05 +01:00
Ted John df16e6a4f7 Inherit X8 engine from software engine 2017-06-10 15:48:04 +01:00
Ted John 39b3ff0251 Create new 8bpp drawing engine in openrct2 2017-06-10 15:48:04 +01:00
Ted John 7bea5d71bc Merge pull request #5243 from grimpunch/add_timestamp_chat_messages 
Timestamp messages for client in chat view
 2017-06-10 01:27:14 +01:00
Ted John ca68e2bb89 Use all leading format codes for timestamp 2017-06-10 01:05:47 +01:00
Michał Janiszewski 14bbe2c2c2 Verify scenario is not null before accessing it 2017-06-09 22:18:15 +02:00
Ted John f2a5d10c31 Move timestamp to chat.c and fix issues 
- Timestamp now coloured correctly.
- Timestamp now added on client side (client local time).
- Timestamp is no longer duplicated in log file.
 2017-06-09 19:16:29 +01:00
Christian Murphy eab0dc7cdb Add timestamps to chat messages 
Squashed commit from:
- a908a4c Added config parameter "timestamp_chat" to network config section to allow chat messages to be timestamped
- 820fcd7 make timestamps on by default
- e6ecad2 timestamp chat messages, removed config option
- 3b4439d Replace strftime temp buffer with directly using strftime into lineCh
- add20d3 Move time
 2017-06-09 19:16:29 +01:00
wolfreak99 12c84d8190 Rename gUnk9E2E28 to gMapLandRightsUpdateSuccess 2017-06-08 22:28:39 +02:00
Ted John c1ccf2b7a6 Refactor load_palette to call gfx_invalidate_screen 
Nearly all calls to load_palette were succeeded with a call to gfx_invalidate_screen. So remove these and stick just one call inside load_palette.
 2017-06-07 23:24:18 +01:00
Ted John 945d960cb7 Hide guest money effects on title screen 2017-06-07 23:20:35 +01:00
Michał Janiszewski ff9417f4a6 Validate access to peep_loading_positions (#4475) 2017-06-07 21:56:29 +01:00
Ted John dccc9f88c2 Merge pull request #5564 from IntelOrca/fix/download-park-temp-file 
Fix #4959: Compiler warning: tmpnam
 2017-06-07 21:55:05 +01:00
Ted John f8c32179b7 Increment network version 2017-06-07 21:52:51 +01:00
Jeremy Herbert ac99683955 Add cheat to disable ride value ageing 2017-06-07 21:52:47 +01:00
Ted John d31870249a macOS: Unignore deprecation warning 2017-06-07 21:23:22 +01:00
Ted John 41989da732 Fix #4959: Compiler warning: tmpnam 
Load download parks directly from memory without writing to a temporary file.
 2017-06-07 21:22:01 +01:00
Ted John f04439e0ac Use stdout for verbose and info logging (#5563) 
Only errors and warnings should be piped to stderr.
 2017-06-07 07:39:18 +01:00
Ted John 2501df61a3 Fix crash when building rides 
Game was attempting to log server action in non-network games.
 2017-06-07 00:06:28 +01:00
Michał Janiszewski 61d38511bc Expand tabs to spaces 
This commit expands tabs to spaces (ts=4) in all the files under src/
and test/.

Until now we had two wildly different code styles with C using tabs and
new C++ using spaces. It is painful to maintain as none of the commonly
used tools support this kind of setup and in reality is needless, as we
can simply convert all the sources to spaces and have opened PRs do the
same, where needed.

Additionally, trailing whitespace has been removed.
 2017-06-06 23:46:14 +02:00
Michał Janiszewski 43114b105c Extend logging with signs and track modifications 2017-06-06 23:17:46 +02:00
Ted John 8bb15a70de Refactor chat / server stream logging 2017-06-06 23:08:01 +02:00
delebota f69e7ac89e Setup server action logging for server admins in multiplayer 
Squash commit containing:
- 398d978 Setup server action logging for server admins in multiplayer
- 13330ae Added server action logging for using cheats in multiplayer
- b619019 Added server action logging for demolishing rides in multiplayer
- 93de752 Added server action logging for editing ride properties in multiplayer
- 8a3d932 Added server action logging for editing park properties in multiplayer
- c78b6e7 Moved duplicate chat and server logging code into new network methods
- c8f66bf Changed logging variable types to avoid deprecated conversion errors in CI builds
- 454e527 Added improved server action logging for using cheats in multiplayer
- 1194305 Moved server action logging code in game.c into a separate method to reduce clutter
- d59cd42 Added server action logging for add/edit/remove scenery in multiplayer
- c41ae0e Added server action logging for clients in multiplayer
- c383341 Removed unused variable to fix CI build error
- 2d1d8e3 Added server action logging for ride creation in multiplayer
 2017-06-06 23:07:54 +02:00
wolfreak99 07d1ba4f8c Create "Own all land" cheat functionality (#5056) 
Implement "Own all land" cheat into cheat window

Restore only valid peep spawn points

Code improvements

Update to use PEEP_SPAWN / PARK_ENTRANCE defines
 2017-06-06 21:50:42 +01:00
Michał Janiszewski 37a3179639 Fix #5558: can't hire staff 
Caused by invalid flag check
 2017-06-06 21:17:57 +02:00
Ted John 1e9f9790ae Fix #5496: Attempting to log into servers results in crash 
Caused by the user not having the required 'official' objects. This was because the network was being closed during a network update. Disposed memory would then be accessed later in the update loop.

To fix this, a lock has been added to Close() so that it can be deferred to the end of Update(). This isn't particularly nice, but the whole of network will need redesigning to fix this properly for all potentical scenarios where Close() can be called.
 2017-06-06 20:05:47 +01:00
Ted John 430ab2db5c Fix double negative showing on money effects 2017-06-06 18:58:14 +01:00
Ted John 2f053800ba Add verbose logging of base paths 2017-06-06 17:02:45 +01:00
Michael Steenbeek f3b4c88783 Merge pull request #5532 from OpenRCT2/sub_hex_fix 
Name sub_<hex>() functions
 2017-06-06 16:14:54 +02:00
rwjuk aa81ee4601 Add another RCT2 address comment 
[ci skip]
 2017-06-06 13:55:23 +01:00
rwjuk f0dec49e6d Add RCT2 address comments 
[ci skip]
 2017-06-06 13:48:06 +01:00
Michał Janiszewski c49f27dcab Peep pathfinding asserts (#3340) 2017-06-06 08:25:52 +01:00
Michał Janiszewski 3c7499f370 Validate access to _terrainEdgeSpriteIds (#4752) 2017-06-06 08:25:04 +01:00
Ted John c95dbf4b2f Merge pull request #5295 from janisozaur/fix-staff-hiring 
Fix staff hiring check
 2017-06-06 08:24:41 +01:00
rwjuk 325bb3e2da Name sub_88ABA4() 2017-06-06 01:16:44 +01:00
rwjuk ea96ab0225 Name sub_6CA162() 2017-06-06 01:02:34 +01:00
rwjuk aa17f296cb Name sub_693BE5() and second param 2017-06-06 00:51:34 +01:00
rwjuk be0d09d6ac Name sub_6E7FF3() 2017-06-06 00:51:34 +01:00
rwjuk dbd03257d9 Name sub_688956() 2017-06-06 00:51:34 +01:00
rwjuk ee637b8a33 Name sub_6B2FA9() 2017-06-06 00:51:34 +01:00
rwjuk d1928bdb22 Name sub_6D2189() 2017-06-06 00:51:34 +01:00
rwjuk 1db56c43ef Name sub_6DEDE8() 2017-06-06 00:51:34 +01:00
rwjuk c2688736bc Fix comment 
[ci skip]
 2017-06-06 00:51:34 +01:00
rwjuk a03699839c Name sub_666EEF() 2017-06-06 00:51:34 +01:00
rwjuk 0797a41f80 Name sub_685EBC() 2017-06-06 00:51:34 +01:00
rwjuk b346be8488 Name sub_68F8CD() 2017-06-06 00:47:08 +01:00
rwjuk 364ce73272 Name sub_69ED9E() 2017-06-06 00:47:08 +01:00
rwjuk c3401b75d5 Name sub_6B7588() 2017-06-06 00:47:08 +01:00
rwjuk 74642c8840 Name sub_6DB807(), better name for sub_6DB7D6() 2017-06-06 00:47:08 +01:00
rwjuk ae684c944e Name sub_6DB7D6() 2017-06-06 00:47:08 +01:00
rwjuk df4b150f92 Name sub_689174() 2017-06-06 00:47:08 +01:00
Richard Jenkins a38d0711a6 Remove declaration of function never defined (sub_6EDE88) 2017-06-06 00:47:08 +01:00
Richard Jenkins 07d5931193 Name sub_6A7642() 2017-06-06 00:47:08 +01:00
Richard Jenkins 457a2f624c Name sub_69AF1E() 2017-06-06 00:47:08 +01:00
Richard Jenkins b62bb1db6d Name sub_6ED990() 2017-06-06 00:47:08 +01:00
Richard Jenkins b492aa544f Name sub_684AC3() 2017-06-06 00:47:08 +01:00
Richard Jenkins 5abb5c9e9f More accurate name for sub_693BAB() 2017-06-06 00:47:08 +01:00
Richard Jenkins 03286af22b Name sub_693BAB() 2017-06-06 00:47:08 +01:00