mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-05 20:59:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_nh done (no match) (#55)

Browse Source 
* Fix sin and cos

* Fix dCcD_GObjInf JP inlining difference

* Improvements to dDlst_alphaModel_c

* d_a_nh done (no match)
This commit is contained in:
LagoLunatic
2023-09-18 15:29:40 -04:00
committed by GitHub
parent 1040e0498c
commit 01f2fc433f
9 changed files with 303 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_npc.cpp
+5 -5
View File
@@ -893,8 +893,8 @@ void dNpc_EventCut_c::cutTurnToActorProc() {
if(addAngle && pDelDistance) {
u16 angle = mpTargetActor->shape_angle.y + addAngle;
mPos = mpTargetActor->current.pos;
mPos.x -= pDelDistance * JMASinShort(angle);
mPos.z -= pDelDistance * JMASCosShort(angle);
mPos.x -= pDelDistance * cM_ssin(angle);
mPos.z -= pDelDistance * cM_scos(angle);
}
else {
mPos = mpTargetActor->current.pos + mOffsetPos;
@@ -1002,8 +1002,8 @@ void dNpc_EventCut_c::cutMoveToActorProc() {
angle = mpTargetActor->shape_angle.y + mAddAngle;
}
temp.x -= pDelDistance * JMASinShort(angle);
temp.z -= pDelDistance * JMASCosShort(angle);
temp.x -= pDelDistance * cM_ssin(angle);
temp.z -= pDelDistance * cM_scos(angle);
if(mSpeed == 0.0f) {
mpActor->current.pos = temp;
@@ -1188,7 +1188,7 @@ void dNpc_EventCut_c::cutMoveToPosStart() {
void dNpc_EventCut_c::cutMoveToPosProc() {
s16 angle = cLib_targetAngleY(&mpActor->current.pos, &mPos);
cXyz temp(pDelDistance * JMASinShort(angle), mPos.y, pDelDistance * JMASCosShort(angle));
cXyz temp(pDelDistance * cM_ssin(angle), mPos.y, pDelDistance * cM_scos(angle));
if(mSpeed == 0.0f) {
mpActor->current.pos = temp;