diff options
| author | Aetias <aetias@outlook.com> | 2024-10-21 20:36:15 +0200 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2024-10-21 20:36:15 +0200 |
| commit | a62cc074e93cdd77605bddcd145a96d3cfa7618d (patch) | |
| tree | 31f0d5bf0872b316643d543957ea2a6d22e632e2 /src/Main | |
| parent | 5c3e3aee99af35884462f518a9bc1fbf65ae92d4 (diff) | |
| parent | f4c5e4862419a14487575bf477118458c0e4a289 (diff) | |
Merge branch 'main' into actor-manager
Diffstat (limited to 'src/Main')
| -rw-r--r-- | src/Main/Actor/ActorType.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/Main/Actor/ActorType.cpp b/src/Main/Actor/ActorType.cpp index 39579811..ec5f564f 100644 --- a/src/Main/Actor/ActorType.cpp +++ b/src/Main/Actor/ActorType.cpp @@ -2,16 +2,12 @@ ActorTypeList sActorTypeList; -// Kill duplicate dtors -KILL(_ZN9ActorTypeC2EjPFP5ActorvEPFivE) -KILL(_ZN9ActorTypeD2Ev) - ARM ActorType::ActorType(ActorTypeId id, ActorCreateFunc create, unk32 (*unk_08)()) { - this->id = id; + this->id = id; this->create = create; this->unk_08 = unk_08; this->unk_0c = 0; - this->next = NULL; + this->next = NULL; this->Register(); sActorTypeList.tail = this; } @@ -41,13 +37,13 @@ ARM void ActorType::Register() { ARM void ActorType::Unregister() { ActorType *actorType; - ActorType **current = &sActorTypeList.head; + ActorType **current = &sActorTypeList.head; ActorType **previous = NULL; for (actorType = sActorTypeList.head; actorType != NULL; actorType = actorType->next) { if (actorType == this) break; previous = current; - current = &actorType->next; + current = &actorType->next; } if (previous != NULL) { |