Skip to content

Commit eaeefdb

Browse files
ReimousTHReimousTH
committed
More API
PostureCommon(Recreation), 100.0% *Testing *Cleanup 1 *Attempt to fix Shadow KDV Glider Bug *Vehicle Enter on Spawn Fixed (Adjusted m_radius for Zock a little, depends on fps) *Deque class (not tested) *Entity & EntityRef & EntityWrapper (all of them fixed) *Config::DisableEdgeGrabLeftover -> Edge Oscallation experimental fix *BodyHavok Experimental Delta Fix *Silver Psycho Fix(Removed due BodyHavok Fix) *Aqa Mercury API *Cleanup 2 closes issue #96 closes issue #33 *New Code Config::AlwaysResetSpringState *classes have been updated : Object2, CommonObject, *Fixed SoX::AI::StateMachine, new class SoX::AI::State,Player::State::CommonSprintTemplate closes issue #26 *New Codes : AllowSpinDashJump, DisableMachStateLockInput(Blue Gem), AlwaysBlueGem(allow to using blue for states like spindash, kick ...) RTTI API Graphics API Particle API
1 parent 3e2ad7c commit eaeefdb

File tree

243 files changed

+11994
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+11994
-383
lines changed

‎MarathonRecomp/api/Marathon.h‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "Sonicteam/AlertWindowTask.h"
2121
#include "Sonicteam/AppMarathon.h"
2222
#include "Sonicteam/AudioEngineXenon.h"
23+
#include "Sonicteam/BasicIScriptParamsDesc.h"
2324
#include "Sonicteam/ButtonWindowTask.h"
2425
#include "Sonicteam/CObjBalloonIconDrawable.h"
2526
#include "Sonicteam/Camera/CameraMode.h"
@@ -36,7 +37,14 @@
3637
#include "Sonicteam/Enemy/EnemyShot.h"
3738
#include "Sonicteam/Enemy/EnemyShotNormal.h"
3839
#include "Sonicteam/Enemy/EnemyShotPoint.h"
40+
#include "Sonicteam/EnemyPsiCommon.h"
3941
#include "Sonicteam/Fixture.h"
42+
#include "Sonicteam/GE1PE/EffectBank.h"
43+
#include "Sonicteam/GE1PE/EmitterListener.h"
44+
#include "Sonicteam/GE1PE/Manager.h"
45+
#include "Sonicteam/GE1PE/ParticleEngine.h"
46+
#include "Sonicteam/GE1PE/Plugin.h"
47+
#include "Sonicteam/GE1PE/RefCountObject.h"
4048
#include "Sonicteam/Game.h"
4149
#include "Sonicteam/GameImp.h"
4250
#include "Sonicteam/GameMode.h"
@@ -52,12 +60,15 @@
5260
#include "Sonicteam/HUDPopupScreen.h"
5361
#include "Sonicteam/HUDRaderMap.h"
5462
#include "Sonicteam/HUDStageTitle.h"
63+
#include "Sonicteam/Heap.h"
5564
#include "Sonicteam/HintWindowTask.h"
5665
#include "Sonicteam/HudTextParts.h"
5766
#include "Sonicteam/ImageFilter.h"
67+
#include "Sonicteam/KeyframedPath.h"
5868
#include "Sonicteam/MainDisplayTask.h"
5969
#include "Sonicteam/MainMenuTask.h"
6070
#include "Sonicteam/MainMode.h"
71+
#include "Sonicteam/MercuryDrawable.h"
6172
#include "Sonicteam/Message/MsgCameramanChangeMode.h"
6273
#include "Sonicteam/Message/MsgHUDButtonWindowChangeButtons.h"
6374
#include "Sonicteam/Message/MsgHUDMainMenuChangeState.h"
@@ -76,28 +87,63 @@
7687
#include "Sonicteam/MyCueAdx.h"
7788
#include "Sonicteam/MyCueAttenuate.h"
7889
#include "Sonicteam/MyGraphicsDevice.h"
90+
#include "Sonicteam/MyMaterialCommon.h"
91+
#include "Sonicteam/MyModel.h"
92+
#include "Sonicteam/MyModelStrategy.h"
93+
#include "Sonicteam/MyModelStrategyNN.h"
94+
#include "Sonicteam/MyPE/CManageParticle.h"
95+
#include "Sonicteam/MyPE/EffectBankLoad.h"
96+
#include "Sonicteam/MyPE/EffectBankLoadManager.h"
97+
#include "Sonicteam/MyPE/MyEffectBank.h"
98+
#include "Sonicteam/MyPE/MyEmitterListener.h"
7999
#include "Sonicteam/MyPhantom.h"
80100
#include "Sonicteam/MyRenderProcess.h"
81101
#include "Sonicteam/MyTexture.h"
82102
#include "Sonicteam/MyTransforms.h"
83103
#include "Sonicteam/NamedActor.h"
84104
#include "Sonicteam/NamedTask.h"
85105
#include "Sonicteam/NoSyncThread.h"
106+
#include "Sonicteam/ObjectAqaMercurySmall.h"
107+
#include "Sonicteam/ObjectPsi.h"
108+
#include "Sonicteam/ObjectPsiContext.h"
86109
#include "Sonicteam/ObjectVehicle.h"
87110
#include "Sonicteam/ObjectVehicleBike.h"
111+
#include "Sonicteam/Package.h"
112+
#include "Sonicteam/PackageBinary.h"
113+
#include "Sonicteam/Particles/Particle.h"
114+
#include "Sonicteam/Particles/ParticleContainer.h"
115+
#include "Sonicteam/Particles/ParticleContainerMgr.h"
116+
#include "Sonicteam/Particles/ParticleManager.h"
117+
#include "Sonicteam/Particles/ParticleManagerUnit.h"
118+
#include "Sonicteam/Particles/ParticleRef.h"
119+
#include "Sonicteam/PathAnimation/Animation.h"
120+
#include "Sonicteam/PathAnimation/Controller.h"
121+
#include "Sonicteam/PathAnimation/Entity.h"
88122
#include "Sonicteam/PauseAdapter.h"
89123
#include "Sonicteam/PauseTask.h"
124+
#include "Sonicteam/Player/AllListener.h"
125+
#include "Sonicteam/Player/Effect/ParticleJoint.h"
126+
#include "Sonicteam/Player/Effect/ParticleLuaTable.h"
127+
#include "Sonicteam/Player/Gravity.h"
128+
#include "Sonicteam/Player/GroundListener.h"
90129
#include "Sonicteam/Player/GroundRayListener.h"
130+
#include "Sonicteam/Player/HairSimulator.h"
91131
#include "Sonicteam/Player/ICollisionListener.h"
92132
#include "Sonicteam/Player/ICollisionListenerTemplate.h"
93133
#include "Sonicteam/Player/IDynamicLink.h"
94134
#include "Sonicteam/Player/IEventerListener.h"
95135
#include "Sonicteam/Player/IExportExternalFlag.h"
96136
#include "Sonicteam/Player/IExportPostureRequestFlag.h"
137+
#include "Sonicteam/Player/IExportVehicleFlag.h"
97138
#include "Sonicteam/Player/IExportWeaponRequestFlag.h"
98139
#include "Sonicteam/Player/IFlagCommunicator.h"
140+
#include "Sonicteam/Player/IForce.h"
99141
#include "Sonicteam/Player/IGauge.h"
142+
#include "Sonicteam/Player/IImportAnimation.h"
143+
#include "Sonicteam/Player/ILoad.h"
144+
#include "Sonicteam/Player/IModel.h"
100145
#include "Sonicteam/Player/INotification.h"
146+
#include "Sonicteam/Player/IPath.h"
101147
#include "Sonicteam/Player/IPlugIn.h"
102148
#include "Sonicteam/Player/IPostureControl.h"
103149
#include "Sonicteam/Player/IPosturePlugIn.h"
@@ -113,14 +159,28 @@
113159
#include "Sonicteam/Player/Input/IListener.h"
114160
#include "Sonicteam/Player/Input/ListenerNormal.h"
115161
#include "Sonicteam/Player/Input/TimedAction.h"
162+
#include "Sonicteam/Player/Item.h"
163+
#include "Sonicteam/Player/Load.h"
164+
#include "Sonicteam/Player/ModelSonic.h"
165+
#include "Sonicteam/Player/ModelStandard.h"
166+
#include "Sonicteam/Player/MovableBody.h"
116167
#include "Sonicteam/Player/Object.h"
168+
#include "Sonicteam/Player/PackageModel/IAnimation.h"
169+
#include "Sonicteam/Player/PackageModel/Object.h"
170+
#include "Sonicteam/Player/PhysicsBodyList.h"
117171
#include "Sonicteam/Player/PostureControl.h"
172+
#include "Sonicteam/Player/PostureEdge.h"
173+
#include "Sonicteam/Player/PostureVehicle.h"
174+
#include "Sonicteam/Player/RealGroundRayListener.h"
118175
#include "Sonicteam/Player/RootFrame.h"
176+
#include "Sonicteam/Player/RotationGravityAxis.h"
119177
#include "Sonicteam/Player/Score.h"
120178
#include "Sonicteam/Player/SonicGauge.h"
121179
#include "Sonicteam/Player/State/CommonContext.h"
122180
#include "Sonicteam/Player/State/CommonFall.h"
181+
#include "Sonicteam/Player/State/CommonGrind.h"
123182
#include "Sonicteam/Player/State/CommonObject.h"
183+
#include "Sonicteam/Player/State/CommonSpringTemplate.h"
124184
#include "Sonicteam/Player/State/ContextSpeedAndJump.h"
125185
#include "Sonicteam/Player/State/ICommonContext.h"
126186
#include "Sonicteam/Player/State/ICommonContextIF.h"
@@ -130,9 +190,12 @@
130190
#include "Sonicteam/Player/State/Object2.h"
131191
#include "Sonicteam/Player/State/SonicContext.h"
132192
#include "Sonicteam/Player/State/SonicObject.h"
193+
#include "Sonicteam/Player/State/SonicState.h"
133194
#include "Sonicteam/Player/State/TailsContext.h"
134195
#include "Sonicteam/Player/State/TailsFlight.h"
135196
#include "Sonicteam/Player/Unit/ITestCase.h"
197+
#include "Sonicteam/Player/WallListener.h"
198+
#include "Sonicteam/Player/WallRayListener.h"
136199
#include "Sonicteam/Player/Weapon/SonicWeapons.h"
137200
#include "Sonicteam/Player/Zock.h"
138201
#include "Sonicteam/PropFixture.h"
@@ -184,11 +247,16 @@
184247
#include "Sonicteam/RenderAction/SetViewport.h"
185248
#include "Sonicteam/RenderAction/SetZMode.h"
186249
#include "Sonicteam/RenderPostprocess.h"
250+
#include "Sonicteam/RenderTargetContainer.h"
251+
#include "Sonicteam/SFXAgent.h"
187252
#include "Sonicteam/SaveDataTask.h"
188253
#include "Sonicteam/SaveDataTaskXENON.h"
189254
#include "Sonicteam/SelectWindowTask.h"
255+
#include "Sonicteam/ShotPsiCommon.h"
256+
#include "Sonicteam/SoX/AI/State.h"
190257
#include "Sonicteam/SoX/AI/StateMachine.h"
191258
#include "Sonicteam/SoX/ApplicationXenon.h"
259+
#include "Sonicteam/SoX/Array.h"
192260
#include "Sonicteam/SoX/Audio/Cue.h"
193261
#include "Sonicteam/SoX/Audio/IAudioEngine.h"
194262
#include "Sonicteam/SoX/Audio/Player.h"
@@ -199,47 +267,122 @@
199267
#include "Sonicteam/SoX/Engine/DocMode.h"
200268
#include "Sonicteam/SoX/Engine/RenderProcess.h"
201269
#include "Sonicteam/SoX/Engine/Task.h"
270+
#include "Sonicteam/SoX/Graphics/AnimationCore/Core.h"
271+
#include "Sonicteam/SoX/Graphics/AnimationCore/CoreTemplate.h"
272+
#include "Sonicteam/SoX/Graphics/AnimationCore/SubAnimation.h"
273+
#include "Sonicteam/SoX/Graphics/AnimationUserDataListener.h"
202274
#include "Sonicteam/SoX/Graphics/Device.h"
203275
#include "Sonicteam/SoX/Graphics/Frame.h"
204276
#include "Sonicteam/SoX/Graphics/FrameGP.h"
205277
#include "Sonicteam/SoX/Graphics/FrameObserver.h"
278+
#include "Sonicteam/SoX/Graphics/IAnimation.h"
279+
#include "Sonicteam/SoX/Graphics/IAnimationBlend.h"
280+
#include "Sonicteam/SoX/Graphics/IndexBuffer.h"
281+
#include "Sonicteam/SoX/Graphics/InstanceModel.h"
282+
#include "Sonicteam/SoX/Graphics/InstanceModelCommon.h"
283+
#include "Sonicteam/SoX/Graphics/LocalAnimationUserDataListener.h"
284+
#include "Sonicteam/SoX/Graphics/MaterialAnimation.h"
285+
#include "Sonicteam/SoX/Graphics/MaterialAnimationCommon.h"
286+
#include "Sonicteam/SoX/Graphics/MaterialAnimationInstance.h"
287+
#include "Sonicteam/SoX/Graphics/MaterialAnimationInstanceCommon.h"
288+
#include "Sonicteam/SoX/Graphics/MaterialAnimationObject.h"
289+
#include "Sonicteam/SoX/Graphics/MaterialCommon.h"
290+
#include "Sonicteam/SoX/Graphics/Model.h"
291+
#include "Sonicteam/SoX/Graphics/ModelCommon.h"
292+
#include "Sonicteam/SoX/Graphics/ModelMgr.h"
293+
#include "Sonicteam/SoX/Graphics/Motion.h"
294+
#include "Sonicteam/SoX/Graphics/MotionHierarchy.h"
295+
#include "Sonicteam/SoX/Graphics/Node.h"
296+
#include "Sonicteam/SoX/Graphics/SamplerCommon.h"
297+
#include "Sonicteam/SoX/Graphics/Shader.h"
298+
#include "Sonicteam/SoX/Graphics/ShaderFXL.h"
299+
#include "Sonicteam/SoX/Graphics/ShaderMgr.h"
300+
#include "Sonicteam/SoX/Graphics/ShaderPassFXL.h"
301+
#include "Sonicteam/SoX/Graphics/Surface.h"
302+
#include "Sonicteam/SoX/Graphics/SyncronizeShaderPass.h"
206303
#include "Sonicteam/SoX/Graphics/Technique.h"
207304
#include "Sonicteam/SoX/Graphics/TechniqueFXL.h"
305+
#include "Sonicteam/SoX/Graphics/Texture.h"
208306
#include "Sonicteam/SoX/Graphics/Transforms.h"
209307
#include "Sonicteam/SoX/Graphics/Vertex.h"
308+
#include "Sonicteam/SoX/Graphics/VertexBuffer.h"
210309
#include "Sonicteam/SoX/Graphics/Xenon/DeviceXenon.h"
310+
#include "Sonicteam/SoX/Graphics/Xenon/IndexBufferXenon.h"
211311
#include "Sonicteam/SoX/Graphics/Xenon/TextureXenon.h"
312+
#include "Sonicteam/SoX/Graphics/Xenon/VertexBufferXenon.h"
212313
#include "Sonicteam/SoX/IResource.h"
213314
#include "Sonicteam/SoX/IResource2.h"
214315
#include "Sonicteam/SoX/IResourceMgr.h"
316+
#include "Sonicteam/SoX/Input/Listener.h"
215317
#include "Sonicteam/SoX/Input/Manager.h"
216318
#include "Sonicteam/SoX/LinkNode.h"
319+
#include "Sonicteam/SoX/Math/Math.h"
217320
#include "Sonicteam/SoX/Math/Matrix.h"
218321
#include "Sonicteam/SoX/Math/Quaternion.h"
219322
#include "Sonicteam/SoX/Math/Vector.h"
323+
#include "Sonicteam/SoX/Math/__vector.h"
220324
#include "Sonicteam/SoX/Message.h"
221325
#include "Sonicteam/SoX/MessageReceiver.h"
222326
#include "Sonicteam/SoX/Object.h"
327+
#include "Sonicteam/SoX/Physics/Body.h"
223328
#include "Sonicteam/SoX/Physics/Entity.h"
329+
#include "Sonicteam/SoX/Physics/EntityRef.h"
224330
#include "Sonicteam/SoX/Physics/Havok/EntityHavok.h"
225331
#include "Sonicteam/SoX/Physics/Havok/EntityHavokImp.h"
226332
#include "Sonicteam/SoX/Physics/Havok/PhantomHavok.h"
333+
#include "Sonicteam/SoX/Physics/Havok/RayCastHavok.h"
334+
#include "Sonicteam/SoX/Physics/Havok/ShapeCastHavok.h"
227335
#include "Sonicteam/SoX/Physics/Havok/WorldHavok.h"
228336
#include "Sonicteam/SoX/Physics/IntersectEvent.h"
229337
#include "Sonicteam/SoX/Physics/IntersectListener.h"
230338
#include "Sonicteam/SoX/Physics/Phantom.h"
231339
#include "Sonicteam/SoX/Physics/PhantomListener.h"
340+
#include "Sonicteam/SoX/Physics/RayCast.h"
232341
#include "Sonicteam/SoX/Physics/Shape.h"
342+
#include "Sonicteam/SoX/Physics/ShapeCast.h"
233343
#include "Sonicteam/SoX/Physics/ShapeCastEvent.h"
234344
#include "Sonicteam/SoX/Physics/ShapeCastListener.h"
235345
#include "Sonicteam/SoX/Physics/World.h"
236346
#include "Sonicteam/SoX/RefCountObject.h"
237347
#include "Sonicteam/SoX/RefSharedPointer.h"
348+
#include "Sonicteam/SoX/ResourceManager.h"
238349
#include "Sonicteam/SoX/Scenery/Camera.h"
239350
#include "Sonicteam/SoX/Scenery/CameraEventCallback.h"
240351
#include "Sonicteam/SoX/Scenery/CameraImp.h"
352+
#include "Sonicteam/SoX/Scenery/Clump.h"
241353
#include "Sonicteam/SoX/Scenery/Drawable.h"
242354
#include "Sonicteam/SoX/Thread.h"
355+
#include "Sonicteam/Spanverse/AckAdminTag.h"
356+
#include "Sonicteam/Spanverse/AckAdminTrunkTag.h"
357+
#include "Sonicteam/Spanverse/AckDataInst.h"
358+
#include "Sonicteam/Spanverse/AckManager.h"
359+
#include "Sonicteam/Spanverse/AckMomStorage.h"
360+
#include "Sonicteam/Spanverse/AckResource.h"
361+
#include "Sonicteam/Spanverse/AckResourceMgr.h"
362+
#include "Sonicteam/Spanverse/AckTrunkList.h"
363+
#include "Sonicteam/Spanverse/AcroartsPostLoad.h"
364+
#include "Sonicteam/Spanverse/Env.h"
365+
#include "Sonicteam/Spanverse/EnvInfo.h"
366+
#include "Sonicteam/Spanverse/SpangleCamera.h"
367+
#include "Sonicteam/Spanverse/SpangleCellSprite.h"
368+
#include "Sonicteam/Spanverse/SpangleLight.h"
369+
#include "Sonicteam/Spanverse/SpangleObject.h"
370+
#include "Sonicteam/Spanverse/SpangleParticle.h"
371+
#include "Sonicteam/Spanverse/SpanglePrimitive.h"
372+
#include "Sonicteam/Spanverse/SpangleScreen.h"
373+
#include "Sonicteam/Spanverse/SpkBase.h"
374+
#include "Sonicteam/Spanverse/SpkEnv.h"
375+
#include "Sonicteam/Spanverse/SpkEssenceBase.h"
376+
#include "Sonicteam/Spanverse/SpkEssenceServer.h"
377+
#include "Sonicteam/Spanverse/SpkSpangleBase.h"
378+
#include "Sonicteam/Spanverse/SpkSpangleObject.h"
379+
#include "Sonicteam/Spanverse/SpkSpanglePrimitive.h"
380+
#include "Sonicteam/Spanverse/SpkSpangleServer.h"
381+
#include "Sonicteam/Spanverse/TrunkList.h"
382+
#include "Sonicteam/Spanverse/_ackBase.h"
383+
#include "Sonicteam/Spanverse/_ackMomBase.h"
384+
#include "Sonicteam/SpanverseHeap.h"
385+
#include "Sonicteam/SpkManageTask.h"
243386
#include "Sonicteam/StdImageFilters/BurnoutBlurFilter.h"
244387
#include "Sonicteam/StdImageFilters/SingleTechniqueFilter.h"
245388
#include "Sonicteam/System/CreateStatic.h"
@@ -263,22 +406,32 @@
263406
#include "hk330/hkArray.h"
264407
#include "hk330/hkReferencedObject.h"
265408
#include "hk330/hkpBroadPhaseHandle.h"
409+
#include "hk330/hkpBvShape.h"
266410
#include "hk330/hkpCdBody.h"
267411
#include "hk330/hkpCollidable.h"
268412
#include "hk330/hkpCollidableCollidableFilter.h"
269413
#include "hk330/hkpCollisionFilter.h"
270414
#include "hk330/hkpEntity.h"
271415
#include "hk330/hkpLinkedCollidable.h"
416+
#include "hk330/hkpMotion.h"
272417
#include "hk330/hkpPhantom.h"
273418
#include "hk330/hkpProperty.h"
274419
#include "hk330/hkpRayCollidableFilter.h"
275420
#include "hk330/hkpRayShapeCollectionFilter.h"
276421
#include "hk330/hkpRigidBody.h"
277422
#include "hk330/hkpShape.h"
278423
#include "hk330/hkpShapeCollectionFilter.h"
424+
#include "hk330/hkpShapeContainer.h"
425+
#include "hk330/hkpShapeSphere.h"
426+
#include "hk330/hkpSingleShapeContainer.h"
279427
#include "hk330/hkpTypedBroadPhaseHandle.h"
280428
#include "hk330/hkpWorld.h"
281429
#include "hk330/hkpWorldObject.h"
430+
#include "stdx/RTTI.h"
431+
#include "stdx/deque.h"
432+
#include "stdx/list.h"
433+
#include "stdx/map.h"
282434
#include "stdx/string.h"
435+
#include "stdx/type_info.h"
283436
#include "stdx/vector.h"
284437
#include "stdx/wstring.h"

