kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Renaming Actor.unk28

Browse Source
This commit is contained in:
Nabnut
2024-09-19 12:31:50 +02:00
parent 8af5e336a2
commit 17f1f826b5
32 changed files with 178 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MM/ch/chimpystump.c
View File

@@ -46,7 +46,7 @@ void chchimpystump_update(Actor *this) {
if (!this->initialized) {
actor_collisionOff(this);
this->initialized = TRUE;
this->unk28 = this->position_y;
this->actor_specific_1_f = this->position_y;
this->position_y -= 134.0f;
this->marker->propPtr->unk8_3 = 1;
}
@@ -64,8 +64,8 @@ void chchimpystump_update(Actor *this) {
__chchimpystump_updateShaking(this);
this->position_y += 2.5;
if (this->unk28 <= this->position_y) {
this->position_y = this->unk28;
if (this->actor_specific_1_f <= this->position_y) {
this->position_y = this->actor_specific_1_f;
subaddie_set_state(this, CHIMPY_STUMP_STATE_3_RAISED);
func_802BB41C(1);
func_80244C78(0);

10
src/MM/ch/conga.c
View File

@@ -72,7 +72,7 @@ bool __chConga_isPlayerNearCongaTree(Actor * this){
unused_tmpz = plyr_pos[2] - 5029.0f;
if (52900.0f < (plyr_pos[0] - - 5011.0f)*(plyr_pos[0] - - 5011.0f) + (plyr_pos[2]- 5029.0f)*(plyr_pos[2] - 5029.0f)) {
if (52900.0f < (plyr_pos[0] - -5011.0f) * (plyr_pos[0] - -5011.0f) + (plyr_pos[2] - 5029.0f) * (plyr_pos[2] - 5029.0f)) {
return FALSE;
}
@@ -181,7 +181,7 @@ void __chConga_sendOrangeProjectile(ActorMarker *congaMarker){
congaPtr->unk10_12 -= (congaPtr->unk10_12 && ( conga_state == 7));
MM_func_80387F44();
congaPtr->unk28 = 2.0f;
congaPtr->actor_specific_1_f = 2.0f;
orangePtr = func_8032811C(ACTOR_14_ORANGE_PROJECTILE, conga_localPtr->orangeSpawnPosition, congaPtr->yaw);
if(orangePtr != NULL){
@@ -220,13 +220,13 @@ void func_803876D0(Actor *this){
this->unk16C_0 = 1;
this->initialized = TRUE;
this->velocity_x = 0.0f;
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
node_prop = func_80304C38(0x150, this);
((ActorLocal_Conga *)&this->local)->unk1C = nodeprop_getRadius(node_prop);
nodeprop_getPosition_s32(node_prop, &((ActorLocal_Conga *)&this->local)->unk10);
}
if(0.0f == this->unk28){
this->unk28 = (actorArray_findActorFromMarkerId(MARKER_36_ORANGE_COLLECTIBLE) != NULL)? 2.0f: 1.0f;
if(0.0f == this->actor_specific_1_f){
this->actor_specific_1_f = (actorArray_findActorFromMarkerId(MARKER_36_ORANGE_COLLECTIBLE) != NULL)? 2.0f: 1.0f;
}
if(0.0f != this->velocity_x){
this->velocity_x -= 1.0f;

8
src/MM/ch/orange.c
View File

@@ -66,7 +66,7 @@ void MM_func_80387FF4(Actor * this){
this->unk1C_y = ground_position_y;
func_8030E6D4(SFX_2F_ORANGE_SPLAT);
this->unk28 = 1.0f;
this->actor_specific_1_f = 1.0f;
this->lifetime_value = 340.0f;
this->state = 2;
}
@@ -95,10 +95,10 @@ Actor *func_80388188(ActorMarker *this, Gfx **dl, Mtx **mptr, Vtx **vtx){
position[2] = actorPtr->position_z;
modelRender_setAlpha( (s32) MIN(255.0f, actorPtr->lifetime_value) );
modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
modelRender_draw(dl, mptr, position, rotation, actorPtr->unk28, sp60, func_8030A428(0x18));
modelRender_draw(dl, mptr, position, rotation, actorPtr->actor_specific_1_f, sp60, func_8030A428(0x18));
actorPtr->position_y -= 1.9;
if(actorPtr->unk28 < 2.428){
actorPtr->unk28 += 0.1;
if(actorPtr->actor_specific_1_f < 2.428){
actorPtr->actor_specific_1_f += 0.1;
}
}
return actorPtr;