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

48 Commits

Author SHA1 Message Date
Tomas Dittmann 90bb6320e5 Guard against invalid sprite access crashes (#5867) 
ride->num_vehicles not matching ride->vehicles[] in
ride_prepare_breakdown() and window_ride_maintenance_dropdown().
 2017-07-12 21:23:50 +02: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
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
wolfreak99 27f5773e4d rename event unknown_14 to viewport_rotate 2017-06-26 10:06:58 +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
Ted John 9c269ae94b Fix #5489: Sprite index crash for car view on car ride 2017-06-25 17:53:51 +01: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
Michał Janiszewski 9903c15e2a Remove various trailing whitespaces 
[ci skip]
 2017-06-17 13:41:40 +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
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
Ted John 463fadbcf6 Protect ride rating names from extreme numbers 2017-06-05 20:16:28 +01:00
Michael Steenbeek 7d9acca1e0 Create define for max ride types per ride entry, closes #5524 2017-06-01 22:00:11 +02:00
Michał Janiszewski 79d76759bb Fix #5516: Update copyrights for 2017 
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
 2017-06-01 21:55:10 +02:00
wolfreak99 3d50ab56c8 Support mouse dragging when selecting ride design scenery 
Define nearby scenery distance, support mouse dragging when selecting/deselecting ride design scenery
 2017-05-29 22:34:33 +02:00
Marijn van der Werf eaf93430d5 Remove some string additions 2017-05-28 19:49:32 +02:00
Marijn van der Werf 53b023612d Show uses of raw palette indices 2017-05-21 00:01:45 +02:00
Hielke Morsink bfa03583fa Apply window themes only when created or when the selected theme is changed 2017-05-17 13:19:42 +02:00
Michael Steenbeek 6bd34c1e55 Clean up sub_69101A, use constants for undefined excitement ratings, fixes #5481 2017-05-16 22:36:48 +02:00
Michael Steenbeek e725672d23 Clean up alternative track pieces and types, remove remnants of researched track pieces 2017-05-16 19:11:51 +02:00
Michael Steenbeek a53b01d5b9 Remove magic numbers and Americanisms 2017-05-08 23:54:38 +02:00
Marijn van der Werf a0259b79d4 Use rct_widgetindex type 2017-05-03 22:43:33 +02:00
Marijn van der Werf 927190103b Use enum for tools 2017-05-03 16:09:21 +02:00
Marijn van der Werf 2b54032b8e Replace magic numbers in windows with constants 2017-05-02 14:41:53 +02:00
Marijn van der Werf 3cf725745d Add compile-time checked constants for widget ids 2017-05-02 09:58:25 +02:00
siomy11 7cf64d0bfe Display "No mechanics are hired!" instead of "Calling mechanic..." when no mechanics are hired (#5368) 2017-04-16 22:38:02 +02:00
Gymnasiast 9efbf9c60e Only show 'Force breakdown' when not in network mode, fixes #5199 2017-04-02 19:35:25 +02:00
Michał Janiszewski 0471d4ccf6 Guard access to ride_type field in ride.c 2017-03-18 23:23:23 +01:00
Michał Janiszewski ddc2a708d4 Don't test unsigned value for being negative 2017-03-18 23:23:23 +01:00
Broxzier f9e2a74c4d Replace hardcode value and better readibility in ride.c 2017-03-11 23:42:33 +01:00
wolfreak99 56a1dbb54c Replace magic values for enabled widgets in Ride window (#5278) 2017-03-11 22:29:39 +01:00
Michał Janiszewski 7f48df20ec Refactor input 2017-02-27 20:20:41 +01:00
Ted John fb2c835d52 Include new config header 2017-02-18 15:45:10 +00:00
duncanspumpkin 260a6200b9 Fix dropdown custom height code. Use flags for filters. 
Note dropdown custom height code is not used in any function at present.
 2017-02-16 18:35:59 +00:00
Olivier Wervers dcf0702f3c Fix #4493: - Fix tooltip order.\n - Add tooltip to price label. 2017-02-10 19:30:57 +01:00
Olivier Wervers 9c8232e735 Added tooltip to ride and entrance price when price is disabled 2017-02-10 15:03:32 +01:00
duncanspumpkin d951c500c5 Refactor of peep data and label known addresses 
Fixes #4545. Incorrect sprite image for chicken and juice
 2017-01-26 19:51:30 +00:00
Ted John 7edf1e8b7f Merge pull request #4936 from Broxzier/short 
Because of a comment on a diff in #4878 asking for clearer and more consistent type usage. What this PR changes:

No unsigned long long found
(signed) long long -> sint64
unsigned int -> uint32
(signed) int -> sint32
(signed) long -> sint32
unsigned short -> uint16
(signed) short -> sint16
unsigned char -> uint8
No signed chars found
plain char is implementation-defined, so I left those in.
 2017-01-14 23:41:47 +00:00
Ted John 8f57e514fe Name more ride entry flags 2017-01-14 17:36:47 +00:00
Ted John f4cea0e6c8 Name a couple of ride entry flags and format enum 2017-01-14 16:48:56 +00:00
Broxzier 60603ae10a Use types from common.h 2017-01-14 12:37:31 +01:00
Ted John aed5c0aa60 Name flag: RIDE_TYPE_FLAG_26 2017-01-13 13:20:16 +00:00
Ted John cf0c489d40 Name flag: RIDE_TYPE_FLAG_13 2017-01-13 13:08:56 +00:00
Ted John 868bb54383 Fix remaining warnings 2017-01-12 18:20:22 +00:00
Ted John 4fbecc2f60 Replace magic numbers with constant SPRITE_INDEX_NULL 2017-01-05 12:49:42 +00:00
Ted John 25bc798ff8 Move contents of src into project sub directory 2017-01-04 17:44:12 +00:00
Renamed from src/windows/ride.c (Browse further)