Game-Decompilation/OdysseyDecomp
1
0
Fork 0
mirror of https://github.com/MonsterDruide1/OdysseyDecomp.git synced 2024-11-26 23:00:25 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Library/Obj: Refactor AllDeadWatcher (#171)
Some checks failed
Compile and verify functions / compile_verify (push) Has been cancelled
Details
Copy headers to separate repo / copy_headers (push) Has been cancelled
Details
lint / clang-format (push) Has been cancelled
Details
lint / custom-lint (push) Has been cancelled
Details
progress / publish_progress (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Fuzzy2319 2024-10-05 11:20:06 +02:00 committed by GitHub
parent 077aa4c654
commit afd3be64a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/odyssey_functions.csv
View File

@ -60359,8 +60359,8 @@ Address,Quality,Size,Name
0x0000007100961ee8,O,000004,_ZN2al14AllDeadWatcher4killEv
0x0000007100961eec,O,000100,_ZN2al14AllDeadWatcher8exeWatchEv
0x0000007100961f50,O,000076,_ZN2al14AllDeadWatcher7exeWaitEv
0x0000007100961f9c,U,000100,
0x0000007100962000,U,000080,
0x0000007100961f9c,O,000100,_ZNK12_GLOBAL__N_122AllDeadWatcherNrvWatch7executeEPN2al11NerveKeeperE
0x0000007100962000,O,000080,_ZNK12_GLOBAL__N_121AllDeadWatcherNrvWait7executeEPN2al11NerveKeeperE
0x0000007100962050,U,000316,_ZN2al10BgmPlayObjC2EPKcb
0x000000710096218c,U,000320,_ZN2al10BgmPlayObjC1EPKcb
0x00000071009622cc,U,001116,_ZN2al10BgmPlayObj4initERKNS_13ActorInitInfoE

Can't render this file because it is too large.

10
lib/al/Library/Obj/AllDeadWatcher.cpp
View File

@ -3,10 +3,20 @@
#include "Library/LiveActor/ActorDrawFunction.h"
#include "Library/LiveActor/ActorInitFunction.h"
#include "Library/LiveActor/LiveActorUtil.h"
#include "Library/Nerve/NerveSetupUtil.h"
#include "Library/Nerve/NerveUtil.h"
#include "Library/Placement/PlacementFunction.h"
#include "Library/Stage/StageSwitchKeeper.h"
namespace {
using namespace al;
NERVE_IMPL(AllDeadWatcher, Watch)
NERVE_IMPL(AllDeadWatcher, Wait)
NERVES_MAKE_STRUCT(AllDeadWatcher, Watch, Wait)
} // namespace
namespace al {
AllDeadWatcher::AllDeadWatcher(const char* name) : LiveActor(name) {}

8
lib/al/Library/Obj/AllDeadWatcher.h
View File

@ -1,7 +1,6 @@
#pragma once
#include "Library/LiveActor/LiveActor.h"
#include "Library/Nerve/NerveSetupUtil.h"
namespace al {
class AllDeadWatcher : public LiveActor {
@ -23,11 +22,4 @@ private:
};
static_assert(sizeof(AllDeadWatcher) == 0x120);
namespace {
NERVE_IMPL(AllDeadWatcher, Watch);
NERVE_IMPL(AllDeadWatcher, Wait);
NERVES_MAKE_STRUCT(AllDeadWatcher, Watch, Wait);
} // namespace
} // namespace al