1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Commit Graph

256 Commits

Author SHA1 Message Date
Ted John
e9935fee09 refactor some of the track design place code 2016-05-08 14:02:48 +01:00
janisozaur
68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Gymnasiast
5d0b79227f Clean up some magic values and refactor a bit 2016-05-03 07:25:19 +02:00
Ted John
652b1c83db integrate variables for lightning and toolbar dirty flags 2016-04-24 21:49:09 +01:00
Ted John
cea0f30121 integrate variable: gLandToolSize 2016-04-24 18:02:37 +01:00
Ted John
1fcefcfa7e integrate variables for water tool 2016-04-24 17:58:26 +01:00
Ted John
fc938892d8 integrate variables for command position and expenditure 2016-04-24 17:53:39 +01:00
Ted John
b9944dd33a integrate land tool variables 2016-04-24 17:28:12 +01:00
Ted John
d18ea8570d add global macro: gNextFreeMapElement 2016-04-24 14:30:21 +01:00
Ted John
0a80e7a737 integrate pickup peep variables 2016-04-24 10:28:08 +01:00
Ted John
e7f62bf014 integrate game palette variables 2016-04-24 02:02:56 +01:00
Ted John
a97533228c integrate window DPI variable 2016-04-24 01:40:55 +01:00
Ted John
19662a091c integrate rain drawing variables 2016-04-24 01:39:33 +01:00
Ted John
98f732aaf7 integrate screen variables (#3411) 2016-04-24 00:36:39 +01:00
Ted John
ee509caf35 integrate game paused variable and refactor 2016-04-23 13:34:55 +01:00
Ted John
4cdb2df9dc integrate screen variables 2016-04-23 11:16:46 +01:00
Ted John
171388e9a3 integrate park entrance ghost variables 2016-04-23 01:21:00 +01:00
Ted John
ddd0f07127 fix #3321: can't rotate pre-built rides 2016-04-22 23:59:16 +01:00
Duncan
0860cf4540 Merge pull request #3299 from marijnvdwerf/paint-setup/cleanup
WIP Paint setup/cleanup
2016-04-18 18:48:53 +01:00
Marijn van der Werf
a610b372fd Name addresses 2016-04-18 15:35:33 +02:00
Ted John
f73e3ab0e1 integrate footpath construction variables
- uint8 gFootpathProvisionalFlags
- rct_xyz16 gFootpathProvisionalPosition
- uint8 gFootpathConstructionMode
- uint16 gFootpathSelectedId
- uint8 gFootpathSelectedType
- rct_xyz16 gFootpathConstructFromPosition
- uint8 gFootpathConstructDirection
- uint8 gFootpathConstructSlope
- uint8 gFootpathConstructValidDirections

Also fix some previous variable integrations that had been forgotten to change.
2016-04-15 19:16:48 +01:00
Ted John
84edd049d9 integrate current tool variables:
- gCurrentToolId
- gCurrentToolWidget
2016-04-15 18:26:47 +01:00
Ted John
1b3f46f960 integrate game command error string variables
- gGameCommandErrorTitle
- gGameCommandErrorText
2016-04-15 17:54:46 +01:00
IntelOrca
89ad0cc769 store windows in openrct2 memory and increase max
Allocate a bigger window list and viewport list in OpenRCT2 static memory and move over all references from RCT2.
This also removes the 'active' viewport pointer list and instead changes everything to just enumerate the whole viewport list
2016-04-14 23:00:35 +01:00
IntelOrca
edf16d53d3 fix #1742: Non-ascii characters in scenario details not showing correctly 2016-03-13 15:33:38 +00:00
duncanspumpkin
24df65af9d Label current paint tile max height 2016-02-29 18:04:48 +00:00
IntelOrca
f1f0b76a2b remove cdecl original call macros 2016-01-14 20:21:10 +00:00
IntelOrca
cdee534eb1 use SDL2's platform defines to normalise platform guards 2016-01-14 20:12:43 +00:00
Marijn van der Werf
17bc24b3a0 Use absolute constants for object entry groups 2016-01-11 13:51:42 +01:00
LRFLEW
072bb52e42 Implemented sub_69A5F0 2016-01-10 02:28:20 -07: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
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
Michał Janiszewski
c4ad2346e3 Fixes for building optimized binary on Linux
Use `-DCMAKE_BUILD_TYPE=X`, where X:
- `RELEASE`
- `RELWITHDEBINFO`
- `MINSIZEREL`

Only works for GCC, clang binaries crash for now.
2015-11-18 21:29:08 +01:00
duncanspumpkin
bdd29107e6 Refactoring 2015-11-14 11:56:13 +00:00
Gymnasiast
98fd1bf95d Reinstate RCT2_ADDRESS_VEHICLE_SOUND_LIST 2015-10-25 21:42:09 +01:00
Gymnasiast
2b0d5b2470 Remove obsolete sound and config code 2015-10-25 20:54:19 +01:00
Michał Janiszewski
10587cb5ab Port non-VS inline asm to AT&T syntax
This is much more liked by other compilers
2015-10-22 23:32:27 +02:00
Michał Janiszewski
18c867a6fe Modify inline assembly to properly returns results
Both RCT2_CALLFUNC_X and RCT2_CALLPROC_X did not really return any
value, even though declared to return an int. The inlines are now
modified to properly return flags (`lahf`), with other contents zeroed
out.
2015-10-22 20:23:26 +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
Sam Horn
49cf5e3774 Moved the nausea thresholds into a C array 2015-10-11 04:07:14 +10:00
Sam Horn
1b2a7e62a2 Identified 0x00982392 as a nausea lookup array 2015-10-10 21:31:56 +10:00
Michał Janiszewski
74d0b033df Name RCT2_ADDRESS_PALETTE 2015-10-09 20:20:05 +02:00
Jonathan Haas
8463e58922 Define some tick related addresses 2015-10-03 20:00:29 +02:00
Michał Janiszewski
1bd8e11c0f Make it work on Linux
Right now the project is decompiled to the point where it is feasible to
try porting it to another platform. It doesn't work 100% correctly, but
it's nearing this state.

To port it to Linux I mmapped the openrct2.exe into expected places,
disabled two offending calls (RCT2_CALLPROC_EBPSAFE(0x0040701D) and
RCT2_CALLPROC_X(0x006E7FF3…)), replaced memory management routines
with generic ones and removed all the function-pointer calls.

A basic, non-exhaustive check is included to verify that memory is
loaded correctly in place.

That last bit is probably the most intrusive one, but had to be done, as
the calling convention on Linux differs from the one on Windows. It
could possibly be emulated (just like RCT2_CALLFUNC_X) until dependency
on exe is dropped.

It is possible to completely remove calls out to original code by
commenting out contents of RCT2_CALLFUNC_X, right now this will yield
working UI, but no rendering of peeps, rides or rest of world. This can
be used as a benchmark or test platform for correctness of
implementation. The data sections will still be required for now.

Assets are expected to be in specific places, so to launch it, following
needs to satisified:
* $build/data/ has to have contents of $RCT2/Data/
* $build/data/ (same as above) has to have contents of $repo/data/
* $build/ObjData/ has to have contents of $RCT2/ObjData/
* $build/../openrct2.exe has to be $repo/openrct2.exe (as of 976ea0d)
Keep in mind you can symlink stuff and that filesystems are case
sensitive!
You can copy more of required data to possibly improve your experience.

Pretty much all of this commit will possibly have to be reverted by the
time OpenRCT2 gains independence.

Remember to build with -DDISABLE_NETWORK=ON -DDISABLE_HTTP_TWITCH=ON
2015-09-23 00:04:40 +02: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
medsouz
e9269cb882 Finish naming scenery.c addresses 2015-08-22 12:03:40 -04:00
medsouz
4207b41855 Name more addresses 2015-08-18 23:53:24 -04:00
medsouz
958f2fb296 Document some scenery memory addresses 2015-08-17 23:05:46 -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