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

141 Commits

Author SHA1 Message Date
Michał Janiszewski
803f334b44 Make sure all of object_type_large_scenery_load gets copied 2016-06-22 21:37:44 +02:00
Michał Janiszewski
6e35eac6f8 Update fields in rct_small_scenery_entry_32bit 2016-06-22 21:37:44 +02:00
Michał Janiszewski
c177cc72e9 fix #3917: no rides show in new ride window
Make sure gTypeToRideEntryIndexMap is properly sized
2016-06-20 10:20:22 +01:00
Michał Janiszewski
402e5a32a0 Integrate path variables used by game 2016-06-19 23:52:20 +02:00
Michał Janiszewski
5a1d802a6a Integrate gTotalNoImages 2016-06-19 23:52:20 +02:00
Michał Janiszewski
cb4b9ba1c3 Integrate gTypeToRideEntryIndexMap 2016-06-19 23:52:20 +02:00
Michał Janiszewski
4d62d79528 Remove debugging messages 2016-06-19 18:12:15 +02:00
Michał Janiszewski
58b4361e8d Pack structs for when loading from files 2016-06-19 18:12:14 +02:00
Michał Janiszewski
30d0e35b17 Rebase fixes 2016-06-19 18:12:14 +02:00
Michał Janiszewski
ea075fb736 Fix VS warning 2016-06-19 18:12:14 +02:00
Michał Janiszewski
580789bcf4 Fixes to object loading for x86-64 2016-06-19 18:12:14 +02:00
Michał Janiszewski
ded905a259 Fixes to object loading 2016-06-19 18:12:14 +02:00
Michał Janiszewski
340997b365 Add new function to object vtable: reset
For use when an object has to be recreated based on already-existing
copy in memory with pointers of native length.
2016-06-19 18:12:14 +02:00
Michał Janiszewski
8a6eec0236 Try loading objects for x86-64 2016-06-19 18:12:14 +02:00
Ted John
d07b9535c2 integrate variables: object entry lists 2016-06-16 11:36:15 +02:00
Ted John
0aba395c39 invalidate images on object load 2016-06-07 22:45:36 +01:00
zsilencer
a963935c11 Decompile scenery_multiple_paint 2016-05-22 08:23:03 -06:00
Marijn van der Werf
44021fdb0a Rename flag 2016-05-18 22:46:24 +02:00
Ted John
8d4e4ed0e9 remove unread RCT2_GLOBALs 2016-05-17 23:39:37 +01:00
Ted John
6df1b9ac98 stop resetting the selected footpath
Fixes #2931 - in multiplayer when client joins
Fixes #3606 - on autosave
2016-05-15 19:08:02 +01:00
Ted John
6f7db1f9b6 rename rct_path_type to rct_footpath_entry 2016-05-15 16:11:34 +01:00
Ted John
d0d2ad7ded fix #3562: loaded objects are not unloaded when loading a new game 2016-05-14 12:54:55 +01:00
janisozaur
7537c03d3f Optimise object_get_length to use entryCache (#3592) 2016-05-14 01:15:17 +01:00
Ted John
0710eb7e87 Merge pull request #3585 from janisozaur/fixes 2016-05-13 18:22:20 +01:00
janisozaur
ca430e1b23 Drop unused variables (#3586) 2016-05-13 18:21:58 +01:00
Michał Janiszewski
16fd91f786 Don't copy the error message to fixed-size buffer 2016-05-13 12:09:06 +02:00
janisozaur
658e877955 Name all the typdef-ed structs (#3581) 2016-05-12 22:57:40 +01:00
janisozaur
68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Michał Janiszewski
65ca8b9cb1 Test for object validity
Apparently it can fail for some:
https://openrct2.org/forums/topic/1175-wont-open-on-mac/#comment-5742
2016-04-22 22:07:42 +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
X7123M3-256
9589a98d40 Added even more spaces 2016-02-27 13:13:15 +00:00
X7123M3-256
93ed052e20 Added more spaces and removed duplicate semicolon 2016-02-27 12:50:03 +00:00
X7123M3-256
cacedda7e4 Added spaces around operators 2016-02-27 12:10:53 +00:00
X7123M3-256
08a0cc9272 Fix indentation 2016-02-26 22:56:24 +00:00
X7123M3-256
ba4681d624 Remove degug printfs 2016-02-26 22:41:55 +00:00
X7123M3-256
0036575413 Fix memory leak in the checksum fixing code 2016-02-26 22:06:30 +00:00
X7123M3-256
7828d3d641 Automatically fix unexportable objects so they can be exported normally 2016-02-26 21:40:19 +00:00
Michał Janiszewski
14bff0c66f Rename rct_ride_type to rct_ride_entry 2016-02-25 13:33:19 +01:00
IntelOrca
b7484db239 refactor clip_drawpixelinfo to not allocate memory 2016-01-14 20:12:44 +00:00
duncanspumpkin
268e2d34ce Merge branch 'develop' into vehicle-update
Conflicts:
 object.c
2016-01-09 16:51:23 +00:00
IntelOrca
0012470504 change last two rct_realloc to realloc 2016-01-08 19:04:38 +00:00
IntelOrca
5e071ed032 change more rct2_malloc / rct_free to malloc / free 2016-01-07 22:10:08 +00:00
IntelOrca
48ad1314a9 refactor object_desc 2016-01-07 19:12:59 +00:00
IntelOrca
40a4bd1fa8 remove old object_paint calls, replace with new 2016-01-07 19:01:19 +00:00
IntelOrca
01c67b6146 refactor object_paint, part 1 2016-01-07 00:34:15 +00:00
IntelOrca
ab38828e03 integrate object list variables:
- gInstalledObjectsCount
- gInstalledObjects
- gNumInstalledRCT2Objects
- gNumInstalledCustomObjects
- gLastLoadedObjectChunkData
2016-01-06 20:41:21 +00:00
Gymnasiast
b89025ae62 Improve object loading 2016-01-06 08:58:56 +01:00
IntelOrca
023ac79494 optimise object_calculate_checksum 2016-01-06 00:59:07 +00:00
Michał Janiszewski
133096cd64 Merge branch 'develop' into vehicle-update 2016-01-05 09:59:53 +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