mirror of
https://github.com/zeldaret/st
synced 2026-09-03 18:03:52 -04:00
Misc Stuff 6 (#78)
* gcc fixes * document random things in UnkStruct_027e09b8_00 * match func_ov001_020ba670 and rabbit docs * match func_ov026_0211f394 * fix build issues * match func_ov026_0211e3e0 * match func_ov026_02102924 * move structs to header * document train rope thing * MapObject OK and ActorRef stuff * match more actor funcs * fix regressions * fix build issues * more regressions fixes * name keyt grab func * UnkSubStruct19 -> CellAnimObject (based on the only assert string) * fix build issues due to merge * Actor::mUnk_4C -> Actor::mState + related changes * create GetActorPtr template inline for Actor_c4 * ActorUnk_ov000_020a8bb0 -> Actor_Derived1 * actor: add comments about mUnk_50/52 and change type of mAngle
This commit is contained in:
@@ -21,7 +21,7 @@ struct UnkStruct_ov031_02117c84 {
|
||||
|
||||
static const Vec2pCpp data_ov031_02115830(0x800, 0x800);
|
||||
static const UnkStruct_ov031_02117c84 data_ov031_02117c84(0x3C);
|
||||
static const UnkSubStruct19 data_ov031_02115c84;
|
||||
static const CellAnimObject data_ov031_02115c84;
|
||||
|
||||
ARM MapObjectTreasureSpawned_74::MapObjectTreasureSpawned_74(G3d_Model *param1) :
|
||||
ModelRender(param1),
|
||||
|
||||
@@ -486,8 +486,8 @@ ARM void MapObjectDoorBase::vfunc_5C(unk32 param1, unk32 param2) {
|
||||
this->vfunc_7C();
|
||||
|
||||
if (this->mUnk_8A && this->mUnk_86 && param2 == 0) {
|
||||
unk32 var_r5 = 1;
|
||||
unk32 var_r1_2 = 2;
|
||||
u16 var_r5 = 1;
|
||||
s16 var_r1_2 = 2;
|
||||
|
||||
if (this->IsOrientedVertically()) {
|
||||
var_r1_2 = -1;
|
||||
@@ -498,7 +498,7 @@ ARM void MapObjectDoorBase::vfunc_5C(unk32 param1, unk32 param2) {
|
||||
}
|
||||
|
||||
if (this->mUnk_87) {
|
||||
unk32 sp8;
|
||||
ActorRef sp8;
|
||||
MapObject::func_ov000_0209d54c(&sp8, this, 1, &this->mPos, var_r1_2, var_r5);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user