Revert "Library/Movement: Implement RailMoveMovement (MonsterDruide…

…1#180)" This reverts commit 36fb2fa.
LynxDev2 · Nov 19, 2024 · 5c60d90 · 5c60d90
1 parent 36fb2fa
commit 5c60d90
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 197 deletions.
diff --git a/data/odyssey_functions.csv b/data/odyssey_functions.csv
@@ -59944,11 +59944,11 @@ Address,Quality,Size,Name
 0x0000007100956228,U,000092,_ZN2al30calcPassCheckPointRecoverTransEPKNS_17RaceJudgeDirectorEPKNS_9LiveActorE
 0x0000007100956284,U,000092,_ZN2al29calcPassCheckPointRecoverPoseEPKNS_17RaceJudgeDirectorEPKNS_9LiveActorE
 0x00000071009562e0,U,000016,_ZN2al13getRacerActorEPKNS_17RaceJudgeDirectorEi
-0x00000071009562f0,O,000164,_ZN2al16RailMoveMovementC1EPNS_9LiveActorERKNS_13ActorInitInfoE
-0x0000007100956394,O,000136,_ZN2al16RailMoveMovement7exeMoveEv
-0x000000710095641c,O,000208,_ZN2al25tryCreateRailMoveMovementEPNS_9LiveActorERKNS_13ActorInitInfoE
-0x00000071009564ec,O,000036,_ZN2al16RailMoveMovementD0Ev
-0x0000007100956510,O,000136,_ZNK12_GLOBAL__N_123RailMoveMovementNrvMove7executeEPN2al11NerveKeeperE
+0x00000071009562f0,U,000164,_ZN2al16RailMoveMovementC1EPNS_9LiveActorERKNS_13ActorInitInfoE
+0x0000007100956394,U,000136,_ZN2al16RailMoveMovement7exeMoveEv
+0x000000710095641c,U,000208,_ZN2al25tryCreateRailMoveMovementEPNS_9LiveActorERKNS_13ActorInitInfoE
+0x00000071009564ec,U,000036,_ZN2al16RailMoveMovementD0Ev
+0x0000007100956510,U,000136,
 0x0000007100956598,U,000048,_ZN2al16RumbleCalculatorC2Efffj
 0x00000071009565c8,U,000020,_ZN2al16RumbleCalculator8setParamEfffj
 0x00000071009565dc,U,000024,_ZN2al16RumbleCalculator5startEj

diff --git a/lib/al/Library/Movement/RailMoveMovement.cpp b/lib/al/Library/Movement/RailMoveMovement.cpp
diff --git a/lib/al/Library/Movement/RailMoveMovement.h b/lib/al/Library/Movement/RailMoveMovement.h
diff --git a/lib/al/Library/Nerve/NerveStateBase.cpp b/lib/al/Library/Nerve/NerveStateBase.cpp
@@ -28,4 +28,5 @@ void NerveStateBase::control() {}
 
 ActorStateBase::ActorStateBase(const char* name, LiveActor* actor)
     : NerveStateBase(name), mActor(actor) {}
+
 }  // namespace al
diff --git a/lib/al/Library/Nerve/NerveStateBase.h b/lib/al/Library/Nerve/NerveStateBase.h
@@ -34,9 +34,9 @@ class ActorStateBase : public NerveStateBase {
 template <class T>
 class HostStateBase : public NerveStateBase {
 public:
-    HostStateBase(const char* name, T* host) : NerveStateBase(name), mHost(host) {}
+    HostStateBase(const char* name, T* host) : NerveStateBase(name), mHost(host){};
 
-    T* getHost() const { return mHost; }
+    T* getHost() { return mHost; }
 
 private:
     T* mHost;

diff --git a/lib/al/Library/Rail/RailUtil.h b/lib/al/Library/Rail/RailUtil.h
@@ -6,7 +6,6 @@ namespace al {
 class IUseRail;
 class LiveActor;
 
-void setSyncRailToNearestPos(LiveActor* actor);
 void setRailPosToStart(IUseRail* railHolder);
 void moveSyncRail(LiveActor* actor, f32 speed);
 void moveSyncRailLoop(LiveActor* actor, f32 speed);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,5 @@ void NerveStateBase::control() {}

		ActorStateBase::ActorStateBase(const char* name, LiveActor* actor)
		: NerveStateBase(name), mActor(actor) {}

		} // namespace al