mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-15 12:08:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

scannon / scannon_crs / scannon_ten done (#2632)

Browse Source 
* scannon done

* scannon_crs done

* scannon_ten done

* pr

* attention debug stuff

* attn flags

* fix build
This commit is contained in:
TakaRikka
2025-09-08 02:01:20 -07:00
committed by GitHub
parent b35204b0c8
commit 5fce8ea1e1
244 changed files with 3067 additions and 3159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_cow.cpp
+10 -10
View File
@@ -199,7 +199,7 @@ void daCow_c::setCarryStatus() {
mDoMtx_stack_c::multVec(&daPy_getPlayerActorClass()->current.pos, &carryPosition);
if (fabsf(carryPosition.x) < xMax && carryPosition.z > 0.0f && carryPosition.z < zMax) {
// todo: what does this mean
attention_info.flags |= 0x10; // in debug this is 0x80
attention_info.flags |= fopAc_AttnFlag_CARRY_e; // in debug this is 0x80
}
}
@@ -208,7 +208,7 @@ void daCow_c::setActetcStatus() {
if (!mNadeNade) {
s32 playerAngle = fopAcM_seenPlayerAngleY(this);
if (playerAngle < 0x6000 && playerAngle > 0x2000) {
attention_info.flags |= 0x80; // in debug this is 0x800
attention_info.flags |= fopAc_AttnFlag_ETC_e; // in debug this is 0x800
}
}
}
@@ -1698,9 +1698,9 @@ void daCow_c::action_angry() {
setSeSnort();
if (!player->checkHorseRide()) {
attention_info.flags |= 1;
attention_info.flags |= fopAc_AttnFlag_LOCK_e;
} else {
attention_info.flags &= ~1;
attention_info.flags &= ~fopAc_AttnFlag_LOCK_e;
}
if (mCrazy == daCow_c::Crazy_Dash) {
setCarryStatus();
@@ -1908,7 +1908,7 @@ void daCow_c::action_angry() {
mJoint1Offset.y = 0;
mJoint8Offset.y = 0;
attention_info.flags &= ~1;
attention_info.flags &= ~fopAc_AttnFlag_LOCK_e;
break;
}
}
@@ -2780,7 +2780,7 @@ void daCow_c::action_wolf() {
mMode = daCow_c::Mode_1;
mCrazy = daCow_c::Crazy_Wait;
calcRunAnime(true);
attention_info.flags |= 1;
attention_info.flags |= fopAc_AttnFlag_LOCK_e;
mSound.startCreatureVoice(Z2SE_GOAT_V_ANGRY, -1);
mTimer10 = cM_rndF(90.0f) + 90.0f;
break;
@@ -2877,7 +2877,7 @@ void daCow_c::action_wolf() {
mJoint1Offset.y = 0;
mJoint8Offset.y = 0;
attention_info.flags &= ~0x1;
attention_info.flags &= ~fopAc_AttnFlag_LOCK_e;
for (int iWolfBuster = 0; iWolfBuster < N_WOLF_BUSTERS; iWolfBuster++) {
if (gWolfBustersID[iWolfBuster] == fopAcM_GetID(this)) {
@@ -2962,7 +2962,7 @@ void daCow_c::setAttnPos() {
cXyz pos;
if (mpMorf) {
if (attention_info.flags & 0x80) {
if (attention_info.flags & fopAc_AttnFlag_ETC_e) {
arg.set(0.0f, 0.0f, 0.0f);
mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(11));
mDoMtx_stack_c::multVec(&arg, &eyePos);
@@ -3020,8 +3020,8 @@ int daCow_c::Execute() {
mCounter1++;
mJointIndex = 0;
attention_info.flags &= ~0x10;
attention_info.flags &= ~0x80;
attention_info.flags &= ~fopAc_AttnFlag_CARRY_e;
attention_info.flags &= ~fopAc_AttnFlag_ETC_e;
action();
if (!mDrawOff) {