clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Rename CGameObject virtuals to DHXJ names across the actor hierarchy: Update->OnProcess, SendObjectMessage->SendMsg, Draw->Render, Direction->Get8Dir, SetScreenBounds->SetRenderInfo, SetScreenPosition->SetTlvert, SetAnimation->SetAction. Pure rename, codegen unchanged (314/314 functions identical with includers).

Browse source
This commit is contained in:
ragnarok-clanker 2026-10-29 14:01:31 +01:00
commit cd47fe84d3
16 changed files with 98 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/Contents/Actors/EffectActors.h
View file

@ -9,7 +9,7 @@
class CBlowEffect : public CRenderObject {
public:
~CBlowEffect() override;
void SendObjectMessage(
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
};
@ -18,10 +18,10 @@ class CCorpse : public CRenderObject {
public:
CCorpse();
~CCorpse() override;
void SendObjectMessage(
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
void Draw(int argument) override;
void Render(int argument) override;
/* 0138 */ float spriteOffset;
/* 013C */ std::uint32_t unknown_013C;
@ -38,8 +38,8 @@ public:
class CNumEffect : public CRenderObject {
public:
~CNumEffect() override;
bool Update() override;
void SendObjectMessage(
bool OnProcess() override;
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;

2
Source/Contents/Actors/GameActor.h
View file

@ -61,7 +61,7 @@ public:
/* 0408 */ int unknown_0408;
/* 040C */ unsigned char unknown_040C[0x04];
void SetAnimation(unsigned animation, int motion, int repeat) override;
void SetAction(unsigned animation, int motion, int repeat) override;
virtual void Slot08() = 0;
virtual void Slot09(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh, int twelfth, int thirteenth, int fourteenth, int fifteenth, int sixteenth, int seventeenth) = 0;

12
Source/Contents/Actors/GameObject.cpp
View file

@ -44,18 +44,18 @@ CGameObject::~CGameObject() = default;
// OFFSET: 0x00CAFD20
// FUNCTION: fn_21087
bool CGameObject::Update() {
bool CGameObject::OnProcess() {
return true;
}
// OFFSET: 0x00CBF850
// FUNCTION: fn_21113
void CGameObject::SendObjectMessage(CGameObject*, int, int, int, int, int, int, int, int, int, int, int, int, int, int) {
void CGameObject::SendMsg(CGameObject*, int, int, int, int, int, int, int, int, int, int, int, int, int, int) {
}
// OFFSET: 0x00CB20A0
// FUNCTION: fn_21101
void CGameObject::Draw(int) {
void CGameObject::Render(int) {
}
// OFFSET: 0x00CABF10
@ -81,7 +81,7 @@ int CGameObject::GetDir(float rot) {
// OFFSET: 0x00CAB920
// FUNCTION: fn_21031
int CGameObject::Direction(float angle, const CameraDirectionContext& camera) {
int CGameObject::Get8Dir(float angle, const CameraDirectionContext& camera) {
if (camera.modeType != 1) {
return 0;
}
@ -102,7 +102,7 @@ int CGameObject::Direction(float angle, const CameraDirectionContext& camera) {
// OFFSET: 0x00CB20B0
// FUNCTION: fn_21102
void CRenderObject::Draw(int argument) {
void CRenderObject::Render(int argument) {
if (this->render.visible != 0) {
this->DrawShadow(argument, this->render.scale);
this->DrawSprite(argument, false, 0.0f);
@ -291,7 +291,7 @@ void CRenderObject::SetActionSpeed(float speed) {
void CRenderObject::SendValueMessage(int value, CGameObject* target) {
if (target) {
const std::int64_t wide = value;
target->SendObjectMessage(
target->SendMsg(
nullptr, 29, 0, static_cast<int>(wide), static_cast<int>(wide >> 32), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
);
}

8
Source/Contents/Actors/GameObject.h
View file

@ -12,10 +12,10 @@ class CGameObject {
public:
CGameObject();
virtual ~CGameObject();
virtual bool Update();
virtual void SendObjectMessage(CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m);
virtual void Draw(int argument);
virtual int Direction(float angle, const CameraDirectionContext& camera);
virtual bool OnProcess();
virtual void SendMsg(CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m);
virtual void Render(int argument);
virtual int Get8Dir(float angle, const CameraDirectionContext& camera);
int GetDir(float rot);
/* 0008 */ std::uint64_t identity;

6
Source/Contents/Actors/GndRiser.h
View file

@ -7,11 +7,11 @@
class CGndRiser : public EffectActor {
public:
bool Update() override;
void SendObjectMessage(
bool OnProcess() override;
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
void Draw(int argument) override;
void Render(int argument) override;
/* 0158 */ int lifetime;
/* 015C */ int screenX;

2
Source/Contents/Actors/GroundScope.cpp
View file

@ -5,7 +5,7 @@
// OFFSET: 0x00E4C2F0
// FUNCTION: fn_24284
bool CGroundScope::Update() {
bool CGroundScope::OnProcess() {
if (this->m_lastingTime < timeGetTime()) {
return false;
}

2
Source/Contents/Actors/GroundScope.h
View file

@ -7,7 +7,7 @@
class CGroundScope : public EffectActor {
public:
bool Update() override;
bool OnProcess() override;
/* 0158 */ unsigned char unknown_0158[0xC];
/* 0164 */ unsigned long m_lastingTime;

22
Source/Contents/Actors/Npc.h
View file

@ -11,11 +11,11 @@ class UIWindow;
class CNpc : public CGameActor {
public:
~CNpc() override;
bool Update() override;
void SendObjectMessage(
bool OnProcess() override;
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
void Draw(int argument) override;
void Render(int argument) override;
/* 0410 */ unsigned char unknown_0410[0x1C];
/* 042C */ UIWindow* unknown_042C;
@ -29,10 +29,10 @@ public:
class CCharacterNpc : public CNpc {
public:
~CCharacterNpc() override;
void SendObjectMessage(
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
void Draw(int argument) override;
void Render(int argument) override;
/* 0440 */ CGameObject* unknown_0440;
};
@ -40,11 +40,11 @@ public:
class CHalluNPC : public CNpc {
public:
~CHalluNPC() override;
bool Update() override;
void SendObjectMessage(
bool OnProcess() override;
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
void Draw(int argument) override;
void Render(int argument) override;
/* 0440 */ float unknown_0440;
/* 0444 */ int unknown_0444;
@ -57,11 +57,11 @@ public:
class CHalluPlant : public CNpc {
public:
~CHalluPlant() override;
bool Update() override;
void SendObjectMessage(
bool OnProcess() override;
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
void Draw(int argument) override;
void Render(int argument) override;
/* 0440 */ std::uint32_t unknown_0440;
/* 0444 */ int unknown_0444;

22
Source/Contents/Actors/Pc.h
View file

@ -14,7 +14,7 @@ struct granny_model_instance;
class CPc : public CGameActor {
public:
~CPc() override;
void SendObjectMessage(
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
@ -64,21 +64,21 @@ public:
class CBlurPC : public CPc {
public:
~CBlurPC() override;
bool Update() override;
void SendObjectMessage(
bool OnProcess() override;
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
void Draw(int argument) override;
void Render(int argument) override;
};
class CHalluPC : public CPc {
public:
~CHalluPC() override;
bool Update() override;
void SendObjectMessage(
bool OnProcess() override;
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
void Draw(int argument) override;
void Render(int argument) override;
/* 0510 */ int unknown_0510;
/* 0514 */ int unknown_0514;
@ -87,11 +87,11 @@ public:
class CHalluPC2 : public CPc {
public:
~CHalluPC2() override;
bool Update() override;
void SendObjectMessage(
bool OnProcess() override;
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
void Draw(int argument) override;
void Render(int argument) override;
/* 0510 */ int unknown_0510;
/* 0514 */ int unknown_0514;
@ -106,7 +106,7 @@ public:
class CGrannyPc : public CGameActor {
public:
void SetAnimation(unsigned animation, int motion, int repeat) override;
void SetAction(unsigned animation, int motion, int repeat) override;
void Slot20(int first, int second, int third, int fourth, int fifth, int sixth, int seventh, int eighth, int ninth, int tenth, int eleventh) override;
void Slot21(int value) override;
void Slot22(int value) override;

10
Source/Contents/Actors/Player.cpp
View file

@ -10,7 +10,7 @@ extern const int g_maxMoveSpeed = 432;
// OFFSET: 0x00DAFE50
// FUNCTION: fn_22606
void CGrannyPc::SetAnimation(unsigned animation, int, int repeat) {
void CGrannyPc::SetAction(unsigned animation, int, int repeat) {
if (!this->model) {
return;
}
@ -72,9 +72,9 @@ void CPc::Slot34(int value) {
void CGrannyPc::Slot40(int value) {
if (value < 0) {
const std::int64_t emotion = g_cashEmotionMgr->GetSpecialEmotion(CashEmotionSpecial::ChatProhibit);
this->SendObjectMessage(nullptr, 160, 0, 0, 0, static_cast<int>(emotion), static_cast<int>(emotion >> 32), 0, 0, 0, 0, 0, 0, 0, 0);
this->SendMsg(nullptr, 160, 0, 0, 0, static_cast<int>(emotion), static_cast<int>(emotion >> 32), 0, 0, 0, 0, 0, 0, 0, 0);
} else {
this->SendObjectMessage(nullptr, 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
this->SendMsg(nullptr, 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
}
this->unknown_0428 = value;
}
@ -84,9 +84,9 @@ void CGrannyPc::Slot40(int value) {
void CPc::Slot40(int value) {
if (value < 0) {
const std::int64_t emotion = g_cashEmotionMgr->GetSpecialEmotion(CashEmotionSpecial::ChatProhibit);
this->SendObjectMessage(nullptr, 160, 0, 0, 0, static_cast<int>(emotion), static_cast<int>(emotion >> 32), 0, 0, 0, 0, 0, 0, 0, 0);
this->SendMsg(nullptr, 160, 0, 0, 0, static_cast<int>(emotion), static_cast<int>(emotion >> 32), 0, 0, 0, 0, 0, 0, 0, 0);
} else {
this->SendObjectMessage(nullptr, 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
this->SendMsg(nullptr, 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
}
this->unknown_0430 = value;
}

14
Source/Contents/Actors/RenderObject.cpp
View file

@ -37,13 +37,13 @@ CRenderObject::~CRenderObject() = default;
// OFFSET: 0x00CAFDC0
// FUNCTION: fn_21089
bool CRenderObject::Update() {
bool CRenderObject::OnProcess() {
return false;
}
// OFFSET: 0x00CBF920
// FUNCTION: fn_21115
void CRenderObject::SendObjectMessage(CGameObject*, int, int, int, int, int, int, int, int, int, int, int, int, int, int) {
void CRenderObject::SendMsg(CGameObject*, int, int, int, int, int, int, int, int, int, int, int, int, int, int) {
}
// OFFSET: 0x00CBF930
@ -62,7 +62,7 @@ void CRenderObject::SetActionName(ResourceMgr& resources, const char* name) {
// OFFSET: 0x00CC2D40
// FUNCTION: fn_21144
void CRenderObject::SetScreenBounds(const float*, float, float) {
void CRenderObject::SetRenderInfo(const float*, float, float) {
}
// OFFSET: 0x00CC2DA0
@ -87,14 +87,14 @@ void CRenderObject::SetSpriteName(ResourceMgr& resources, const char* name) {
// OFFSET: 0x00CC3DC0
// FUNCTION: fn_21154
void CRenderObject::SetScreenPosition(float x, float y) {
void CRenderObject::SetTlvert(float x, float y) {
this->render.screenX = TruncateToInt(x);
this->render.screenY = TruncateToInt(y);
}
// OFFSET: 0x00CBFAE0
// FUNCTION: fn_21118
void CRenderObject::SetAnimation(unsigned animation, int, int repeat) {
void CRenderObject::SetAction(unsigned animation, int, int repeat) {
float speed = this->render.action->Speed(animation);
if (g_replayAnimationScaling != 0) {
speed *= Replay::Instance().AnimationScale();
@ -255,14 +255,14 @@ void CGameActor::SetUnknown02C8(int value) {
// OFFSET: 0x00CBF970
// FUNCTION: fn_21117
void CGameActor::SetAnimation(unsigned animation, int motion, int repeat) {
void CGameActor::SetAction(unsigned animation, int motion, int repeat) {
if (this->unknown_0314 == 7) {
if (!this->render.action || static_cast<int>(this->render.action->animations.size()) <= static_cast<int>(animation)) {
return;
}
}
CRenderObject::SetAnimation(animation, motion, repeat);
CRenderObject::SetAction(animation, motion, repeat);
this->unknown_0238 = 0;
this->unknown_0378 = -1.0f;
}

12
Source/Contents/Actors/RenderObject.h
View file

@ -13,14 +13,14 @@ class CRenderObject : public CGameObject {
public:
CRenderObject();
~CRenderObject() override;
bool Update() override;
void SendObjectMessage(CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m) override;
void Draw(int argument) override;
bool OnProcess() override;
void SendMsg(CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m) override;
void Render(int argument) override;
virtual void SetScreenBounds(const float* bounds, float x, float y);
virtual void SetRenderInfo(const float* bounds, float x, float y);
virtual void SetScreenPosition(float x, float y);
virtual void SetAnimation(unsigned animation, int motion, int repeat);
virtual void SetTlvert(float x, float y);
virtual void SetAction(unsigned animation, int motion, int repeat);
static float __stdcall Heading(float x, float z, float targetX, float targetZ);
void Face(float x, float z);
float CalcDist(float x, float z) const;

2
Source/Contents/Skills/SkillInfo.cpp
View file

@ -574,7 +574,7 @@ void CEfstAction_SHADOW_EXCEED::Slot01(int efstId, int argument2, int argument3,
auto* effectActor = static_cast<EffectActor*>(actor);
while (effectActor->state.Attachments().HasId(1004)) {
actor->SendObjectMessage(nullptr, 109, 0, 1004, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
actor->SendMsg(nullptr, 109, 0, 1004, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
}
}

64
Source/Contents/Sound/SoundMaker.cpp
View file

@ -74,13 +74,13 @@ CNumEffect::~CNumEffect() = default;
// OFFSET: 0x00DA3340
// FUNCTION: fn_22403
bool CHalluPlant::Update() {
bool CHalluPlant::OnProcess() {
return ++this->unknown_0440 <= 60;
}
// OFFSET: 0x00DA3980
// FUNCTION: fn_22405
bool CNumEffect::Update() {
bool CNumEffect::OnProcess() {
const float elapsed = static_cast<float>((timeGetTime() - this->render.unknown_008C) / 24.0);
this->render.previousAnimation = this->render.animation;
this->render.position.y = this->baseHeight - elapsed * 0.18f;
@ -97,7 +97,7 @@ bool CNumEffect::Update() {
// OFFSET: 0x00DA3A60
// FUNCTION: fn_22406
bool CSoundMaker::Update() {
bool CSoundMaker::OnProcess() {
if (this->width == 0) {
return true;
}
@ -168,7 +168,7 @@ float* CPc::GetExtent(float* extent) const {
// OFFSET: 0x00DA2FA0
// FUNCTION: fn_22397
bool CBlurPC::Update() {
bool CBlurPC::OnProcess() {
CWorld* scene = static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene;
if (scene) {
const CRenderObject* owner = scene->GetGameActorByAidIncludeMe(this->render.accountId);
@ -188,7 +188,7 @@ bool CBlurPC::Update() {
// OFFSET: 0x00DA3240
// FUNCTION: fn_22401
bool CHalluPC2::Update() {
bool CHalluPC2::OnProcess() {
CWorld* scene = static_cast<CGameMode*>(g_modeMgr.GetGameMode())->scene;
if (scene) {
const CRenderObject* owner = scene->GetGameActorByAidIncludeMe(this->render.accountId);
@ -209,7 +209,7 @@ bool CHalluPC2::Update() {
// OFFSET: 0x00DA4100
// FUNCTION: fn_22410
void CCorpse::Draw(int argument) {
void CCorpse::Render(int argument) {
if (this->render.visible) {
this->DrawShadow(argument, this->render.scale);
this->DrawSprite(argument, false, this->spriteOffset);
@ -218,7 +218,7 @@ void CCorpse::Draw(int argument) {
// OFFSET: 0x00DA44B0
// FUNCTION: fn_22415
void CHalluPlant::Draw(int argument) {
void CHalluPlant::Render(int argument) {
this->DrawSprite(argument, true, 0.0f);
}
@ -248,21 +248,21 @@ std::int64_t CPc::Slot35() {
// OFFSET: 0x00DA4150
// FUNCTION: fn_22411
void CGndRiser::Draw(int) {
void CGndRiser::Render(int) {
}
// OFFSET: 0x00DA4960
// FUNCTION: fn_22417
void CSoundMaker::Draw(int) {
void CSoundMaker::Render(int) {
}
// OFFSET: 0x00DA4970
// FUNCTION: fn_22418
void CBlowEffect::SendObjectMessage(
void CBlowEffect::SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int, int, int, int
) {
if (message != 14 || a != 0) {
CRenderObject::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CRenderObject::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
return;
}
@ -277,11 +277,11 @@ void CBlowEffect::SendObjectMessage(
// OFFSET: 0x00DA4A00
// FUNCTION: fn_22419
void CBlurPC::SendObjectMessage(
void CBlurPC::SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int, int, int, int
) {
if (a != 0) {
CPc::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CPc::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
return;
}
@ -301,26 +301,26 @@ void CBlurPC::SendObjectMessage(
this->render.isMotionFreezed = 1;
break;
default:
CPc::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CPc::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
break;
}
}
// OFFSET: 0x00DA4AD0
// FUNCTION: fn_22420
void CCorpse::SendObjectMessage(
void CCorpse::SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int, int, int, int
) {
CRenderObject::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CRenderObject::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
}
// OFFSET: 0x00DA4BF0
// FUNCTION: fn_22422
void CHalluNPC::SendObjectMessage(
void CHalluNPC::SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int, int, int, int
) {
if (a != 0) {
CNpc::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CNpc::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
return;
}
@ -340,18 +340,18 @@ void CHalluNPC::SendObjectMessage(
this->render.isMotionFreezed = 1;
break;
default:
CNpc::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CNpc::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
break;
}
}
// OFFSET: 0x00DA4CC0
// FUNCTION: fn_22423
void CHalluPC2::SendObjectMessage(
void CHalluPC2::SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int, int, int, int
) {
if (a != 0) {
CPc::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CPc::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
return;
}
@ -371,18 +371,18 @@ void CHalluPC2::SendObjectMessage(
this->render.isMotionFreezed = 1;
break;
default:
CPc::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CPc::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
break;
}
}
// OFFSET: 0x00DA4D90
// FUNCTION: fn_22424
void CHalluPC::SendObjectMessage(
void CHalluPC::SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int, int, int, int
) {
if (a != 0) {
CPc::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CPc::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
return;
}
@ -402,18 +402,18 @@ void CHalluPC::SendObjectMessage(
this->render.isMotionFreezed = 1;
break;
default:
CPc::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CPc::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
break;
}
}
// OFFSET: 0x00DA4E60
// FUNCTION: fn_22425
void CHalluPlant::SendObjectMessage(
void CHalluPlant::SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int, int, int, int
) {
if (a != 0) {
CNpc::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CNpc::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
return;
}
@ -428,14 +428,14 @@ void CHalluPlant::SendObjectMessage(
this->render.isMotionFreezed = 1;
break;
default:
CNpc::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CNpc::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
break;
}
}
// OFFSET: 0x00DA5610
// FUNCTION: fn_22427
void CNumEffect::SendObjectMessage(
void CNumEffect::SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int, int, int, int
) {
if (message == 14 && a == 0) {
@ -463,16 +463,16 @@ void CNumEffect::SendObjectMessage(
return;
}
CRenderObject::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CRenderObject::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
}
// OFFSET: 0x00DA56E0
// FUNCTION: fn_22428
void CSoundMaker::SendObjectMessage(
void CSoundMaker::SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int, int, int, int
) {
if (message != 14 || a != 0) {
CRenderObject::SendObjectMessage(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
CRenderObject::SendMsg(sender, message, a, b, c, d, e, f, g, h, i, 0, 0, 0, 0);
return;
}

6
Source/Contents/Sound/SoundMaker.h
View file

@ -9,11 +9,11 @@ class CSoundMaker : public CRenderObject {
public:
CSoundMaker();
~CSoundMaker() override;
bool Update() override;
void SendObjectMessage(
bool OnProcess() override;
void SendMsg(
CGameObject* sender, int message, int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l, int m
) override;
void Draw(int argument) override;
void Render(int argument) override;
/* 0138 */ std::string file;
/* 0150 */ float volume;

2
Source/Contents/World/WorldObjects.cpp
View file

@ -75,7 +75,7 @@ void WorldObjects::SendObjectMessage(CGameObject* sender, std::uint64_t identity
for (CRenderObject* object : this->objects) {
if (object->identity == identity) {
object->SendObjectMessage(sender, message, message >> 31, a, a >> 31, b, b >> 31, c, c >> 31, d, d >> 31, 0, 0, 0, 0);
object->SendMsg(sender, message, message >> 31, a, a >> 31, b, b >> 31, c, c >> 31, d, d >> 31, 0, 0, 0, 0);
return;
}
}