mirror of
https://github.com/zeldaret/ss
synced 2026-08-20 06:06:16 -04:00
d_a_obj_tumble_weed mostly done (#88)
* mostly done * Update d_t_tumble_weed.cpp * remove cM::calcTimer * just regswap on adjustSpeed * Create inlines for angle between vectors * name data symbols --------- Co-authored-by: robojumper <robojumper@gmail.com>
This commit is contained in:
@@ -1,12 +1,11 @@
|
||||
#include "d/a/obj/d_a_obj_switch.h"
|
||||
|
||||
#include "c/c_math.h"
|
||||
#include "d/a/d_a_player.h"
|
||||
#include "d/col/bg/d_bg_s.h"
|
||||
#include "d/col/bg/d_bg_w.h"
|
||||
#include "d/flag/sceneflag_manager.h"
|
||||
#include "nw4r/g3d/g3d_resfile.h"
|
||||
#include "s/s_Math.h"
|
||||
#include "d/flag/sceneflag_manager.h"
|
||||
|
||||
SPECIAL_ACTOR_PROFILE(OBJ_SW, dAcOsw_c, fProfile::OBJ_SW, 0x12B, 0, 0x1002);
|
||||
|
||||
@@ -269,7 +268,7 @@ void dAcOsw_c::executeState_OffWait() {
|
||||
if (field_0x5F1 != 0) {
|
||||
field_0x5F3 = 1;
|
||||
}
|
||||
if (mSwitchType != 1 && cM::calcTimer(&field_0x5EC) == 0 && field_0x5F3 == 0) {
|
||||
if (mSwitchType != 1 && sLib::calcTimer(&field_0x5EC) == 0 && field_0x5F3 == 0) {
|
||||
mStateMgr.changeState(StateID_Off);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ bool cM3dGPla::getCrossYLessD(const mVec3_c &point, f32 *out) const {
|
||||
}
|
||||
|
||||
mAng cM3dGPla::GetAngle(mAng ang) const {
|
||||
mAng angleY = mNormal.getAngleY();
|
||||
mAng angleY = GetAngleY();
|
||||
|
||||
angleY = angleY - ang;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "d/t/d_t_switch.h"
|
||||
|
||||
#include "c/c_math.h"
|
||||
#include "toBeSorted/event.h"
|
||||
#include "d/flag/sceneflag_manager.h"
|
||||
#include "s/s_Math.h"
|
||||
#include "toBeSorted/event.h"
|
||||
#include "toBeSorted/scgame.h"
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@ void dTgSw_c::initializeState_On() {
|
||||
mTimer = 4;
|
||||
}
|
||||
void dTgSw_c::executeState_On() {
|
||||
if (cM::calcTimer(&mTimer) == 0) {
|
||||
if (sLib::calcTimer(&mTimer) == 0) {
|
||||
mStateMgr.changeState(StateID_OffWait);
|
||||
}
|
||||
}
|
||||
@@ -173,7 +173,7 @@ void dTgSw_c::executeState_Off() {
|
||||
mActorEvent.scheduleEvent(event, 0);
|
||||
return;
|
||||
}
|
||||
if (cM::calcTimer(&mTimer) == 0) {
|
||||
if (sLib::calcTimer(&mTimer) == 0) {
|
||||
if (mThird2 == 1) {
|
||||
resetAllSwitches();
|
||||
} else if (mThird2 != 2) {
|
||||
|
||||
Reference in New Issue
Block a user