Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Pierre Kim
OpenRCT2-mod
Commits
ddb557a0
Commit
ddb557a0
authored
7 years ago
by
Michael Steenbeek
Committed by
GitHub
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Fix TD4 vehicle colour import, move track_design to C++
parent
c40b73d5
develop
No related merge requests found
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
OpenRCT2.xcodeproj/project.pbxproj
+6
-6
OpenRCT2.xcodeproj/project.pbxproj
src/openrct2/game.c
+1
-1
src/openrct2/game.c
src/openrct2/interface/window.h
+1
-1
src/openrct2/interface/window.h
src/openrct2/ride/TrackDesign.cpp
+996
-588
src/openrct2/ride/TrackDesign.cpp
src/openrct2/ride/TrackDesign.h
+1
-1
src/openrct2/ride/TrackDesign.h
src/openrct2/ride/TrackDesignRepository.cpp
+1
-1
src/openrct2/ride/TrackDesignRepository.cpp
src/openrct2/ride/track_design_save.c
+1
-1
src/openrct2/ride/track_design_save.c
src/openrct2/world/SmallScenery.cpp
+1
-1
src/openrct2/world/SmallScenery.cpp
with
1008 additions
and
600 deletions
+1008
-600
OpenRCT2.xcodeproj/project.pbxproj
+
6
-
6
View file @
ddb557a0
...
...
@@ -21,6 +21,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
4C4C1E981F58226500560300
/* TrackDesign.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
4C4C1E971F58226500560300
/* TrackDesign.cpp */
;
};
4C8667821EEFDCDF0024AAB8
/* RideGroupManager.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
4C8667801EEFDCDF0024AAB8
/* RideGroupManager.cpp */
;
};
4C8B42701EEB1ABD00F015CA
/* X8DrawingEngine.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
4C8B426E1EEB1ABD00F015CA
/* X8DrawingEngine.cpp */
;
};
4C8B42721EEB1AE400F015CA
/* HardwareDisplayDrawingEngine.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
4C8B42711EEB1AE400F015CA
/* HardwareDisplayDrawingEngine.cpp */
;
};
...
...
@@ -369,7 +370,6 @@
F76C87121EC4E88400FA49E2
/* track.c in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F76C84D21EC4E7CC00FA49E2
/* track.c */
;
};
F76C87141EC4E88400FA49E2
/* track_data.c in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F76C84D41EC4E7CC00FA49E2
/* track_data.c */
;
};
F76C87161EC4E88400FA49E2
/* track_data_old.c in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F76C84D61EC4E7CC00FA49E2
/* track_data_old.c */
;
};
F76C87171EC4E88400FA49E2
/* track_design.c in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F76C84D71EC4E7CC00FA49E2
/* track_design.c */
;
};
F76C87191EC4E88400FA49E2
/* track_design_save.c in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F76C84D91EC4E7CD00FA49E2
/* track_design_save.c */
;
};
F76C871A1EC4E88400FA49E2
/* track_paint.c in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F76C84DA1EC4E7CD00FA49E2
/* track_paint.c */
;
};
F76C871C1EC4E88400FA49E2
/* TrackDesignRepository.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
F76C84DC1EC4E7CD00FA49E2
/* TrackDesignRepository.cpp */
;
};
...
...
@@ -590,6 +590,8 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
4C4C1E971F58226500560300
/* TrackDesign.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
TrackDesign.cpp
;
sourceTree
=
"<group>"
;
};
4C4C1E991F5832AA00560300
/* TrackDesign.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
TrackDesign.h
;
sourceTree
=
"<group>"
;
};
4C8667801EEFDCDF0024AAB8
/* RideGroupManager.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
RideGroupManager.cpp
;
sourceTree
=
"<group>"
;
};
4C8667811EEFDCDF0024AAB8
/* RideGroupManager.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
RideGroupManager.h
;
sourceTree
=
"<group>"
;
};
4C8B426E1EEB1ABD00F015CA
/* X8DrawingEngine.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
X8DrawingEngine.cpp
;
sourceTree
=
"<group>"
;
};
...
...
@@ -1246,8 +1248,6 @@
F76C84D41EC4E7CC00FA49E2
/* track_data.c */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.c
;
path
=
track_data.c
;
sourceTree
=
"<group>"
;
};
F76C84D51EC4E7CC00FA49E2
/* track_data.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
track_data.h
;
sourceTree
=
"<group>"
;
};
F76C84D61EC4E7CC00FA49E2
/* track_data_old.c */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.c
;
path
=
track_data_old.c
;
sourceTree
=
"<group>"
;
};
F76C84D71EC4E7CC00FA49E2
/* track_design.c */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.c
;
path
=
track_design.c
;
sourceTree
=
"<group>"
;
};
F76C84D81EC4E7CC00FA49E2
/* track_design.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
track_design.h
;
sourceTree
=
"<group>"
;
};
F76C84D91EC4E7CD00FA49E2
/* track_design_save.c */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.c
;
path
=
track_design_save.c
;
sourceTree
=
"<group>"
;
};
F76C84DA1EC4E7CD00FA49E2
/* track_paint.c */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.c
;
path
=
track_paint.c
;
sourceTree
=
"<group>"
;
};
F76C84DB1EC4E7CD00FA49E2
/* track_paint.h */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
track_paint.h
;
sourceTree
=
"<group>"
;
};
...
...
@@ -2230,11 +2230,11 @@
F76C84D41EC4E7CC00FA49E2
/* track_data.c */
,
F76C84D51EC4E7CC00FA49E2
/* track_data.h */
,
F76C84D61EC4E7CC00FA49E2
/* track_data_old.c */
,
F76C84D71EC4E7CC00FA49E2
/* track_design.c */
,
F76C84D81EC4E7CC00FA49E2
/* track_design.h */
,
F76C84D91EC4E7CD00FA49E2
/* track_design_save.c */
,
F76C84DA1EC4E7CD00FA49E2
/* track_paint.c */
,
F76C84DB1EC4E7CD00FA49E2
/* track_paint.h */
,
4C4C1E971F58226500560300
/* TrackDesign.cpp */
,
4C4C1E991F5832AA00560300
/* TrackDesign.h */
,
F76C84DC1EC4E7CD00FA49E2
/* TrackDesignRepository.cpp */
,
F76C84DD1EC4E7CD00FA49E2
/* TrackDesignRepository.h */
,
F76C84E41EC4E7CD00FA49E2
/* vehicle.c */
,
...
...
@@ -3029,6 +3029,7 @@
F76C887A1EC5324E00FA49E2
/* AudioMixer.cpp in Sources */
,
F76C887B1EC5324E00FA49E2
/* FileAudioSource.cpp in Sources */
,
C64644FD1F3FA4120026AC2D
/* Land.cpp in Sources */
,
4C4C1E981F58226500560300
/* TrackDesign.cpp in Sources */
,
C666EE6B1F37ACB10061AA04
/* About.cpp in Sources */
,
C666ED771F33DBB20061AA04
/* ShortcutKeys.cpp in Sources */
,
C666EE6C1F37ACB10061AA04
/* Changelog.cpp in Sources */
,
...
...
@@ -3345,7 +3346,6 @@
F76C87141EC4E88400FA49E2
/* track_data.c in Sources */
,
C666EE511F33E3800061AA04
/* TrackPlace.cpp in Sources */
,
F76C87161EC4E88400FA49E2
/* track_data_old.c in Sources */
,
F76C87171EC4E88400FA49E2
/* track_design.c in Sources */
,
F76C87191EC4E88400FA49E2
/* track_design_save.c in Sources */
,
F76C871A1EC4E88400FA49E2
/* track_paint.c in Sources */
,
F76C871C1EC4E88400FA49E2
/* TrackDesignRepository.cpp in Sources */
,
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/game.c
+
1
-
1
View file @
ddb557a0
...
...
@@ -42,7 +42,7 @@
#include "ride/ride.h"
#include "ride/ride_ratings.h"
#include "ride/track.h"
#include "ride/
t
rack
_d
esign.h"
#include "ride/
T
rack
D
esign.h"
#include "ride/vehicle.h"
#include "scenario/scenario.h"
#include "title/TitleScreen.h"
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/interface/window.h
+
1
-
1
View file @
ddb557a0
...
...
@@ -22,7 +22,7 @@
#include "../management/research.h"
#include "../peep/peep.h"
#include "../ride/ride.h"
#include "../ride/
t
rack
_d
esign.h"
#include "../ride/
T
rack
D
esign.h"
#include "../ride/vehicle.h"
#include "../scenario/scenario.h"
#include "../world/park.h"
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/ride/
t
rack
_d
esign.c
→
src/openrct2/ride/
T
rack
D
esign.c
pp
+
996
-
588
View file @
ddb557a0
This diff is collapsed.
Click to expand it.
src/openrct2/ride/
t
rack
_d
esign.h
→
src/openrct2/ride/
T
rack
D
esign.h
+
1
-
1
View file @
ddb557a0
...
...
@@ -213,7 +213,7 @@ void track_design_dispose(rct_track_td6 *td6);
void
track_design_mirror
(
rct_track_td6
*
td6
);
sint32
place_virtual_track
(
rct_track_td6
*
td6
,
uint8
ptdOperation
,
bool
placeScenery
,
uint8
rideIndex
,
sint
32
x
,
sint
32
y
,
sint
32
z
);
sint32
place_virtual_track
(
rct_track_td6
*
td6
,
uint8
ptdOperation
,
bool
placeScenery
,
uint8
rideIndex
,
sint
16
x
,
sint
16
y
,
sint
16
z
);
void
game_command_place_track_design
(
sint32
*
eax
,
sint32
*
ebx
,
sint32
*
ecx
,
sint32
*
edx
,
sint32
*
esi
,
sint32
*
edi
,
sint32
*
ebp
);
void
game_command_place_maze_design
(
sint32
*
eax
,
sint32
*
ebx
,
sint32
*
ecx
,
sint32
*
edx
,
sint32
*
esi
,
sint32
*
edi
,
sint32
*
ebp
);
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/ride/TrackDesignRepository.cpp
+
1
-
1
View file @
ddb557a0
...
...
@@ -33,7 +33,7 @@
extern
"C"
{
#include "
t
rack
_d
esign.h"
#include "
T
rack
D
esign.h"
}
using
namespace
OpenRCT2
;
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/ride/track_design_save.c
+
1
-
1
View file @
ddb557a0
...
...
@@ -27,7 +27,7 @@
#include "ride_data.h"
#include "track.h"
#include "track_data.h"
#include "
t
rack
_d
esign.h"
#include "
T
rack
D
esign.h"
#include "TrackDesignRepository.h"
#define TRACK_MAX_SAVED_MAP_ELEMENTS 1500
...
...
This diff is collapsed.
Click to expand it.
src/openrct2/world/SmallScenery.cpp
+
1
-
1
View file @
ddb557a0
...
...
@@ -24,7 +24,7 @@ extern "C"
#include "map.h"
#include "park.h"
#include "../cheats.h"
#include "../ride/
t
rack
_d
esign.h"
#include "../ride/
T
rack
D
esign.h"
}
static
money32
SmallSceneryRemove
(
sint16
x
,
sint16
y
,
uint8
baseHeight
,
uint8
quadrant
,
uint8
sceneryType
,
uint8
flags
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help