Game-Decompilation/spidey-decomp
1
0
Fork 0
mirror of https://github.com/krystalgamer/spidey-decomp.git synced 2024-11-23 05:19:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CScorpion::WhatShouldIDo

Browse Source
This commit is contained in:
krystalgamer 2024-07-14 15:32:44 +02:00
parent 1e6bdc2ee5
commit 8a38988d00
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lizman.cpp
View File

@ -175,7 +175,7 @@ void __inline CLizMan::StandStill(void)
}
}
// @SMALLTODO
// @Ok
void CLizMan::SwitchFromMatrixToEuler(void)
{
if ( this->outlineRelated & 1)

6
reloc.cpp
View File

@ -9,3 +9,9 @@ void Reloc_Unload(char* pStr)
{
Reloc_Unload(Utils_GenerateCRC(pStr));
}
// @MEDIUMTODO
void Reloc_CallUserFunction(const char*, u32, const u32*, u32*)
{
printf("WASSSUP");
}

1
reloc.h
View File

@ -7,5 +7,6 @@
EXPORT void Reloc_Unload(char*);
EXPORT void Reloc_Unload(unsigned int);
EXPORT void Reloc_CallUserFunction(const char*, u32, const u32*, u32*);
#endif

17
scorpion.cpp
View File

@ -5,6 +5,7 @@
#include "utils.h"
#include "web.h"
#include "ps2redbook.h"
#include "reloc.h"
CBody* MechList[1];
@ -186,7 +187,7 @@ CBaddy* BaddyList;
// @NotOk
// globals
__inline CSuper* CScorpion::FindJonah(void)
INLINE CSuper* CScorpion::FindJonah(void)
{
if (this->field_BEC)
return field_BEC;
@ -262,10 +263,18 @@ void CScorpion::DoIntroSequence(void)
}
}
// @SMALLTODO
i32 CScorpion::WhatShouldIDo(void)
// @Ok
INLINE u32 CScorpion::WhatShouldIDo(void)
{
return 0x13072024;
CSuper *pJonah = this->FindJonah();
if (pJonah)
{
u32 res;
Reloc_CallUserFunction("jonah", 1, reinterpret_cast<u32*>(&pJonah), &res);
return res;
}
return 0;
}

2
scorpion.h
View File

@ -21,7 +21,7 @@ class CScorpion : public CBaddy {
EXPORT void PlayXA_NoRepeat(i32, i32, i32, i32*, CBody*);
EXPORT i32 ScorpPathCheck(CVector*, CVector*, CVector*, i32);
EXPORT i32 PathLooksGood(CVector*);
EXPORT i32 WhatShouldIDo(void);
EXPORT u32 WhatShouldIDo(void);
EXPORT void TargetPlayer(i32);
EXPORT i32 GetEnvironmentalObjectTarget(void);