Skip to content

Commit

Permalink
ksys/act: Add LinkTag
Browse files Browse the repository at this point in the history
  • Loading branch information
MonsterDruide1 committed Aug 5, 2021
1 parent 40530f0 commit 1d3cc5a
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 1 deletion.
2 changes: 1 addition & 1 deletion data/uking_functions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -73599,7 +73599,7 @@ Address,Quality,Size,Name
0x0000007100d375e4,U,000076,LazyTraverseList::dtor
0x0000007100d37630,U,000132,LazyTraverseList::updateFlags
0x0000007100d376b4,U,000216,
0x0000007100d3778c,U,000204,LinkTag::construct
0x0000007100d3778c,O,000204,_ZN4ksys3act7LinkTag9constructERKNS0_8BaseProc9CreateArgEPN4sead4HeapE
0x0000007100d37858,U,000280,LinkTag::calc
0x0000007100d37970,U,000064,LinkTag::dtor
0x0000007100d379b0,U,000072,LinkTag::dtorDelete
Expand Down
2 changes: 2 additions & 0 deletions src/KingSystem/ActorSystem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ target_sources(uking PRIVATE
actInstParamPack.cpp
actInstParamPack.h
actLifeRecoveryInfo.h
actLinkTag.cpp
actLinkTag.h
actPlayerInfo.cpp
actPlayerInfo.h
actTag.h
Expand Down
13 changes: 13 additions & 0 deletions src/KingSystem/ActorSystem/actLinkTag.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include "KingSystem/ActorSystem/actLinkTag.h"

namespace ksys::act {

LinkTag* LinkTag::construct(const BaseProc::CreateArg& arg, sead::Heap* heap){
return new (heap, std::nothrow) LinkTag(arg);
}

LinkTag::LinkTag(const BaseProc::CreateArg& arg) : BaseProc(arg), mJob(this,&LinkTag::calc) {
mJobHandlers[3] = &mJob;
}

} // namespace ksys::act
45 changes: 45 additions & 0 deletions src/KingSystem/ActorSystem/actLinkTag.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#pragma once

#include <prim/seadLongBitFlag.h>
#include "KingSystem/ActorSystem/actBaseProc.h"
#include "KingSystem/ActorSystem/actBaseProcJobHandler.h"
#include "KingSystem/Map/mapMubinIter.h"
#include "KingSystem/Utils/Types.h"

namespace ksys::map {
class Object;
} // namespace ksys::map

namespace ksys::act {

class LinkTag : public BaseProc {
SEAD_RTTI_OVERRIDE(LinkTag, BaseProc)

public:
enum class Type : u8 { And, Or, NAnd, NOr, XOr, Count, Pulse, None };

static LinkTag* construct(const BaseProc::CreateArg& arg, sead::Heap* heap);

explicit LinkTag(const BaseProc::CreateArg& arg);
void calc();

BaseProcJobHandlerT<LinkTag> mJob;
sead::LongBitFlag<96> mTriggeredLinkFlags;
Type mLinkTagType = Type::And;
u8 _1dd = 0xFF;
u8 _1de = 0;
u8 _1df = 0xFF;
u16 mFlags = 0;
u8 mTagCount = 0;
u8 field_1E3 = 0;
u32 mCounter = 0;
int field_1E8 = 0;
u32 mCalcFrameFlags = 0;
u32 mHashId = 0;
int field_1F4 = 0;
map::MubinIter mMubinIter;
map::Object* mMapObj = nullptr;
};
KSYS_CHECK_SIZE_NX150(LinkTag, 0x210);

} // namespace ksys::act

0 comments on commit 1d3cc5a

Please sign in to comment.