Michał Janiszewski
133096cd64
Merge branch 'develop' into vehicle-update
2016-01-05 09:59:53 +01:00
IntelOrca
f0adf90660
integrate variable: gInputFlags
2016-01-04 22:53:03 +00:00
Jonathan Haas
4d26e4c4a1
Refactor peep code
...
Name various fields and constants related to peeps. This includes:
- Flags for flashing peeps in map window
- Animation frames for picked up peeps
- Function checking if peep should start to fall
- Special sprite handling for slide boards and lawn mowers
- Created array for peep sprite entries, renamed some variables and constants
2015-12-31 13:57:06 +01:00
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
Michał Janiszewski
4c6ee9570c
Merge branch 'develop' into vehicle-update
...
Conflicts:
openrct2.vcxproj.filters
2015-12-27 18:11:13 +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
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
Michał Janiszewski
cd2ec16290
Merge branch 'develop' into vehicle-update
...
Conflicts:
openrct2.vcxproj.filters
projects/openrct2.vcxproj
2015-12-23 19:47:16 +01: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
Gymnasiast
dd460300ca
Extend fast lift hill cheat and update description
2015-12-20 21:12:24 +01: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
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
Ted John
ebcde1b231
Merge pull request #2418 from janisozaur/fixes
...
fix remaining suspicious left shifts
2015-12-05 14:20:29 +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
Michał Janiszewski
796021cfdc
fix suspicious left shifts
...
See b5b1957f5
2015-12-02 08:32:15 +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
Dom Light
3a8b25a0ee
Sanitize audio.h
2015-11-17 01:05:14 +00:00
Michał Janiszewski
075b98e209
Minor cleanups
...
Mostly just setting variables to better define game state, with one
minor update of decompilation where an `or` instruction was used in
place of `mov` (in `sub_6CBCE2`).
2015-11-12 12:19:40 +01:00
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
Michał Janiszewski
c0e2a5c7be
Add get_current_rotation function and DEBUG_LEVEL macros
2015-11-02 22:58:15 +01:00
Jonathan Haas
d2ec665ae4
Fix Bug #2138
2015-11-01 09:59:13 +01:00
Alexander Overvoorde
01793e11b7
Replace RCT2_GLOBAL magic numbers with address identifiers and string ids
2015-10-29 09:44:46 +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
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
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
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
Jonathan Haas
ae82ffcd96
Rename window flags
2015-10-03 17:20:53 +02:00
Gymnasiast
4909272a44
Add cheat option to show all operating modes; cleanup
2015-09-18 10:54:48 +02:00
IntelOrca
4dd95c650b
implement RideData4 data
2015-09-10 22:16:41 +01:00
Gymnasiast
ea9f87d0f3
Remove faulty copy-and-pasted check on secondary items, fixes #1866
2015-09-02 12:42:43 +02:00
Gymnasiast
c00e044b6c
Multiplayer interface improvements, cleanup
2015-08-16 13:14:04 +02:00
Gymnasiast
46a0529f40
Add comment to clarify that non-inventioned rides are skipped
2015-08-07 22:34:15 +02:00
IntelOrca
6b72f9a555
refactor shop item strings
2015-08-05 19:17:37 +01:00
IntelOrca
cec486839c
add 'no entrance' style and refactor a few things
2015-08-05 01:24:18 +01: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
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