mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Re-arrange structure of scripting

This commit is contained in:
ZehMatt 2021-08-09 19:34:23 +03:00
parent e547dd96db
commit adf5829cd6
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
19 changed files with 258 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
OpenRCT2.xcodeproj/project.pbxproj
View File

@ -344,23 +344,11 @@
93DFD02E24521BA0001FCBAF /* FileWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD02C24521B9F001FCBAF /* FileWatcher.h */; };
93DFD02F24521BA0001FCBAF /* FileWatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93DFD02D24521BA0001FCBAF /* FileWatcher.cpp */; };
93DFD04424521C1A001FCBAF /* Plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03124521C19001FCBAF /* Plugin.h */; };
93DFD04524521C1A001FCBAF /* ScObject.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03224521C19001FCBAF /* ScObject.hpp */; };
93DFD04624521C1A001FCBAF /* HookEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03324521C19001FCBAF /* HookEngine.h */; };
93DFD04724521C1A001FCBAF /* ScNetwork.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03424521C19001FCBAF /* ScNetwork.hpp */; };
93DFD04824521C1A001FCBAF /* HookEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93DFD03524521C19001FCBAF /* HookEngine.cpp */; };
93DFD04924521C1A001FCBAF /* ScTile.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03624521C19001FCBAF /* ScTile.hpp */; };
93DFD04A24521C1A001FCBAF /* ScConfiguration.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03724521C19001FCBAF /* ScConfiguration.hpp */; };
93DFD04B24521C1A001FCBAF /* ScriptEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93DFD03824521C19001FCBAF /* ScriptEngine.cpp */; };
93DFD04C24521C1A001FCBAF /* ScDisposable.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03924521C19001FCBAF /* ScDisposable.hpp */; };
93DFD04D24521C1A001FCBAF /* ScEntity.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03A24521C19001FCBAF /* ScEntity.hpp */; };
93DFD04E24521C1A001FCBAF /* Duktape.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03B24521C19001FCBAF /* Duktape.hpp */; };
93DFD04F24521C1A001FCBAF /* ScConsole.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03C24521C19001FCBAF /* ScConsole.hpp */; };
93DFD05024521C1A001FCBAF /* ScPark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03D24521C19001FCBAF /* ScPark.hpp */; };
93DFD05124521C1A001FCBAF /* ScContext.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD03E24521C19001FCBAF /* ScContext.hpp */; };
93DFD05224521C1A001FCBAF /* Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93DFD03F24521C19001FCBAF /* Plugin.cpp */; };
93DFD05324521C1A001FCBAF /* ScRide.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD04024521C19001FCBAF /* ScRide.hpp */; };
93DFD05424521C1A001FCBAF /* ScDate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD04124521C19001FCBAF /* ScDate.hpp */; };
93DFD05524521C1A001FCBAF /* ScMap.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD04224521C19001FCBAF /* ScMap.hpp */; };
93DFD05624521C1A001FCBAF /* ScriptEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 93DFD04324521C19001FCBAF /* ScriptEngine.h */; };
93F6004C213DD7DD00EEB83E /* TerrainSurfaceObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F60049213DD7DC00EEB83E /* TerrainSurfaceObject.cpp */; };
93F6004D213DD7DD00EEB83E /* TerrainEdgeObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93F6004A213DD7DC00EEB83E /* TerrainEdgeObject.cpp */; };
@ -768,6 +756,22 @@
0746674FA0794ABF86E406A1 /* Litter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9D3DD6CD73F5421880280D9D /* Litter.cpp */; };
B9B6F97CE24E4A559C7BBA0A /* RideConstruction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BCCA2EF0F5A40D5B83A83AC /* RideConstruction.cpp */; };
317B766A750D4365B22A1682 /* EnumMap.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BA2317BF6FB54E328DEB7055 /* EnumMap.hpp */; };
8C801369C7E44292A5348DFB /* ScEntity.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6DF61461D47C40CF92019B24 /* ScEntity.hpp */; };
BCCE3EDC711F4F0587F1C359 /* ScCheats.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3F68EA974AF941BCAD28A04F /* ScCheats.hpp */; };
F396A397541149D6ACA290D2 /* ScConfiguration.hpp in Headers */ = {isa = PBXBuildFile; fileRef = FD736DB2EE1C4C888977BCAF /* ScConfiguration.hpp */; };
2EEDD899BAF94706ACED5F6D /* ScConsole.hpp in Headers */ = {isa = PBXBuildFile; fileRef = E4B39FC3EB9C4EFDA82F42D7 /* ScConsole.hpp */; };
74E3377F2FC04316959F1AED /* ScContext.hpp in Headers */ = {isa = PBXBuildFile; fileRef = DAF78631DD8D45E3B3C2FDD1 /* ScContext.hpp */; };
A10C0EE3C2614B53AFB6ED35 /* ScDisposable.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 8865B46C60FD434CAD50A2F4 /* ScDisposable.hpp */; };
05F6EF4AAFEC4BA4A454046B /* ScNetwork.hpp in Headers */ = {isa = PBXBuildFile; fileRef = BDEB01D4A8144819A82E3CB4 /* ScNetwork.hpp */; };
AC4C9184C93A4113A6BEEC60 /* ScSocket.hpp in Headers */ = {isa = PBXBuildFile; fileRef = D4DD54E62DAE4E4889E26DF6 /* ScSocket.hpp */; };
A962C2EF5FA6429C92318441 /* ScObject.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 24F9DF02868247738D05CC40 /* ScObject.hpp */; };
E09450B2440E465CBCE62DEB /* ScRide.hpp in Headers */ = {isa = PBXBuildFile; fileRef = AD97B712FDF7454CADC7A328 /* ScRide.hpp */; };
A2EC8BBCB8AD49ECB1C22F9D /* ScClimate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 0C2031084A4E462EB6E5BDE4 /* ScClimate.hpp */; };
2AE59B9E2E4D496286970915 /* ScDate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 613ADB50EF0F4D73A66E4538 /* ScDate.hpp */; };
7930E9462549403181C5D164 /* ScMap.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 74CDED6B7EF041458032681A /* ScMap.hpp */; };
43D56A4FA1734F25995F4968 /* ScPark.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 9AB8D336AB654D0280549A89 /* ScPark.hpp */; };
0AFABA9549854247A5C61D52 /* ScScenario.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A9F55F2291284217BA0E4E51 /* ScScenario.hpp */; };
F8A3BFA6806D448B86F1FF6A /* ScTile.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 22D7DD798F054A068273739B /* ScTile.hpp */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -1462,23 +1466,11 @@
93DFD02C24521B9F001FCBAF /* FileWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileWatcher.h; sourceTree = "<group>"; };
93DFD02D24521BA0001FCBAF /* FileWatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileWatcher.cpp; sourceTree = "<group>"; };
93DFD03124521C19001FCBAF /* Plugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Plugin.h; sourceTree = "<group>"; };
93DFD03224521C19001FCBAF /* ScObject.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScObject.hpp; sourceTree = "<group>"; };
93DFD03324521C19001FCBAF /* HookEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HookEngine.h; sourceTree = "<group>"; };
93DFD03424521C19001FCBAF /* ScNetwork.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScNetwork.hpp; sourceTree = "<group>"; };
93DFD03524521C19001FCBAF /* HookEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HookEngine.cpp; sourceTree = "<group>"; };
93DFD03624521C19001FCBAF /* ScTile.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScTile.hpp; sourceTree = "<group>"; };
93DFD03724521C19001FCBAF /* ScConfiguration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScConfiguration.hpp; sourceTree = "<group>"; };
93DFD03824521C19001FCBAF /* ScriptEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptEngine.cpp; sourceTree = "<group>"; };
93DFD03924521C19001FCBAF /* ScDisposable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScDisposable.hpp; sourceTree = "<group>"; };
93DFD03A24521C19001FCBAF /* ScEntity.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScEntity.hpp; sourceTree = "<group>"; };
93DFD03B24521C19001FCBAF /* Duktape.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Duktape.hpp; sourceTree = "<group>"; };
93DFD03C24521C19001FCBAF /* ScConsole.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScConsole.hpp; sourceTree = "<group>"; };
93DFD03D24521C19001FCBAF /* ScPark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScPark.hpp; sourceTree = "<group>"; };
93DFD03E24521C19001FCBAF /* ScContext.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScContext.hpp; sourceTree = "<group>"; };
93DFD03F24521C19001FCBAF /* Plugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Plugin.cpp; sourceTree = "<group>"; };
93DFD04024521C19001FCBAF /* ScRide.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScRide.hpp; sourceTree = "<group>"; };
93DFD04124521C19001FCBAF /* ScDate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScDate.hpp; sourceTree = "<group>"; };
93DFD04224521C19001FCBAF /* ScMap.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ScMap.hpp; sourceTree = "<group>"; };
93DFD04324521C19001FCBAF /* ScriptEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptEngine.h; sourceTree = "<group>"; };
93F60048213DD7DC00EEB83E /* TerrainSurfaceObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TerrainSurfaceObject.h; sourceTree = "<group>"; };
93F60049213DD7DC00EEB83E /* TerrainSurfaceObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TerrainSurfaceObject.cpp; sourceTree = "<group>"; };
@ -1838,6 +1830,22 @@
9D3DD6CD73F5421880280D9D /* Litter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Litter.cpp; path = src/openrct2/world/Litter.cpp; sourceTree = SOURCE_ROOT; };
6BCCA2EF0F5A40D5B83A83AC /* RideConstruction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RideConstruction.cpp; path = src/openrct2/ride/RideConstruction.cpp; sourceTree = SOURCE_ROOT; };
BA2317BF6FB54E328DEB7055 /* EnumMap.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = EnumMap.hpp; path = src/openrct2/core/EnumMap.hpp; sourceTree = SOURCE_ROOT; };
6DF61461D47C40CF92019B24 /* ScEntity.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScEntity.hpp; path = src/openrct2/scripting/bindings/entity/ScEntity.hpp; sourceTree = SOURCE_ROOT; };
3F68EA974AF941BCAD28A04F /* ScCheats.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScCheats.hpp; path = src/openrct2/scripting/bindings/game/ScCheats.hpp; sourceTree = SOURCE_ROOT; };
FD736DB2EE1C4C888977BCAF /* ScConfiguration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScConfiguration.hpp; path = src/openrct2/scripting/bindings/game/ScConfiguration.hpp; sourceTree = SOURCE_ROOT; };
E4B39FC3EB9C4EFDA82F42D7 /* ScConsole.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScConsole.hpp; path = src/openrct2/scripting/bindings/game/ScConsole.hpp; sourceTree = SOURCE_ROOT; };
DAF78631DD8D45E3B3C2FDD1 /* ScContext.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScContext.hpp; path = src/openrct2/scripting/bindings/game/ScContext.hpp; sourceTree = SOURCE_ROOT; };
8865B46C60FD434CAD50A2F4 /* ScDisposable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScDisposable.hpp; path = src/openrct2/scripting/bindings/game/ScDisposable.hpp; sourceTree = SOURCE_ROOT; };
BDEB01D4A8144819A82E3CB4 /* ScNetwork.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScNetwork.hpp; path = src/openrct2/scripting/bindings/network/ScNetwork.hpp; sourceTree = SOURCE_ROOT; };
D4DD54E62DAE4E4889E26DF6 /* ScSocket.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScSocket.hpp; path = src/openrct2/scripting/bindings/network/ScSocket.hpp; sourceTree = SOURCE_ROOT; };
24F9DF02868247738D05CC40 /* ScObject.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScObject.hpp; path = src/openrct2/scripting/bindings/object/ScObject.hpp; sourceTree = SOURCE_ROOT; };
AD97B712FDF7454CADC7A328 /* ScRide.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScRide.hpp; path = src/openrct2/scripting/bindings/ride/ScRide.hpp; sourceTree = SOURCE_ROOT; };
0C2031084A4E462EB6E5BDE4 /* ScClimate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScClimate.hpp; path = src/openrct2/scripting/bindings/world/ScClimate.hpp; sourceTree = SOURCE_ROOT; };
613ADB50EF0F4D73A66E4538 /* ScDate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScDate.hpp; path = src/openrct2/scripting/bindings/world/ScDate.hpp; sourceTree = SOURCE_ROOT; };
74CDED6B7EF041458032681A /* ScMap.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScMap.hpp; path = src/openrct2/scripting/bindings/world/ScMap.hpp; sourceTree = SOURCE_ROOT; };
9AB8D336AB654D0280549A89 /* ScPark.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScPark.hpp; path = src/openrct2/scripting/bindings/world/ScPark.hpp; sourceTree = SOURCE_ROOT; };
A9F55F2291284217BA0E4E51 /* ScScenario.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScScenario.hpp; path = src/openrct2/scripting/bindings/world/ScScenario.hpp; sourceTree = SOURCE_ROOT; };
22D7DD798F054A068273739B /* ScTile.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ScTile.hpp; path = src/openrct2/scripting/bindings/world/ScTile.hpp; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -1963,6 +1971,7 @@
93DFD03024521C19001FCBAF /* scripting */ = {
isa = PBXGroup;
children = (
59B0CA75A27A4C5EB9EF6CA7 /* bindings */,
93DFD03B24521C19001FCBAF /* Duktape.hpp */,
93DFD03524521C19001FCBAF /* HookEngine.cpp */,
93DFD03324521C19001FCBAF /* HookEngine.h */,
@ -3333,6 +3342,77 @@
path = input;
sourceTree = "<group>";
};
59B0CA75A27A4C5EB9EF6CA7 /* bindings */ = {
isa = PBXGroup;
children = (
EDFE9D20A43646C7981E7254 /* entity */,
C1C271EB7D2B4A3AA23CE0E6 /* game */,
9192A7EACCF44110BF1B89BC /* network */,
CCCD0912DE2D444FA8DA7222 /* object */,
0B69C59376EB45E58BA6ADF5 /* ride */,
281760CC5B1249CBA8E771D7 /* world */,
);
name = bindings;
sourceTree = "<group>";
};
EDFE9D20A43646C7981E7254 /* entity */ = {
isa = PBXGroup;
children = (
6DF61461D47C40CF92019B24 /* ScEntity.hpp */,
);
name = entity;
sourceTree = "<group>";
};
C1C271EB7D2B4A3AA23CE0E6 /* game */ = {
isa = PBXGroup;
children = (
3F68EA974AF941BCAD28A04F /* ScCheats.hpp */,
FD736DB2EE1C4C888977BCAF /* ScConfiguration.hpp */,
E4B39FC3EB9C4EFDA82F42D7 /* ScConsole.hpp */,
DAF78631DD8D45E3B3C2FDD1 /* ScContext.hpp */,
8865B46C60FD434CAD50A2F4 /* ScDisposable.hpp */,
);
name = game;
sourceTree = "<group>";
};
9192A7EACCF44110BF1B89BC /* network */ = {
isa = PBXGroup;
children = (
BDEB01D4A8144819A82E3CB4 /* ScNetwork.hpp */,
D4DD54E62DAE4E4889E26DF6 /* ScSocket.hpp */,
);
name = network;
sourceTree = "<group>";
};
CCCD0912DE2D444FA8DA7222 /* object */ = {
isa = PBXGroup;
children = (
24F9DF02868247738D05CC40 /* ScObject.hpp */,
);
name = object;
sourceTree = "<group>";
};
0B69C59376EB45E58BA6ADF5 /* ride */ = {
isa = PBXGroup;
children = (
AD97B712FDF7454CADC7A328 /* ScRide.hpp */,
);
name = ride;
sourceTree = "<group>";
};
281760CC5B1249CBA8E771D7 /* world */ = {
isa = PBXGroup;
children = (
0C2031084A4E462EB6E5BDE4 /* ScClimate.hpp */,
613ADB50EF0F4D73A66E4538 /* ScDate.hpp */,
74CDED6B7EF041458032681A /* ScMap.hpp */,
9AB8D336AB654D0280549A89 /* ScPark.hpp */,
A9F55F2291284217BA0E4E51 /* ScScenario.hpp */,
22D7DD798F054A068273739B /* ScTile.hpp */,
);
name = world;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@ -3357,7 +3437,6 @@
66A10F8D257F1E1800DD651A /* GuestSetFlagsAction.h in Headers */,
66A10FA7257F1E1800DD651A /* PeepPickupAction.h in Headers */,
939A359C20C12FC800630B3F /* Paint.Sprite.h in Headers */,
93DFD05524521C1A001FCBAF /* ScMap.hpp in Headers */,
9308DA04209908090079EE96 /* TileElement.h in Headers */,
C67B28152002D67A00109C93 /* Widget.h in Headers */,
66A10F99257F1E1800DD651A /* LargeScenerySetColourAction.h in Headers */,
@ -3370,7 +3449,6 @@
C6352B851F477022006CCEE3 /* DataSerialiserTraits.h in Headers */,
66A10F50257F1E1700DD651A /* ParkEntranceRemoveAction.h in Headers */,
66A10F4D257F1E1700DD651A /* StaffSetNameAction.h in Headers */,
93DFD05124521C1A001FCBAF /* ScContext.hpp in Headers */,
66A10FD6257F1E3000DD651A /* WallRemoveAction.h in Headers */,
939A359F20C12FDE00630B3F /* Paint.Surface.h in Headers */,
66A10F7B257F1E1800DD651A /* MazeSetTrackAction.h in Headers */,
@ -3378,14 +3456,12 @@
66A10F53257F1E1700DD651A /* LandLowerAction.h in Headers */,
66A10F5E257F1E1700DD651A /* LargeSceneryRemoveAction.h in Headers */,
66A10F5D257F1E1700DD651A /* RideSetStatusAction.h in Headers */,
93DFD05024521C1A001FCBAF /* ScPark.hpp in Headers */,
93B4DC1625487CDF008D63FF /* Formatting.h in Headers */,
66A10F86257F1E1800DD651A /* LoadOrQuitAction.h in Headers */,
93DFD02E24521BA0001FCBAF /* FileWatcher.h in Headers */,
2ADE2F28224418B2002598AF /* DataSerialiserTag.h in Headers */,
66A10F74257F1E1800DD651A /* RideEntranceExitRemoveAction.h in Headers */,
66A10F9A257F1E1800DD651A /* StaffFireAction.h in Headers */,
93DFD04C24521C1A001FCBAF /* ScDisposable.hpp in Headers */,
66A10FAC257F1E1800DD651A /* RideSetSettingAction.h in Headers */,
2ADE2F2E224418E7002598AF /* ConversionTables.h in Headers */,
933F2CBB20935668001B33FD /* LocalisationService.h in Headers */,
@ -3399,7 +3475,6 @@
66A10F77257F1E1800DD651A /* StaffSetOrdersAction.h in Headers */,
2ADE2F2C224418B2002598AF /* FileIndex.hpp in Headers */,
66A10FAF257F1E1800DD651A /* RideSetNameAction.h in Headers */,
93DFD04A24521C1A001FCBAF /* ScConfiguration.hpp in Headers */,
93CBA4CC20A7504500867D56 /* ImageImporter.h in Headers */,
66A10F62257F1E1700DD651A /* SurfaceSetStyleAction.h in Headers */,
66A10EC1257F1DF800DD651A /* FootpathAdditionRemoveAction.h in Headers */,
@ -3408,11 +3483,9 @@
66A10F96257F1E1800DD651A /* SignSetStyleAction.h in Headers */,
2ADE2F29224418B2002598AF /* Numerics.hpp in Headers */,
66A10FD5257F1E3000DD651A /* WaterRaiseAction.h in Headers */,
93DFD04924521C1A001FCBAF /* ScTile.hpp in Headers */,
936F412B24CE030F00E07BCF /* NetworkBase.h in Headers */,
66A10EC2257F1DF800DD651A /* FootpathRemoveAction.h in Headers */,
66A10EA3257F1DE100DD651A /* BalloonPressAction.h in Headers */,
93DFD04524521C1A001FCBAF /* ScObject.hpp in Headers */,
2ADE2F382244198B002598AF /* SpriteBase.h in Headers */,
66A10EC8257F1DF800DD651A /* BannerPlaceAction.h in Headers */,
C62D838B1FD36D6F008C04F1 /* EditorObjectSelectionSession.h in Headers */,
@ -3422,17 +3495,13 @@
66A10FD7257F1E3000DD651A /* WaterLowerAction.h in Headers */,
939A35A220C12FFD00630B3F /* InteractiveConsole.h in Headers */,
93CBA4C320A7502E00867D56 /* Imaging.h in Headers */,
93DFD04D24521C1A001FCBAF /* ScEntity.hpp in Headers */,
66A10F4E257F1E1700DD651A /* PauseToggleAction.h in Headers */,
93DFD04E24521C1A001FCBAF /* Duktape.hpp in Headers */,
66A10FA2257F1E1800DD651A /* LargeSceneryPlaceAction.h in Headers */,
2ADE2F3622441960002598AF /* RideTypes.h in Headers */,
66A10F68257F1E1800DD651A /* NetworkModifyGroupAction.h in Headers */,
93DFD05324521C1A001FCBAF /* ScRide.hpp in Headers */,
66A10F88257F1E1800DD651A /* SignSetNameAction.h in Headers */,
93AE2389252F948A00CD03C3 /* Formatter.h in Headers */,
93DFD05424521C1A001FCBAF /* ScDate.hpp in Headers */,
93DFD04F24521C1A001FCBAF /* ScConsole.hpp in Headers */,
66A10F91257F1E1800DD651A /* StaffHireNewAction.h in Headers */,
9308DA05209908090079EE96 /* Surface.h in Headers */,
66A10F9F257F1E1800DD651A /* LandBuyRightsAction.h in Headers */,
@ -3455,7 +3524,6 @@
66A10F84257F1E1800DD651A /* StaffSetPatrolAreaAction.h in Headers */,
66A10F56257F1E1700DD651A /* SmallSceneryRemoveAction.h in Headers */,
66A10F5C257F1E1700DD651A /* SetParkEntranceFeeAction.h in Headers */,
93DFD04724521C1A001FCBAF /* ScNetwork.hpp in Headers */,
66A10F8F257F1E1800DD651A /* StaffSetCostumeAction.h in Headers */,
66A10ED5257F1DF800DD651A /* BannerSetStyleAction.h in Headers */,
66A10F97257F1E1800DD651A /* SetCheatAction.h in Headers */,
@ -3472,6 +3540,22 @@
66A10F8B257F1E1800DD651A /* LandSmoothAction.h in Headers */,
F42186C5840D4196981ADD16 /* EntityTweener.h in Headers */,
317B766A750D4365B22A1682 /* EnumMap.hpp in Headers */,
8C801369C7E44292A5348DFB /* ScEntity.hpp in Headers */,
BCCE3EDC711F4F0587F1C359 /* ScCheats.hpp in Headers */,
F396A397541149D6ACA290D2 /* ScConfiguration.hpp in Headers */,
2EEDD899BAF94706ACED5F6D /* ScConsole.hpp in Headers */,
74E3377F2FC04316959F1AED /* ScContext.hpp in Headers */,
A10C0EE3C2614B53AFB6ED35 /* ScDisposable.hpp in Headers */,
05F6EF4AAFEC4BA4A454046B /* ScNetwork.hpp in Headers */,
AC4C9184C93A4113A6BEEC60 /* ScSocket.hpp in Headers */,
A962C2EF5FA6429C92318441 /* ScObject.hpp in Headers */,
E09450B2440E465CBCE62DEB /* ScRide.hpp in Headers */,
A2EC8BBCB8AD49ECB1C22F9D /* ScClimate.hpp in Headers */,
2AE59B9E2E4D496286970915 /* ScDate.hpp in Headers */,
7930E9462549403181C5D164 /* ScMap.hpp in Headers */,
43D56A4FA1734F25995F4968 /* ScPark.hpp in Headers */,
0AFABA9549854247A5C61D52 /* ScScenario.hpp in Headers */,
F8A3BFA6806D448B86F1FF6A /* ScTile.hpp in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};

32
src/openrct2/libopenrct2.vcxproj
View File

@ -408,23 +408,23 @@
<ClInclude Include="scripting\Duktape.hpp" />
<ClInclude Include="scripting\HookEngine.h" />
<ClInclude Include="scripting\Plugin.h" />
<ClInclude Include="scripting\ScCheats.hpp" />
<ClInclude Include="scripting\ScClimate.hpp" />
<ClInclude Include="scripting\ScConfiguration.hpp" />
<ClInclude Include="scripting\ScConsole.hpp" />
<ClInclude Include="scripting\ScContext.hpp" />
<ClInclude Include="scripting\ScDate.hpp" />
<ClInclude Include="scripting\ScDisposable.hpp" />
<ClInclude Include="scripting\ScEntity.hpp" />
<ClInclude Include="scripting\ScMap.hpp" />
<ClInclude Include="scripting\ScNetwork.hpp" />
<ClInclude Include="scripting\ScObject.hpp" />
<ClInclude Include="scripting\ScPark.hpp" />
<ClInclude Include="scripting\ScRide.hpp" />
<ClInclude Include="scripting\bindings\game\ScCheats.hpp" />
<ClInclude Include="scripting\bindings\world\ScClimate.hpp" />
<ClInclude Include="scripting\bindings\game\ScConfiguration.hpp" />
<ClInclude Include="scripting\bindings\game\ScConsole.hpp" />
<ClInclude Include="scripting\bindings\game\ScContext.hpp" />
<ClInclude Include="scripting\bindings\world\ScDate.hpp" />
<ClInclude Include="scripting\bindings\game\ScDisposable.hpp" />
<ClInclude Include="scripting\bindings\entity\ScEntity.hpp" />
<ClInclude Include="scripting\bindings\world\ScMap.hpp" />
<ClInclude Include="scripting\bindings\network\ScNetwork.hpp" />
<ClInclude Include="scripting\bindings\object\ScObject.hpp" />
<ClInclude Include="scripting\bindings\world\ScPark.hpp" />
<ClInclude Include="scripting\bindings\ride\ScRide.hpp" />
<ClInclude Include="scripting\ScriptEngine.h" />
<ClInclude Include="scripting\ScScenario.hpp" />
<ClInclude Include="scripting\ScSocket.hpp" />
<ClInclude Include="scripting\ScTile.hpp" />
<ClInclude Include="scripting\bindings\world\ScScenario.hpp" />
<ClInclude Include="scripting\bindings\network\ScSocket.hpp" />
<ClInclude Include="scripting\bindings\world\ScTile.hpp" />
<ClInclude Include="sprites.h" />
<ClInclude Include="title\TitleScreen.h" />
<ClInclude Include="title\TitleSequence.h" />

30
src/openrct2/scripting/ScriptEngine.cpp
View File

@ -24,21 +24,21 @@
# include "../interface/InteractiveConsole.h"
# include "../platform/Platform2.h"
# include "Duktape.hpp"
# include "ScCheats.hpp"
# include "ScClimate.hpp"
# include "ScConsole.hpp"
# include "ScContext.hpp"
# include "ScDate.hpp"
# include "ScDisposable.hpp"
# include "ScEntity.hpp"
# include "ScMap.hpp"
# include "ScNetwork.hpp"
# include "ScObject.hpp"
# include "ScPark.hpp"
# include "ScRide.hpp"
# include "ScScenario.hpp"
# include "ScSocket.hpp"
# include "ScTile.hpp"
# include "bindings/entity/ScEntity.hpp"
# include "bindings/game/ScCheats.hpp"
# include "bindings/game/ScConsole.hpp"
# include "bindings/game/ScContext.hpp"
# include "bindings/game/ScDisposable.hpp"
# include "bindings/network/ScNetwork.hpp"
# include "bindings/network/ScSocket.hpp"
# include "bindings/object/ScObject.hpp"
# include "bindings/ride/ScRide.hpp"
# include "bindings/world/ScClimate.hpp"
# include "bindings/world/ScDate.hpp"
# include "bindings/world/ScMap.hpp"
# include "bindings/world/ScPark.hpp"
# include "bindings/world/ScScenario.hpp"
# include "bindings/world/ScTile.hpp"
# include <iostream>
# include <stdexcept>

2
src/openrct2/scripting/ScEntity.hpp → src/openrct2/scripting/bindings/entity/ScEntity.hpp
View File

@ -15,12 +15,12 @@
# include "../common.h"
# include "../peep/Peep.h"
# include "../peep/Staff.h"
# include "../ride/ScRide.hpp"
# include "../util/Util.h"
# include "../world/EntityList.h"
# include "../world/Litter.h"
# include "../world/Sprite.h"
# include "Duktape.hpp"
# include "ScRide.hpp"
# include "ScriptEngine.h"
# include <algorithm>

4
src/openrct2/scripting/ScCheats.hpp → src/openrct2/scripting/bindings/game/ScCheats.hpp
View File

@ -11,9 +11,9 @@
#ifdef ENABLE_SCRIPTING
# include "../Cheats.h"
# include "../../../Cheats.h"
# include "../../ScriptEngine.h"
# include "Duktape.hpp"
# include "ScriptEngine.h"
namespace OpenRCT2::Scripting
{

10
src/openrct2/scripting/ScConfiguration.hpp → src/openrct2/scripting/bindings/game/ScConfiguration.hpp
View File

@ -11,11 +11,11 @@
#ifdef ENABLE_SCRIPTING
# include "../Context.h"
# include "../config/Config.h"
# include "../localisation/LocalisationService.h"
# include "Duktape.hpp"
# include "ScriptEngine.h"
# include "../../../Context.h"
# include "../../../config/Config.h"
# include "../../../localisation/LocalisationService.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
namespace OpenRCT2::Scripting
{

6
src/openrct2/scripting/ScConsole.hpp → src/openrct2/scripting/bindings/game/ScConsole.hpp
View File

@ -11,9 +11,9 @@
#ifdef ENABLE_SCRIPTING
# include "../interface/InteractiveConsole.h"
# include "Duktape.hpp"
# include "ScriptEngine.h"
# include "../../../interface/InteractiveConsole.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
namespace OpenRCT2::Scripting
{

22
src/openrct2/scripting/ScContext.hpp → src/openrct2/scripting/bindings/game/ScContext.hpp
View File

@ -11,17 +11,17 @@
#ifdef ENABLE_SCRIPTING
# include "../actions/GameAction.h"
# include "../interface/Screenshot.h"
# include "../localisation/Formatting.h"
# include "../object/ObjectManager.h"
# include "../scenario/Scenario.h"
# include "Duktape.hpp"
# include "HookEngine.h"
# include "ScConfiguration.hpp"
# include "ScDisposable.hpp"
# include "ScObject.hpp"
# include "ScriptEngine.h"
# include "../../../actions/GameAction.h"
# include "../../../interface/Screenshot.h"
# include "../../../localisation/Formatting.h"
# include "../../../object/ObjectManager.h"
# include "../../../scenario/Scenario.h"
# include "../../Duktape.hpp"
# include "../../HookEngine.h"
# include "../../ScriptEngine.h"
# include "../game/ScConfiguration.hpp"
# include "../game/ScDisposable.hpp"
# include "../object/ScObject.hpp"
# include <cstdio>
# include <memory>

2
src/openrct2/scripting/ScDisposable.hpp → src/openrct2/scripting/bindings/game/ScDisposable.hpp
View File

@ -11,7 +11,7 @@
#ifdef ENABLE_SCRIPTING
# include "Duktape.hpp"
# include "../../Duktape.hpp"
# include <functional>

16
src/openrct2/scripting/ScNetwork.hpp → src/openrct2/scripting/bindings/network/ScNetwork.hpp
View File

@ -11,14 +11,14 @@
#ifdef ENABLE_SCRIPTING
# include "../Context.h"
# include "../actions/NetworkModifyGroupAction.h"
# include "../actions/PlayerKickAction.h"
# include "../actions/PlayerSetGroupAction.h"
# include "../network/NetworkAction.h"
# include "../network/network.h"
# include "Duktape.hpp"
# include "ScSocket.hpp"
# include "../../../Context.h"
# include "../../../actions/NetworkModifyGroupAction.h"
# include "../../../actions/PlayerKickAction.h"
# include "../../../actions/PlayerSetGroupAction.h"
# include "../../../network/NetworkAction.h"
# include "../../../network/network.h"
# include "../../Duktape.hpp"
# include "../network/ScSocket.hpp"
namespace OpenRCT2::Scripting
{

10
src/openrct2/scripting/ScSocket.hpp → src/openrct2/scripting/bindings/network/ScSocket.hpp
View File

@ -12,11 +12,11 @@
#ifdef ENABLE_SCRIPTING
# ifndef DISABLE_NETWORK
# include "../Context.h"
# include "../config/Config.h"
# include "../network/Socket.h"
# include "Duktape.hpp"
# include "ScriptEngine.h"
# include "../../../Context.h"
# include "../../../config/Config.h"
# include "../../../network/Socket.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
# include <algorithm>
# include <vector>

14
src/openrct2/scripting/ScObject.hpp → src/openrct2/scripting/bindings/object/ScObject.hpp
View File

@ -11,13 +11,13 @@
#ifdef ENABLE_SCRIPTING
# include "../Context.h"
# include "../common.h"
# include "../object/ObjectManager.h"
# include "../object/RideObject.h"
# include "../object/SmallSceneryObject.h"
# include "Duktape.hpp"
# include "ScriptEngine.h"
# include "../../../Context.h"
# include "../../../common.h"
# include "../../../object/ObjectManager.h"
# include "../../../object/RideObject.h"
# include "../../../object/SmallSceneryObject.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
# include <optional>

12
src/openrct2/scripting/ScRide.hpp → src/openrct2/scripting/bindings/ride/ScRide.hpp
View File

@ -11,12 +11,12 @@
#ifdef ENABLE_SCRIPTING
# include "../Context.h"
# include "../common.h"
# include "../ride/Ride.h"
# include "Duktape.hpp"
# include "ScObject.hpp"
# include "ScriptEngine.h"
# include "../../../Context.h"
# include "../../../common.h"
# include "../../../ride/Ride.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
# include "../object/ScObject.hpp"
namespace OpenRCT2::Scripting
{

12
src/openrct2/scripting/ScClimate.hpp → src/openrct2/scripting/bindings/world/ScClimate.hpp
View File

@ -11,12 +11,12 @@
#ifdef ENABLE_SCRIPTING
# include "../Context.h"
# include "../common.h"
# include "../core/String.hpp"
# include "../world/Climate.h"
# include "Duktape.hpp"
# include "ScriptEngine.h"
# include "../../../Context.h"
# include "../../../common.h"
# include "../../../core/String.hpp"
# include "../../../world/Climate.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
namespace OpenRCT2::Scripting
{

16
src/openrct2/scripting/ScDate.hpp → src/openrct2/scripting/bindings/world/ScDate.hpp
View File

@ -11,14 +11,14 @@
#ifdef ENABLE_SCRIPTING
# include "../Context.h"
# include "../Date.h"
# include "../Game.h"
# include "../GameState.h"
# include "../common.h"
# include "../localisation/Date.h"
# include "Duktape.hpp"
# include "ScriptEngine.h"
# include "../../../Context.h"
# include "../../../Date.h"
# include "../../../Game.h"
# include "../../../GameState.h"
# include "../../../common.h"
# include "../../../localisation/Date.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
namespace OpenRCT2::Scripting
{

30
src/openrct2/scripting/ScMap.hpp → src/openrct2/scripting/bindings/world/ScMap.hpp
View File

@ -11,21 +11,21 @@
#ifdef ENABLE_SCRIPTING
# include "../common.h"
# include "../ride/Ride.h"
# include "../ride/TrainManager.h"
# include "../world/Balloon.h"
# include "../world/Duck.h"
# include "../world/EntityList.h"
# include "../world/Fountain.h"
# include "../world/Litter.h"
# include "../world/Map.h"
# include "../world/MoneyEffect.h"
# include "../world/Particle.h"
# include "Duktape.hpp"
# include "ScEntity.hpp"
# include "ScRide.hpp"
# include "ScTile.hpp"
# include "../../../common.h"
# include "../../../ride/Ride.h"
# include "../../../ride/TrainManager.h"
# include "../../../world/Balloon.h"
# include "../../../world/Duck.h"
# include "../../../world/EntityList.h"
# include "../../../world/Fountain.h"
# include "../../../world/Litter.h"
# include "../../../world/Map.h"
# include "../../../world/MoneyEffect.h"
# include "../../../world/Particle.h"
# include "../../Duktape.hpp"
# include "../entity/ScEntity.hpp"
# include "../ride/ScRide.hpp"
# include "../world/ScTile.hpp"
namespace OpenRCT2::Scripting
{

22
src/openrct2/scripting/ScPark.hpp → src/openrct2/scripting/bindings/world/ScPark.hpp
View File

@ -11,17 +11,17 @@
#ifdef ENABLE_SCRIPTING
# include "../Context.h"
# include "../GameState.h"
# include "../common.h"
# include "../core/String.hpp"
# include "../management/Finance.h"
# include "../management/NewsItem.h"
# include "../peep/Peep.h"
# include "../windows/Intent.h"
# include "../world/Park.h"
# include "Duktape.hpp"
# include "ScriptEngine.h"
# include "../../../Context.h"
# include "../../../GameState.h"
# include "../../../common.h"
# include "../../../core/String.hpp"
# include "../../../management/Finance.h"
# include "../../../management/NewsItem.h"
# include "../../../peep/Peep.h"
# include "../../../windows/Intent.h"
# include "../../../world/Park.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
# include <algorithm>

16
src/openrct2/scripting/ScScenario.hpp → src/openrct2/scripting/bindings/world/ScScenario.hpp
View File

@ -11,14 +11,14 @@
#ifdef ENABLE_SCRIPTING
# include "../Context.h"
# include "../GameState.h"
# include "../common.h"
# include "../core/String.hpp"
# include "../scenario/Scenario.h"
# include "../world/Park.h"
# include "Duktape.hpp"
# include "ScriptEngine.h"
# include "../../../Context.h"
# include "../../../GameState.h"
# include "../../../common.h"
# include "../../../core/String.hpp"
# include "../../../scenario/Scenario.h"
# include "../../../world/Park.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
# include <algorithm>

20
src/openrct2/scripting/ScTile.hpp → src/openrct2/scripting/bindings/world/ScTile.hpp
View File

@ -11,16 +11,16 @@
#ifdef ENABLE_SCRIPTING
# include "../Context.h"
# include "../common.h"
# include "../core/Guard.hpp"
# include "../ride/Track.h"
# include "../world/Footpath.h"
# include "../world/Scenery.h"
# include "../world/Sprite.h"
# include "../world/Surface.h"
# include "Duktape.hpp"
# include "ScriptEngine.h"
# include "../../../Context.h"
# include "../../../common.h"
# include "../../../core/Guard.hpp"
# include "../../../ride/Track.h"
# include "../../../world/Footpath.h"
# include "../../../world/Scenery.h"
# include "../../../world/Sprite.h"
# include "../../../world/Surface.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
# include <cstdio>
# include <cstring>