Skip to content

Match map::ObjectLink::sub_7100D4E310 #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RobbyV2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Match map::ObjectLink::sub_7100D4E310 #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/uking_functions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74370,7 +74370,7 @@ Address,Quality,Size,Name
0x0000007100d4e1a0,O,000324,_ZN4ksys3map10ObjectLink14getTypeForNameERKN4sead14SafeStringBaseIcEE
0x0000007100d4e2e4,O,000020,_ZNK4ksys3map10ObjectLink14getObjectActorEv
0x0000007100d4e2f8,O,000024,_ZNK4ksys3map10ObjectLink25getObjectProcWithAccessorERNS_3act24ActorLinkConstDataAccessE
0x0000007100d4e310,m,000028,_ZN4ksys3map10ObjectLink14sub_7100D4E310ENS0_14MapLinkDefTypeE
0x0000007100d4e310,O,000028,_ZN4ksys3map10ObjectLink14sub_7100D4E310ENS0_14MapLinkDefTypeE
0x0000007100d4e32c,O,000024,_ZN4ksys3map10ObjectLink27isPlacementLODOrForSaleLinkENS0_14MapLinkDefTypeE
0x0000007100d4e344,O,000044,_ZN4ksys3map14ObjectLinkDataC1Ev
0x0000007100d4e370,m,000136,_ZN4ksys3map14ObjectLinkData12deleteArraysEv
Expand Down
30 changes: 3 additions & 27 deletions src/KingSystem/Map/mapObjectLink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,34 +88,10 @@ MapLinkDefType ObjectLink::getTypeForName(const sead::SafeString& name) {
}

bool ObjectLink::sub_7100D4E310(MapLinkDefType t) {
switch (t) {
case MapLinkDefType::Create:
case MapLinkDefType::Delete:
case MapLinkDefType::MtxCopyCreate:
case MapLinkDefType::Freeze:
case MapLinkDefType::ForbidAttention:
return true;
default:
break;
case MapLinkDefType::BasicSig:
case MapLinkDefType::AxisX:
case MapLinkDefType::AxisY:
case MapLinkDefType::AxisZ:
case MapLinkDefType::NAxisX:
case MapLinkDefType::NAxisY:
case MapLinkDefType::NAxisZ:
case MapLinkDefType::GimmickSuccess:
case MapLinkDefType::VelocityControl:
case MapLinkDefType::BasicSigOnOnly:
case MapLinkDefType::Remains:
case MapLinkDefType::DeadUp:
case MapLinkDefType::LifeZero:
case MapLinkDefType::Stable:
case MapLinkDefType::ChangeAtnSig:
const auto type = static_cast<s32>(t) - static_cast<s32>(MapLinkDefType::Create);
if (type < 0)
return true;
}

return false;
return type == 0 || type == 1 || type == 2 || type == 3 || type == 4;
}

bool ObjectLink::isPlacementLODOrForSaleLink(MapLinkDefType t) {
Expand Down