‎MarathonRecomp/api/Marathon.inl‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#include <cpu/guest_stack_var.h>
4+
#include <cpu/guest_heap_var.h>
45
#include <kernel/function.h>
56

67
constexpr float RAD2DEGf = 57.2958f;
@@ -24,6 +25,9 @@ constexpr double DEG2RAD = 0.01745329238474369;
2425
#define MARATHON_VIRTUAL_FUNCTION(returnType, virtualIndex, ...) \
2526
GuestToHostFunction<returnType>(*(be<uint32_t>*)(g_memory.Translate(*(be<uint32_t>*)(this) + (4 * virtualIndex))), __VA_ARGS__)
2627

28+
#define MARATHON_CALL_VIRTUAL_FUNCTION(base, returnType, func, ...) \
29+
GuestToHostFunction<returnType>((Vftable*)(static_cast<base*>(this)->m_pVftable.get())->*func, ##__VA_ARGS__)
30+
2731
struct marathon_null_ctor {};
2832

2933
inline std::vector<std::string_view> ParseTextVariables(const char* pVariables)
@@ -138,3 +142,13 @@ inline void printU16(const uint16_t* str, bool endianSwap = false)
138142

139143
printf("\n");
140144
}
145+
146+
struct MARATHON_NULL_CTOR {};
147+
148+
struct MARATHON_STD_MAP_CONST_CHAR_COMPARE
149+
{
150+
bool operator()(xpointer<const char> lhs, xpointer<const char> rhs) const
151+
{
152+
return std::strcmp(lhs.get(), rhs.get()) < 0;
153+
}
154+
};

