Commit Graph

3631 Commits

Author SHA1 Message Date
Gymnasiast 8490a19328 Don't apply select by track type to research, fixes #1733 2015-08-31 20:20:36 +02:00
IntelOrca f629e64387 implement sprite_remove 2015-08-31 16:20:56 +01:00
IntelOrca afb3aabb49 implement sub_666D6F 2015-08-31 16:02:50 +01:00
IntelOrca 05132b2e04 implement sub_666CBE 2015-08-31 15:57:50 +01:00
IntelOrca 064cdf4d06 implement ride_set_vehicle_colours_to_random_preset 2015-08-31 15:00:11 +01:00
Ted John 6451f9d771 Merge pull request #1865 from Gymnasiast/fix-td4-river-rapids-colours
Fix seat colour of TD4 River Rapids, fixes #1695
2015-08-31 12:32:08 +01:00
Ted John 1cd2383a70 Merge pull request #1864 from Gymnasiast/fix-map-elements-generation
Clear all map elements before generating a new map, fixes #1762
2015-08-31 12:31:37 +01:00
IntelOrca 5508ba5874 fix #1841 2015-08-31 12:27:02 +01:00
Gymnasiast d49c99e020 Fix seat colour of TD4 River Rapids, fixes #1695 2015-08-31 13:23:52 +02:00
Gymnasiast 03034e7e2a Clear all map elements beforing generating a new map, fixes #1762 2015-08-31 12:42:46 +02:00
Ted John ce64c02872 Merge pull request #1863 from Gymnasiast/disable-vandalism-cheat
Add cheat to disable vandalism
2015-08-31 11:12:27 +01:00
IntelOrca 5f342eeb05 fix flag value 2015-08-31 11:11:02 +01: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 0c0847160d fix #1857 2015-08-30 22:57:29 +01:00
IntelOrca be3c54d266 fix #1859 2015-08-30 14:25:56 +01:00
IntelOrca bea74ee261 make all file IO utf8 compatible, fixes #1847 2015-08-29 13:13:23 +01:00
IntelOrca f0100a71a7 use windows lean and mean to reduce definition conflicts 2015-08-29 13:13:22 +01:00
Gymnasiast 20c7267b53 Don't show the Network status toolbar button in the Editors 2015-08-28 23:27:31 +02:00
IntelOrca 7a4c418d9e fix #1487 2015-08-28 17:55:50 +01:00
Ted John cfecc817f2 Merge pull request #1853 from Gymnasiast/fix-banner-count
Add a console option to fix the banner count, fixes #667
2015-08-28 12:35:05 +01: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 e9b5282486 Add a console option to fix the banner count, fixes #667 2015-08-27 17:24:23 +02:00
Gymnasiast 4d7a81bfe0 Remove unnecessary duplicate address, use more string constants 2015-08-27 16:44:18 +02:00
Gymnasiast 592b6f578d Fix oversight in string order 2015-08-27 16:27:05 +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 745365ca69 implement crash particles 2015-08-22 16:39:24 +01:00
IntelOrca 3062bbf3b6 refactor balloon, duck and money effect 2015-08-22 12:11:20 +01: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
LRFLEW 5d19c44e46 Fixed autosaves preventing saving before quitting dialog from appearing 2015-08-20 20:57:09 -05:00
Gymnasiast f384a9cbf8 Remove test code 2015-08-20 13:23:07 +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 720076acb5 fix cmake error 2015-08-19 22:59:55 -06:00
zsilencer 7322307a04 fix issues with pausing in multiplayer 2015-08-19 20:34:52 -06:00
zsilencer 5bb3218d4c make desync detection work again 2015-08-19 19:07:11 -06: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 3b1708f1be Wrong logging fixed 2015-08-19 23:09:54 +02:00
Runelaenen 6ec01c6d65 Changed localisation strings 2015-08-19 22:35:20 +02:00
Runelaenen d34a446d61 Easier saving
Replace Save game functionality and add 'save game as' function
2015-08-19 22:02:06 +02:00
Runelaenen fb5921db6d First headless version 2015-08-19 18:07:04 +02:00
IntelOrca 408628c80c fix building on VS 2015-08-19 07:47:21 +01:00
medsouz 4207b41855 Name more addresses 2015-08-18 23:53:24 -04:00
Michał Janiszewski fc533c92c4 Add switch to disable network at compile-time 2015-08-19 01:47:33 +02: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
Gymnasiast 4fa571a041 Add option to allow loading scenarios with an incorrect checksum 2015-08-18 10:47:31 +02:00
medsouz 958f2fb296 Document some scenery memory addresses 2015-08-17 23:05:46 -04:00
xperia64 a6043c6f78 Re-add PLUGIN.DAT 2015-08-17 20:48:18 -04:00
Ted John c5d2023a47 Merge pull request #1775 from Gymnasiast/obsolete-config-code
Remove / comment out obsolete config code and unused file references
2015-08-17 20:13:42 +01: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 719b897936 Named addresses in staff.c globals 2015-08-16 18:37:57 -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
Gymnasiast 99dd05176f Use a define the number of default music tracks 2015-08-16 22:26:17 +02:00
xperia64 4607659149 Rebase 2015-08-16 16:06:21 -04:00
xperia64 9af5f029aa Rebase 2015-08-16 16:04:21 -04:00
xperia64 a629de4666 Correct String IDs 2015-08-16 16:03:23 -04:00
xperia64 4733ea28c0 Add a cheat so guests ignore intensity and nausea ratings 2015-08-16 16:02:41 -04:00
medsouz 150fe74e4e Remove unused code
0x009DEA5C is set but never read
0x009AAC73 is normally set to 0 when the screen resolution is changed to
delay saving the config. This is no longer neccesary in OpenRCT2
2015-08-16 15:30:37 -04:00
Gymnasiast 6a23e28670 Refactored music file list, removed some extra unused code, clear up some comments 2015-08-16 21:29:10 +02:00
Gymnasiast fcb74d13b2 Get rid of unused file references, comment out unused obsolete config file code 2015-08-16 20:45:23 +02:00
Gymnasiast 4d81eb578e Remove long-disabled config code 2015-08-16 20:45:23 +02:00
xperia64 7a30f614a1 Correct String IDs 2015-08-16 14:16:45 -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
Ted John 43489db6a2 Merge pull request #1796 from Gymnasiast/chosen-name-in-use
Add console option to reset all user strings
2015-08-16 16:32:11 +01:00
Gymnasiast eeeb7927eb Reset ride names to their defaults when using reset_user_strings 2015-08-16 17:16:16 +02:00
IntelOrca a3450a4bf8 add loading / saving of servers 2015-08-16 15:27:21 +01:00
Gymnasiast 7449deeffe Add console option to reset all user strings 2015-08-16 15:31:59 +02: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 9746bccbf6 improve multiplayer 2015-08-15 23:19:15 +01:00
xperia64 a18dc9dc61 Add a cheat so guests ignore intensity and nausea ratings 2015-08-15 14:42:53 -04:00
IntelOrca 3f31221973 fix network merge issues, fix #1785 2015-08-14 22:06:15 +01:00
IntelOrca 90fcc6f18e only show desync on network games 2015-08-14 16:59:27 +01:00
zsilencer c1e802e361 fix text for utf8 2015-08-14 09:15:07 -06:00
zsilencer ad70dbb84c map load on join 2015-08-14 09:13:40 -06:00
zsilencer a4267990b8 detect desyncs 2015-08-14 09:13:40 -06:00
zsilencer 111a2e8198 fix another source of nondeterminism 2015-08-14 09:13:40 -06:00
zsilencer 5dab3be1d7 fix view position when loading map over network 2015-08-14 09:13:40 -06:00
zsilencer 3a26f56000 fix path placement for network 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 04dedbcec4 fix scenery placement issue over 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 c0dc591152 refactor and add network authorization 2015-08-14 09:13:31 -06:00
zsilencer 71f20b44aa endian-safe packet streams 2015-08-14 09:13:30 -06:00
zsilencer 149b3d86af network refactoring 2015-08-14 09:13:30 -06:00
zsilencer 73211b4215 fix chat window for new window code 2015-08-14 09:13:30 -06:00
zsilencer f7be55eb9d fix cmake compile errors
fix cmake compile errors
2015-08-14 09:13:30 -06:00
zsilencer f883e7a8da get game commands working a bit better 2015-08-14 09:13:30 -06:00
zsilencer 802ccfd98e allow multiple client connections 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 6c571bab00 convert network to c++ 2015-08-14 09:13:30 -06:00
zsilencer df7f576e05 map loading over network 2015-08-14 09:13:29 -06:00
IntelOrca 99f2b87043 add chat feature 2015-08-14 09:13:29 -06:00
IntelOrca 196e6eb675 get basic network game working 2015-08-14 09:13:17 -06:00
IntelOrca 7e23d2d013 add basic server connection functions 2015-08-14 09:13:17 -06:00
Gymnasiast 5a6b011d24 Remove anti-cheat code that slashes reliability for hacked rides, fixes #1780 2015-08-14 14:33:45 +02:00
Gymnasiast 86bcbafc01 Rename finance_mark_loan_settings_as_legitimate() to finance_update_loan_hash() 2015-08-13 09:00:49 +02:00
Gymnasiast d04d2f5069 Silently update invented items when using Inventions List in-game 2015-08-12 16:21:16 +02:00
Gymnasiast e9637978a1 Fix cheat detection when using Scenario Options in-game, rename sub_69E869() 2015-08-12 16:12:34 +02:00
Gymnasiast d01a53bd16 Add Inventions List and Scenario Options to the Debug menu 2015-08-12 15:31:52 +02:00
Ted John e53aebc904 Merge pull request #1772 from Gymnasiast/refactor-map-window
Refactor map window
2015-08-12 13:43:52 +01:00
Gymnasiast 7db2008472 Fix minimum tool sizes 2015-08-12 14:24:20 +02:00
Gymnasiast 6ec3838b0b Refactor map window 2015-08-12 14:23:13 +02:00
Gymnasiast a0f75fbda2 Turn minimum and maximum tool sizes into defines 2015-08-12 14:07:16 +02:00
Gymnasiast f0054c7307 Fix typo 2015-08-12 00:23:40 +02:00
Gymnasiast fd715c7c5d Name RIDE_TYPE_FLAG_8 and _12 2015-08-12 00:21:53 +02:00
Gymnasiast 7fe0284917 Refactor land, water and land rights windows 2015-08-11 23:09:39 +02:00
Ted John 4a7147c9ae Merge pull request #1764 from Gymnasiast/fix-clear-scenery-in-scenario-editor
Fix Clear Scenery tool in Scenario Editor, fixes #1763
2015-08-11 18:42:39 +01:00
Gymnasiast 23d4084332 Refactor Clear Scenery window and raise size limit to 64 2015-08-11 18:26:39 +02:00
Gymnasiast 810bd0620a Fix Clear Scenery tool in Scenario Editor 2015-08-11 17:54:21 +02:00
medsouz 58aeb6c911 Changed the wrong boolean
I should probably sleep more...
2015-08-11 07:17:06 -04:00
medsouz db9ea4cdf3 Added toggle for audio disable on focus lost
This closes #1758
2015-08-11 07:06:00 -04:00
medsouz 6caa48d3c3 Make all game sounds respect gGameSoundsOff 2015-08-11 06:29:21 -04:00
medsouz 3ce6d7020b Pause audio when tabbing out
TODO: Figure out why title music and toilet sounds are still playing

