mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-21 22:10:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_ghostship OK

Browse Source
This commit is contained in:
LagoLunatic
2023-12-03 22:39:52 -05:00
parent 78fdf29147
commit 7748957998
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1619,7 +1619,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_wz"),
ActorRel(NonMatching, "d_a_ygcwp"),
ActorRel(NonMatching, "d_a_yougan"),
ActorRel(NonMatching, "d_a_ghostship", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_ghostship", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_movie_player"),
]
include/d/actor/d_a_ghostship.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
void modeWaitInit();
void modeWait();
void modeRealize();
bool _pathMove(cXyz*, cXyz*, cXyz*);
BOOL _pathMove(cXyz*, cXyz*, cXyz*);
void modePathMoveInit();
void modePathMove();
void modeProcCall();
src/d/actor/d_a_ghostship.cpp
+11 -10
View File
@@ -67,8 +67,8 @@ BOOL daGhostship_c::_createHeap() {
}
/* 0000032C-00000368 .text pathMove_CB__FP4cXyzP4cXyzP4cXyzPv */
static int pathMove_CB(cXyz* curPos, cXyz* curPntPos, cXyz* nextPntPos, void* i_this) {
static_cast<daGhostship_c*>(i_this)->_pathMove(curPos, curPntPos, nextPntPos);
static BOOL pathMove_CB(cXyz* curPos, cXyz* curPntPos, cXyz* nextPntPos, void* i_this) {
return static_cast<daGhostship_c*>(i_this)->_pathMove(curPos, curPntPos, nextPntPos);
}
/* 00000368-000003B8 .text __ct__17daGhostship_HIO_cFv */
@@ -107,25 +107,26 @@ void daGhostship_c::modeRealize() {
}
/* 000004E0-00000770 .text _pathMove__13daGhostship_cFP4cXyzP4cXyzP4cXyz */
bool daGhostship_c::_pathMove(cXyz* curPos, cXyz* p_curPntPos, cXyz* p_nextPntPos) {
/* Nonmatching */
BOOL daGhostship_c::_pathMove(cXyz* curPos, cXyz* p_curPntPos, cXyz* p_nextPntPos) {
mCurPntPos = *p_curPntPos;
mCurPntPos.y = current.pos.y;
mNextPntPos = *p_nextPntPos;
mNextPntPos.y = current.pos.y;
cXyz dist = mNextPntPos - mCurPntPos;
if(!dist.normalizeRS()) {
return true;
cXyz delta = mNextPntPos - mCurPntPos;
if(!delta.normalizeRS()) {
return TRUE;
}
f32 step = speedF * fabsf(cM_scos(cLib_addCalcAngleS(&current.angle.y, cM_atan2s(dist.x, dist.z), 8, 0x200, 8)));
s16 targetAngleY = cM_atan2s(delta.x, delta.z);
s16 angleLeftToTarget = cLib_addCalcAngleS(&current.angle.y, targetAngleY, 8, 0x200, 8);
f32 step = speedF * fabsf(cM_scos(angleLeftToTarget));
cLib_chasePosXZ(curPos, mNextPntPos, step);
if((*curPos - mNextPntPos).absXZ() < step * (g_regHIO.mChild[12].mFloatRegs[5] + 1.0f) || (*curPos - mNextPntPos).absXZ() == 0.0f) {
return true;
return TRUE;
}
return false;
return FALSE;
}
/* 00000770-0000077C .text modePathMoveInit__13daGhostship_cFv */