‎MarathonRecomp/api/Sonicteam/ActorManager.h‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ namespace Sonicteam
88
class ActorManager
99
{
1010
public:
11-
be<uint32_t> m_aActorIDs[0xFFFF];
12-
xpointer<Actor> m_aActors[0xFFFF];
13-
be<uint32_t> m_LastActorID;
14-
be<uint32_t> m_LastActorIndex;
15-
MARATHON_INSERT_PADDING(4);
16-
};
11+
be<uint32_t> m_ActorID[0xFFFF];
12+
xpointer<Actor> m_Actor[0xFFFF];
13+
be<uint32_t> m_LastActorID;
14+
be<uint32_t> m_LastActorIndex;
1715

18-
MARATHON_ASSERT_OFFSETOF(ActorManager, m_aActorIDs, 0x00);
19-
MARATHON_ASSERT_OFFSETOF(ActorManager, m_aActors, 0x3FFFC);
20-
MARATHON_ASSERT_OFFSETOF(ActorManager, m_LastActorID, 0x7FFF8);
21-
MARATHON_ASSERT_OFFSETOF(ActorManager, m_LastActorIndex, 0x7FFFC);
22-
MARATHON_ASSERT_SIZEOF(ActorManager, 0x80004);
16+
Sonicteam::Actor* FindActor(uint32_t ActorID);
17+
};
2318
}
19+
20+
#include "ActorManager.inl"

0 commit comments

Comments
 (0)