Add an option to disable this feature so that people can jam out to the
carousel music while tabbed out.
2015-08-11 00:42:18 -04:00
medsouz 72f3d1ace3 Fix scrollbar integer overflow
Fixes #1752
2015-08-10 18:15:31 -04:00
LRFLEW b2bb862f75 Fix #1756 2015-08-10 11:01:35 -05:00
IntelOrca b7f037fe60 use TTFFontSimSun for Chinese (Simplified) and fix config value reading 2015-08-10 12:31:39 +01:00
LRFLEW d10f5c8f06 Added tracked guests filter 2015-08-09 22:58:15 -05:00
Ted John 3bc58b7d7f Merge pull request #1751 from Gymnasiast/extra-languages
Add Simplified Chinese and Finnish as selectable languages
2015-08-09 23:17:52 +01:00
Gymnasiast 959b492330 Add Simplified Chinese and Finnish as selectable languages 2015-08-09 21:29:42 +02:00
Gymnasiast 46a0529f40 Add comment to clarify that non-inventioned rides are skipped 2015-08-07 22:34:15 +02:00
IntelOrca f43c7f6ac1 implement viewport_vehicle_paint_setup 2015-08-07 02:47:57 +01:00
IntelOrca 5e804463c8 fix #1740 2015-08-07 02:04:44 +01:00
Michał Janiszewski fd6ddb7120 Prevent accessing memory we don't own
In case where strlen(propertyName) < strlen(name) we are accessing
memory from stack mapping possibly outside our ownership.

