Merge branch 'mr-origin-70'
This commit is contained in:
@@ -134,8 +134,8 @@ void chSawblade_update(Actor *this){
|
||||
f32 tmp_f2;
|
||||
f32 sp34 = time_getDelta();
|
||||
|
||||
if(!this->unk16C_4){
|
||||
this->unk16C_4 = TRUE;
|
||||
if(!this->volatile_initialized){
|
||||
this->volatile_initialized = TRUE;
|
||||
this->roll = this->yaw;
|
||||
this->yaw = 0.0f;
|
||||
marker_setCollisionScripts(this->marker, func_80389520, NULL, CC_func_8038954C);
|
||||
|
@@ -59,8 +59,8 @@ extern void chTooth_update(Actor * this){
|
||||
ActorLocal_CC_1120 * local = (ActorLocal_CC_1120 *) &this->local;
|
||||
f32 sp24[3];
|
||||
|
||||
if(!this->unk16C_4){
|
||||
this->unk16C_4 = TRUE;
|
||||
if(!this->volatile_initialized){
|
||||
this->volatile_initialized = TRUE;
|
||||
marker->propPtr->unk8_3 = 1;
|
||||
local->unk0 = &D_80389B50[(this->modelCacheIndex == ACTOR_101_CLANKER_TOKEN_TOOTH) ? 0 : 1];
|
||||
this->position[0] = local->unk0->position[0];
|
||||
|
@@ -52,8 +52,8 @@ void func_803864D4(Actor *this){
|
||||
f32 sp2C;
|
||||
f32 sin_result;
|
||||
|
||||
if(!this->unk16C_4){
|
||||
this->unk16C_4 = 1;
|
||||
if(!this->volatile_initialized){
|
||||
this->volatile_initialized = TRUE;
|
||||
marker->propPtr->unk8_3 = 1;
|
||||
CC_func_803863F0(this, 1);
|
||||
}//L80386530
|
||||
|
@@ -71,8 +71,8 @@ void func_80389900(Actor * this){
|
||||
ActorLocal_CC_3400 *local = (ActorLocal_CC_3400 *) &this->local;
|
||||
f32 sp20 = time_getDelta();
|
||||
|
||||
if(!this->unk16C_4){
|
||||
this->unk16C_4 = TRUE;
|
||||
if(!this->volatile_initialized){
|
||||
this->volatile_initialized = TRUE;
|
||||
this->marker->propPtr->unk8_3 = 1;
|
||||
local->unk0 = &D_80389E40[this->modelCacheIndex - 0x28C];
|
||||
local->unk8 = 0;
|
||||
|
@@ -91,8 +91,8 @@ void func_80386B28(Actor *this){
|
||||
|
||||
|
||||
f32 tick = time_getDelta();
|
||||
if(!this->unk16C_4){
|
||||
this->unk16C_4 = 1;
|
||||
if(!this->volatile_initialized){
|
||||
this->volatile_initialized = TRUE;
|
||||
marker_setCollisionScripts(this->marker, NULL, func_80386AD0, NULL);
|
||||
local->unk0 = func_8030D90C();
|
||||
local->unk1 = 0;
|
||||
|
@@ -74,8 +74,8 @@ void func_803870F8(Actor *this){
|
||||
f32 sp3C[3];
|
||||
|
||||
|
||||
if(!this->unk16C_4){
|
||||
this->unk16C_4 = 1;
|
||||
if(!this->volatile_initialized){
|
||||
this->volatile_initialized = TRUE;
|
||||
marker->propPtr->unk8_3 = 1;
|
||||
this->pitch = 0.0f;
|
||||
this->yaw = 0.0f;
|
||||
|
Reference in New Issue
Block a user