ihateninjas/OdysseyDecomp
1
0
Fork 0
mirror of https://github.com/MonsterDruide1/OdysseyDecomp synced 2026-04-23 09:04:21 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Fixed Format Issues

Browse source
This commit is contained in:
Alex Larbe 2026-01-10 21:25:19 +00:00
parent 3b298fea26
commit 1d7f4332c8
4 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/al/Library/HitSensor/SensorMsgSetupUtil.h
View file

@ -45,9 +45,7 @@ Creating a SensorMsg class called SensorMsgTest2 that holds a string referenced
class SensorMsg##Type : public al::SensorMsg { \
SEAD_RTTI_OVERRIDE(SensorMsg##Type, al::SensorMsg) \
public: \
inline SensorMsg##Type(PARAM_LIST(__VA_ARGS__)) { \
SET_MEMBER_PARAM_MULTI(__VA_ARGS__); \
} \
inline SensorMsg##Type(PARAM_LIST(__VA_ARGS__)) { SET_MEMBER_PARAM_MULTI(__VA_ARGS__); } \
\
DECL_GET_MULTI(__VA_ARGS__) \
\

8
lib/al/Library/Nerve/NerveSetupUtil.h
View file

@ -91,9 +91,7 @@ al::initNerveAction(this, "Hide", &NrvExampleUseCase.collector, 0);
(keeper->getParent<Class>())->exe##ActionFunc(); \
} \
\
const char* getActionName() const override { \
return #Action; \
} \
const char* getActionName() const override { return #Action; } \
};
#define NERVE_ACTION_IMPL(Class, Action) NERVE_ACTION_IMPL_(Class, Action, Action)
@ -108,7 +106,5 @@ al::initNerveAction(this, "Hide", &NrvExampleUseCase.collector, 0);
\
alNerveFunction::NerveActionCollector collector; \
\
NrvStruct##Class() { \
FOR_EACH(NERVE_ACTION_CONSTRUCT, Class, __VA_ARGS__) \
} \
NrvStruct##Class() { FOR_EACH(NERVE_ACTION_CONSTRUCT, Class, __VA_ARGS__) } \
} Nrv##Class;

4
lib/al/Library/Yaml/ParameterBase.h
View file

@ -50,9 +50,7 @@ SEAD_ENUM(YamlParamType,
return YamlParamType::text(YamlParamType::Name); \
} \
\
YamlParamType getParamType() const override { \
return YamlParamType::Name; \
} \
YamlParamType getParamType() const override { return YamlParamType::Name; } \
};
class ParameterBase {

21
src/Boss/Stacker/StackerStatePanic.cpp
View file

@ -77,7 +77,6 @@ bool StackerStatePanic::receiveMsg(const al::SensorMsg* self, al::HitSensor* oth
if (al::isNerve(this, &NrvStackerStatePanic.Wait) ||
al::isNerve(this, &NrvStackerStatePanic.Surprise) ||
al::isNerve(this, &NrvStackerStatePanic.CapHit)) {
if (rs::isMsgCapReflect(self) || rs::isMsgStackerCapBoostAttack(self)) {
_30 = 10;
al::faceToTarget(mActor, rs::getPlayerPos(mActor));
@ -87,17 +86,15 @@ bool StackerStatePanic::receiveMsg(const al::SensorMsg* self, al::HitSensor* oth
al::setNerve(this, &NrvStackerStatePanic.CapHit);
return true;
}
} else {
if (rs::isMsgCapAttack(self) || rs::isMsgStackerCapBoostAttack(self)) {
_30 = 10;
al::faceToTarget(mActor, rs::getPlayerPos(mActor));
al::startHitReaction(mActor, "逃げ中帽子ヒット");
rs::requestHitReactionToAttacker(self, hitSensor, other);
al::startAction(mActor, "PanicStart");
al::setNerve(this, &NrvStackerStatePanic.CapHit);
return true;
}
}
} else if (rs::isMsgCapAttack(self) || rs::isMsgStackerCapBoostAttack(self)) {
_30 = 10;
al::faceToTarget(mActor, rs::getPlayerPos(mActor));
al::startHitReaction(mActor, "逃げ中帽子ヒット");
rs::requestHitReactionToAttacker(self, hitSensor, other);
al::startAction(mActor, "PanicStart");
al::setNerve(this, &NrvStackerStatePanic.CapHit);
return true;
}
return false;
}