Prevent such behaviour by clamping the check to valid range only.
2015-08-07 00:42:51 +02:00
IntelOrca d0827bd9d8 implement window_maze_construction_resize and window_maze_construction_construct 2015-08-06 02:12:36 +01:00
IntelOrca 4f77cc8df3 implement gfx_draw_sprite_raw_masked 2015-08-06 01:00:03 +01:00
IntelOrca cb3abcb0ca fix #1612 2015-08-05 21:49:44 +01:00
IntelOrca 1496f2404d fix #1736 2015-08-05 21:36:58 +01:00
Maikel Stuivenberg d12b75acc2 hide non-applicable marketing campaigns, closes #1516, closes #1454, fixes #1510 2015-08-05 21:18:56 +01:00
IntelOrca 6b72f9a555 refactor shop item strings 2015-08-05 19:17:37 +01:00
IntelOrca a3ff453f40 fix #1667 2015-08-05 13:36:46 +01:00
IntelOrca 2d770093e9 fix #1630 2015-08-05 13:01:41 +01:00
IntelOrca 36aacdf455 fix freeing of stack memory 2015-08-05 02:22:17 +01:00
IntelOrca cec486839c add 'no entrance' style and refactor a few things 2015-08-05 01:24:18 +01:00
IntelOrca 84f76d81e8 refactor peep 2015-08-05 00:14:07 +01:00
Ted John 166a6638d9 Merge pull request #1728 from janisozaur/portability
portability fixes
2015-08-04 23:57:16 +01:00
Michał Janiszewski 413805f675 portability fixes 2015-08-04 22:46:32 +02:00
IntelOrca be4ee45d66 convert more platform functions over to utf8 and close #1713 2015-08-04 21:41:45 +01:00
IntelOrca e0769800e7 remove old zero clearance tool 2015-08-04 20:25:24 +01:00
Michał Janiszewski 7afb7e2dfd Portability fixes 2015-08-04 19:31:21 +02:00
Ted John 61c42fc653 Merge pull request #1725 from danidoedel/bugfix
fix recent messages toolbar tooltip
2015-08-04 17:46:50 +01:00
IntelOrca 9ec701345f fix #1724 2015-08-04 17:40:02 +01:00
danidoedel 1fc7c0ecac fix recent messages toolbar tooltip 2015-08-04 17:56:12 +02:00
IntelOrca 2419c6629e improve clear scenery tool 2015-08-04 16:01:31 +01:00
IntelOrca b5237e24ec improve #1703 2015-08-04 15:21:12 +01:00
IntelOrca ca0e63f1a1 fix #1598 2015-08-04 02:28:05 +01:00
IntelOrca f25ab8e9f3 fix #1715 2015-08-04 02:12:17 +01:00
IntelOrca 59e710f806 fix #1709 2015-08-04 02:08:39 +01:00
IntelOrca cac0f2ab52 upgrade to VS2015 compiler 2015-08-03 23:16:30 +01:00
IntelOrca 36c5179b39 implement utf8, part 27 (tweak tooltips) 2015-08-03 18:40:16 +01:00
IntelOrca 3c1190e11f implement utf8, part 26 (bug fixes) 2015-08-03 18:06:54 +01:00
IntelOrca 33929d3ac4 implement utf8, part 25 (bug fixes) 2015-08-03 14:42:48 +01:00
IntelOrca 7bcb12503a implement utf8, part 24 (bug fixes) 2015-08-02 11:25:26 +01:00
IntelOrca d228d13918 implement utf8, part 23 (bug fixes) 2015-08-01 16:40:15 +01:00
IntelOrca de7088cb25 implement utf8, part 22 (bug fixes) 2015-08-01 10:21:02 +01:00
IntelOrca 7fe54661b9 implement utf8, part 21 (more font specific customisation and bug fixes) 2015-08-01 10:21:01 +01:00
IntelOrca 4d003ad00a implement utf8, part 20 (improve font sizes and offsets) 2015-08-01 10:21:01 +01:00
IntelOrca 52d5732826 implement utf8, part 19 2015-08-01 10:21:00 +01:00
IntelOrca 799cb53ec7 implement utf8, part 18 2015-08-01 10:20:59 +01:00
IntelOrca 4f91a9f2d0 implement utf8, part 17 2015-08-01 10:20:59 +01:00
IntelOrca 6bf474bd52 implement utf8, part 16 2015-08-01 10:20:58 +01:00
IntelOrca 31eb758ba1 implement utf8, part 15 2015-08-01 10:20:57 +01:00
IntelOrca fa87d8e999 implement utf8, part 14 2015-08-01 10:20:57 +01:00
IntelOrca 617880e8d2 implement utf8, part 13 2015-08-01 10:20:56 +01:00
IntelOrca a9e6f8c3db implement utf8, part 12 2015-08-01 10:20:55 +01:00
IntelOrca 357111a560 implement utf8, part 11 2015-08-01 10:20:55 +01:00
IntelOrca 99c7c93764 implement utf8, part 9 2015-08-01 10:20:53 +01:00
IntelOrca c6815b6eec implement utf8, part 8 2015-08-01 10:20:53 +01:00
IntelOrca f14187f89d implement utf8, part 7 2015-08-01 10:20:52 +01:00
IntelOrca d6a7025a3a implement utf8, part 6 2015-08-01 10:20:51 +01:00
IntelOrca 795c01cab5 implement utf8, part 5 2015-08-01 10:20:50 +01:00
IntelOrca 1682eae048 implement utf8, part 4 2015-08-01 10:20:50 +01:00
IntelOrca 2bb0c6c53f implement utf8, part 3 2015-08-01 10:20:49 +01:00
IntelOrca e21bea62ce implement utf8, part 2 2015-08-01 10:20:48 +01:00
IntelOrca c4b355f648 implement utf8, part 1 2015-08-01 10:20:48 +01:00
olegv11 8ea6adc555 Implemented sub_6A87BB (now update_path_wide_flags), sub_6A8ACF and sub_6A8B12 2015-07-31 13:38:34 +03:00
olegv11 2b6cfdec1d Added a helper function footpath_element_is_wide 2015-07-31 12:43:57 +03:00
Gymnasiast fc844b5148 Disable integrity check for data files 2015-07-30 19:47:23 +02:00
IntelOrca 6f1aca52f5 fix #1657 2015-07-30 00:26:32 +01:00
Ted John 27193a3c7c Merge pull request #1708 from Gymnasiast/large-list-scroll
Fix scrollbar getting stuck on large lists
2015-07-29 16:50:50 +01:00
Ted John 4f46707a2e Merge pull request #1701 from Gymnasiast/name-ride-type-flag-2
Name RIDE_TYPE_FLAG_21
2015-07-29 16:50:37 +01:00
Gymnasiast 7a445467a4 Use unsigned 16-bit integer 2015-07-29 16:53:04 +02:00
Ted John ee64219f55 Merge pull request #1707 from Gymnasiast/junior-rc-reverse-incline
Reinstate Reverse Inclined Shuttle for Junior RC (like in RCT1), fix comments and whitespace
2015-07-29 11:57:55 +01:00
Ted John 10fc123228 Merge pull request #1699 from Gymnasiast/name-flags
Name a park flag and a TD6 flag.
2015-07-29 11:54:24 +01:00
Gymnasiast a89cee3abf Fix scrollbar getting stuck on large lists 2015-07-29 11:04:38 +02:00
Gymnasiast e7b36632c5 Reinstate Reverse Inclined Shuttle for Junior RC (like in RCT1), fix comments and whitespace 2015-07-29 10:43:13 +02:00
Gymnasiast f12cbeb22b Rename var_6C to flags2 and put all know flags of it into an enum 2015-07-29 08:43:04 +02:00
Gymnasiast 5785530e00 Name RIDE_TYPE_FLAG_21 2015-07-28 21:28:29 +02:00
Gymnasiast 4e8d5572cc Name PEEP_FLAGS_19 2015-07-28 21:16:50 +02:00
Gymnasiast ade8779195 Name a park flag and a TD6 flag. 2015-07-28 20:44:44 +02:00
Ted John 2fc658e346 Merge pull request #1697 from Gymnasiast/guests-given-date
Allow setting 'Guests at given date' in increments of 50, with a minimum of 250
2015-07-28 19:39:45 +01:00
Duncan Frost bf59c164f8 Start implementing main path find function. 2015-07-28 18:34:33 +01:00
IntelOrca 3a07af140b Implement more peep path finding 2015-07-28 18:33:46 +01:00
IntelOrca 065b9bedbd implement sub_694BAE 2015-07-28 18:33:40 +01:00
Duncan Frost 481e286dd9 Implemented start of guest_path_finding 2015-07-28 18:33:18 +01:00
Gymnasiast 88f4185b3b Allow setting 'Guests at given date' in increments of 50, with a minimum of 250 2015-07-28 19:17:25 +02:00
Ted John ea130a6126 Merge pull request #1694 from Gymnasiast/remove-six-flags-branding-and-limitations-2
Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag
2015-07-28 12:08:47 +01:00
Gymnasiast 9976b9673a Remove rest of Six Flags branding. 2015-07-28 10:13:16 +02:00
Gymnasiast 5ed8948e4f Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag 2015-07-27 21:47:55 +02:00
Gymnasiast 65900982c4 Fix '1 weeks remaining' 2015-07-27 17:33:22 +02:00
Duncan cfb8f3ae0a Merge pull request #1691 from Gymnasiast/more-obsolete-strings
Mark more obsolete strings
2015-07-27 12:23:30 +01:00
Gymnasiast 38f031655c Fix display of remaining marketing campaign weeks 2015-07-27 10:34:19 +02:00
Gymnasiast c2fe82dcb7 Mark more obsolete strings 2015-07-27 10:16:08 +02:00
Ted John 30ee1096b7 Merge pull request #1684 from Gymnasiast/longer-marketing-campaigns-squash
Allow running marketing campaigns for up to 12 weeks
2015-07-26 21:48:39 +01:00
Gymnasiast 777065e6a6 Allow running marketing campaigns for up to 12 weeks 2015-07-26 22:36:12 +02:00
Ted John 8bfdbdec65 Merge pull request #1687 from Gymnasiast/fix-intro-option
Remove Infogrames disclaimer from intro and fix config option
2015-07-26 21:33:26 +01:00
Matt Layher 06f2adb9d6 Properly merge #1672: incorrect plural form for last inspection time, fixes #1513, closes #1672 2015-07-26 21:30:29 +01:00
Duncan 6f0ad6a916 Merge pull request #1686 from Gymnasiast/disable-tutorial-button
Disable tutorial button
2015-07-26 17:00:56 +01:00
Gymnasiast ce7a0ac27b Remove Infogrames disclaimer from intro and fix config option 2015-07-26 16:07:58 +02:00
Gymnasiast 19d2bbf919 Disable tutorial button 2015-07-26 15:14:38 +02:00
Gymnasiast bcdfdcb7a0 Reorder Options window 2015-07-26 14:37:27 +02:00
Duncan Frost 568915d7fb Fix peeps not moving when footpath changed.
Fixes #1604
2015-07-26 07:41:44 +01:00
Ted John f4216227f4 Merge pull request #1682 from Gymnasiast/upper-case-banners
Add feature to make banners display text in all caps
2015-07-25 20:50:02 +01:00
Gymnasiast ae32b463c0 Add feature to make banners display text in all caps 2015-07-25 21:38:23 +02:00
IntelOrca 801d2ec341 implement window_maze_construction_mousedown 2015-07-25 17:48:00 +01:00
Michael Steenbeek 5028e83b52 Align comments with tab spacing of 4 2015-07-25 18:18:27 +02:00
Michael Steenbeek 644c4a9a59 Merge pull request #11 from kevinburke/name-track-pieces
Put names on every track piece
2015-07-25 18:14:16 +02:00
zsilencer c4a8d27648 fix couple of bugs 2015-07-25 08:50:59 -06:00
Ted John 2d11e54fa7 Merge pull request #1670 from duncanspumpkin/peep
Peep
2015-07-25 11:32:25 +01:00
Duncan Frost 812010001d Implement guest surface path finding 2015-07-25 11:16:59 +01:00
Ted John 4e8593be8c Merge pull request #1674 from zsilencer/decompiling
implement map_can_construct_with_clear_at
2015-07-25 11:12:29 +01:00
Michał Janiszewski 6adb384a7e Refactoring in news_item
Now news_items are fetched only with exposed calls, which add a layer of
simple checks. I also switched few places to access a read-only version
of news_item.
2015-07-25 11:31:17 +02:00
Duncan Frost bff00b29bf Fix more small pathfinding bugs. Fix unset memory errors 2015-07-25 10:12:51 +01:00
Duncan Frost 074b2a6909 Remove code offset comments, fix destination bug 2015-07-25 09:09:26 +01:00
Duncan Frost c93671af3f Small refactor 2015-07-25 08:57:19 +01:00
Duncan Frost 0ca26a7fca Fix #1430 2015-07-25 08:57:18 +01:00
Duncan Frost 9cf5240c90 Start implementing sub_693C9E 2015-07-25 08:57:18 +01:00
zsilencer bb46510def implement map_can_construct_with_clear_at 2015-07-24 20:52:14 -06:00
IntelOrca 04dcca5468 implement peep_on_enter_or_exit_ride 2015-07-25 02:58:38 +01:00
IntelOrca 50187adc37 enable debug configuration and add optimisations to release configuration 2015-07-24 23:48:23 +01:00
IntelOrca fe69ad6d53 fix day / night cycle for title sequence 2015-07-24 23:05:31 +01:00
IntelOrca 08504257ad fix saving of day night config 2015-07-24 23:00:24 +01:00
IntelOrca 5f69e6f37a add cycle day / night 2015-07-24 22:58:41 +01:00
IntelOrca dd107ee25c save object selection filter, closes #1599 2015-07-24 20:15:13 +01:00
IntelOrca b12b1b5faf support map scroll keyboard shortcuts, e.g. WASD. Closes #757 2015-07-24 19:20:24 +01:00
Duncan e5aeb8dc38 Merge pull request #1668 from janisozaur/develop
sub_0x68615B doesn't really take any params
2015-07-24 12:36:58 +01:00
Michał Janiszewski 8f2dc5fd1a sub_0x68615B doesn't really take any params
In all cases, sub_0x68615B takes a single argument, 0xEE788C.
It now takes 0 arguments and simply knows about its initializing values.
2015-07-23 20:22:08 +02:00
IntelOrca faacd66ad9 allow trees to be raised if supports limits are disabled, close #1663 2015-07-23 18:55:51 +01:00
IntelOrca 1662b18a7e fix #1662, consistent location sign 2015-07-23 18:38:43 +01:00
IntelOrca 43b657730e fix #1658 2015-07-22 20:29:25 +01:00
IntelOrca 1f2502c8c2 add recent messages to toolbar, closes #1423 2015-07-22 18:13:35 +01:00
LRFLEW d3742319b3 Fix #1654 2015-07-21 13:15:11 -05:00
IntelOrca f35c23bb68 implement window_maze_construction_update 2015-07-21 15:02:53 +01:00
IntelOrca 519937c962 implement peep_should_use_cash_machine 2015-07-21 14:39:30 +01:00
Duncan Frost cd400867e8 Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop 2015-07-20 20:51:01 +01:00
Duncan Frost b94d77ccae Fix issue where saving would close toolbar.
Fixes 1537. Issue was caused by the window order being changed further down a function call. This meant all pointers to windows were invalid.
2015-07-20 20:49:56 +01:00
IntelOrca 4a16573786 fix cast warning 2015-07-20 20:25:05 +01:00
IntelOrca 1176e74ff6 fix guest and staff renaming 2015-07-20 20:21:12 +01:00
Duncan Frost 1725211713 Fix incorrect widgets enabled in ride construction. 2015-07-20 19:47:54 +01:00
Duncan Frost ed23efe389 Implement remaining functions that were crashing 2015-07-20 18:43:57 +01:00
Duncan Frost a877dd4a5b Get the initial maze construct working.
Note entrances are broken
2015-07-20 18:03:45 +01:00
Duncan Frost be58c6a688 Fix dereference of unset information.
Fixes #1650
2015-07-20 17:33:02 +01:00
Duncan Frost 82217d0053 Fix support cost multiplier underground.
Fixes #1651
2015-07-20 17:21:32 +01:00
zsilencer c0354fb16a fix #1645 2015-07-19 12:38:29 -06:00
Ted John 083625467a Merge pull request #1647 from duncanspumpkin/peep
Peep functions
2015-07-19 16:23:49 +01:00
Duncan Frost d2bcf096f7 Fix slope end when deleting sections.
Fixes #1646
2015-07-19 15:11:24 +01:00
Duncan Frost 34109b7978 Implement peep_assess_surroundings 2015-07-19 11:10:06 +01:00
Duncan Frost 72b740bd83 Implement peep_get_height_on_slope 2015-07-19 10:22:49 +01:00
Duncan Frost 9e8b9b10c7 Fix footpath connection bug 2015-07-19 10:00:43 +01:00
IntelOrca a64a8c6021 implement peep_head_for_nearest_ride_with_flags 2015-07-19 00:06:55 +01:00
IntelOrca a86d1cd07d implement peep_head_for_nearest_ride_type 2015-07-19 00:06:42 +01:00
IntelOrca 37f49646dd implement peep_pick_ride_to_go_on 2015-07-19 00:06:40 +01:00
IntelOrca 067fbb59a4 implement sprite_misc_3_create and sprite_misc_5_create 2015-07-19 00:06:27 +01:00
Duncan Frost 09ea7a1c93 Started implementing sub_68F41A 2015-07-19 00:06:05 +01:00
IntelOrca 2bad1052b3 fix #1641 2015-07-17 21:32:22 +01:00
IntelOrca 5f1878dca9 fix keyboard_shortcut_format_string 2015-07-17 17:54:01 +01:00
IntelOrca 74dc18b062 implement viewport_track_paint_setup 2015-07-17 17:25:38 +01:00
Ted John a6c71c61ce Merge pull request #1615 from LRFLEW/queue
Improved Queue Pathing
2015-07-17 16:05:02 +01:00
IntelOrca e967e9465f implement sub_68B2B7 2015-07-17 16:00:46 +01:00
Gymnasiast 3e5e4431c0 Rename sub_6B59C6() to invalidate_test_results() 2015-07-17 13:49:36 +02:00
IntelOrca b3f3055429 fix mistake in ride_create 2015-07-17 02:43:22 +01:00
LRFLEW e0f425ab61 Improved Queue Pathing 2015-07-16 13:02:29 -05:00
IntelOrca 48028fcfc4 fix #1631, fix #1632 2015-07-16 16:42:46 +01:00
IntelOrca 354d604b26 fix #1633 2015-07-16 16:05:21 +01:00
Duncan 49c872d24a Merge pull request #1627 from Gymnasiast/console-ux
Console UX improvements, fixes #1622
2015-07-16 12:24:35 +01:00
Gymnasiast 97fa80d044 Use correct ride naming in select-by-track-type mode 2015-07-16 11:00:27 +02:00
Gymnasiast 58247a2d6b Console UX improvements, fixes #1622 2015-07-16 10:21:10 +02:00
IntelOrca 7cddad5026 implement game_command_create_ride 2015-07-16 01:38:28 +01:00
zsilencer 38b691b460 fix #1624 2015-07-15 15:44:05 -06:00
Duncan Frost 2bdb32061b Fix path connection to ride entrances.
Fixes #1616. Small fix to queue chaining as well.
2015-07-15 21:35:34 +01:00
Michael Steenbeek 8478381595 RCT1: Import the correct chip shop 2015-07-15 11:36:47 +02:00
IntelOrca 07717abdfd fix audio initialisation bug when device is not set in config 2015-07-14 23:59:29 +01:00
zsilencer 72d16dd4d0 make all sounds play correctly through hook 2015-07-14 16:45:25 -06:00
zsilencer ca6c3d68aa fix #1155 2015-07-14 16:45:25 -06:00
zsilencer 689f7c9f1d #1130 save last audio device 2015-07-14 16:45:24 -06:00
IntelOrca 81a8434873 fix and refactor rct1_process_scenario_flags 2015-07-14 23:37:22 +01:00
IntelOrca cde0cece16 implement rct1_fix_walls 2015-07-14 23:15:21 +01:00
IntelOrca 8acd9e73ca implement rct1_fix_colours 2015-07-14 21:58:45 +01:00
Duncan Frost 1440ac185d Fix invalid hook register list.
Fixes #1607
2015-07-14 21:20:22 +01:00
IntelOrca dcbdc7cb3a fix rct1_fix_paths 2015-07-14 21:07:27 +01:00
IntelOrca 48c5fe1626 implement rct_fix_paths 2015-07-14 19:14:11 +01:00
IntelOrca 445d603abe refactor various things such as scenario begin and staff mode reset, add rct1 ride struct 2015-07-14 18:18:28 +01:00
IntelOrca 968aec9040 fix #1605 2015-07-14 11:43:19 +01:00
IntelOrca 26a540e78d fix #1605 2015-07-14 01:26:00 +01:00
IntelOrca 836c208dc5 implement rct1_fix_z 2015-07-14 00:42:27 +01:00
IntelOrca 345b71f8a4 implement rct1_clear_extra_sprite_entries and rct1_clear_extra_tile_entries 2015-07-13 23:49:39 +01:00
Duncan Frost af5aab97bc Fix ride construction auto entrance selection 2015-07-13 22:04:47 +01:00
IntelOrca 118b9ea2ac fix tile inspector 2015-07-13 21:45:10 +01:00
Duncan Frost 23bb22c3af Add check for ghost entrance removal.
Fixes #1601
2015-07-13 21:18:55 +01:00
Duncan Frost 8504486b28 Fix entrance/exit placement.
Fixes #1591
2015-07-13 21:09:36 +01:00
IntelOrca b2d620bb9d implement window_ride_measurements_tooldown and refactor track save scenery 2015-07-13 20:43:17 +01:00
IntelOrca 5cda9af81f implement window_staff_list_tooldown 2015-07-13 19:51:46 +01:00
IntelOrca bb2374d6ad fix #1597 2015-07-13 18:22:28 +01:00
IntelOrca 1d9f404b5b implement ride_construction_set_default_next_piece 2015-07-13 12:47:31 +01:00
Gymnasiast 0cbabb479e Fix some warnings 2015-07-13 11:56:58 +02:00
Gymnasiast a63642b630 Fix some warnings 2015-07-13 11:50:09 +02:00
zsilencer af68e9d9ea fix #1590 2015-07-12 20:23:58 -06:00
IntelOrca 01d2d599ca implement ride_ratings_score_close_proximity_loops 2015-07-12 22:13:08 +01:00
IntelOrca d264a27195 ride_ratings_score_close_proximity_in_direction 2015-07-12 21:40:21 +01:00
IntelOrca d7a5dedea4 refactor ride ratings proximity 2015-07-12 21:18:40 +01:00
IntelOrca a29ee4e1f0 implement ride_ratings_score_close_proximity 2015-07-12 17:48:52 +01:00
IntelOrca e96f42dc34 implement sub_65E277 2015-07-12 16:29:32 +01:00
IntelOrca 4a8b5843f7 implement ride_get_track_length 2015-07-12 15:16:15 +01:00
IntelOrca ed5c6eb866 implement ride_check_start_and_end_is_station and fix #1575 2015-07-12 14:26:14 +01:00
IntelOrca 3ffffc699c clean up and remove various callprocs 2015-07-12 01:46:52 +01:00
IntelOrca c36e9d9cb8 implement ride_ratings_check_valid_configuration and finalise other ride rating functions 2015-07-12 00:24:54 +01:00
Kevin Burke fe00e48139 Put names on every track piece 2015-07-11 15:07:14 -07:00
IntelOrca 6acf52ce63 implement ride_check_track_contains_inversions, ride_check_track_contains_banked, refactor track circuit iteration and fix window event bug with hook 2015-07-11 22:51:11 +01:00
IntelOrca 48b71782fe fix sub_679023 2015-07-11 21:58:33 +01:00
IntelOrca 9e9eb6a833 implement banner_get_closest_ride_index 2015-07-11 20:24:27 +01:00
IntelOrca 9dca351e8d fix mistake in sub_679023 2015-07-11 19:37:19 +01:00
IntelOrca 5deb97a745 extract callfuncs into separate methods in peep.c 2015-07-11 19:11:12 +01:00
IntelOrca daaf42d581 implement sub_679023 2015-07-11 18:46:52 +01:00
IntelOrca fbd402eb67 implement remaining screen_get_map_xy... functions 2015-07-11 18:23:59 +01:00
zsilencer aeeca2454a fixed source of non-deterministicness 2015-07-11 12:31:11 +01:00
zsilencer 6e3ff0e1df refactor tween reset
Conflicts:
	src/game.c
2015-07-11 12:30:39 +01:00
zsilencer b876591543 use SDL_RWops for save games 2015-07-11 12:27:46 +01:00
zsilencer e8d8f7c684 fix invalidation issue with picked up staff 2015-07-10 21:01:58 -06:00
zsilencer a58458bbb3 fix issue with negative dirty blocks 2015-07-10 20:50:49 -06:00
zsilencer 11a98d2e23 better solution to #1572 2015-07-10 20:13:19 -06:00