summaryrefslogtreecommitdiff
path: root/src/engine/objects/Seagull.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/objects/Seagull.cpp')
-rw-r--r--src/engine/objects/Seagull.cpp48
1 files changed, 23 insertions, 25 deletions
diff --git a/src/engine/objects/Seagull.cpp b/src/engine/objects/Seagull.cpp
index 17c35c07d..0a32d1ee8 100644
--- a/src/engine/objects/Seagull.cpp
+++ b/src/engine/objects/Seagull.cpp
@@ -49,7 +49,6 @@ OSeagull::OSeagull(FVector pos) {
init_object(_objectIndex, 0);
-
set_obj_origin_pos(_objectIndex, pos.x, pos.y, pos.z);
if (_idx < (NUM_SEAGULLS / 2)) {
gObjectList[_objectIndex].unk_0D5 = 0;
@@ -64,32 +63,32 @@ void OSeagull::Tick() {
Object* object;
s32 objectIndex = _objectIndex;
- object = &gObjectList[objectIndex];
- if (object->state == 0) {
- return;
- }
+ object = &gObjectList[objectIndex];
+ if (object->state == 0) {
+ return;
+ }
- OSeagull::func_80082714(objectIndex, _idx);
- OSeagull::func_8008275C(objectIndex);
- if (func_80072320(objectIndex, 2) != 0) {
- func_800722CC(objectIndex, 2);
- if (D_80165A90 != 0) {
- D_80165A90 = 0;
- D_80183E40[0] = 0.0f;
- D_80183E40[1] = 0.0f;
- D_80183E40[2] = 0.0f;
- if (gGamestate != CREDITS_SEQUENCE) {
- func_800C98B8(object->pos, D_80183E40, SOUND_ARG_LOAD(0x19, 0x01, 0x70, 0x43));
- } else {
- if (_idx == 1) {
- if (gCutsceneShotTimer <= 150) {
- object = &gObjectList[_objectIndex];
- func_800C98B8(object->pos, D_80183E40, SOUND_ARG_LOAD(0x19, 0x01, 0x70, 0x43));
- }
+ OSeagull::func_80082714(objectIndex, _idx);
+ OSeagull::func_8008275C(objectIndex);
+ if (func_80072320(objectIndex, 2) != 0) {
+ func_800722CC(objectIndex, 2);
+ if (D_80165A90 != 0) {
+ D_80165A90 = 0;
+ D_80183E40[0] = 0.0f;
+ D_80183E40[1] = 0.0f;
+ D_80183E40[2] = 0.0f;
+ if (gGamestate != CREDITS_SEQUENCE) {
+ func_800C98B8(object->pos, D_80183E40, SOUND_ARG_LOAD(0x19, 0x01, 0x70, 0x43));
+ } else {
+ if (_idx == 1) {
+ if (gCutsceneShotTimer <= 150) {
+ object = &gObjectList[_objectIndex];
+ func_800C98B8(object->pos, D_80183E40, SOUND_ARG_LOAD(0x19, 0x01, 0x70, 0x43));
}
}
}
}
+ }
//}
if (D_80165900 != 0) {
D_80165900 -= 1;
@@ -122,7 +121,7 @@ void OSeagull::func_800552BC(s32 objectIndex) {
if (gObjectList[objectIndex].state >= 2) {
rsp_set_matrix_transformation(gObjectList[objectIndex].pos, gObjectList[objectIndex].direction_angle,
gObjectList[objectIndex].sizeScaling);
- gSPDisplayList(gDisplayListHead++, (Gfx*)D_0D0077D0);
+ gSPDisplayList(gDisplayListHead++, (Gfx*) D_0D0077D0);
if (gIsGamePaused == 0) {
gObjectList[objectIndex].unk_0A2 = render_animated_model((Armature*) gObjectList[objectIndex].model,
(Animation**) gObjectList[objectIndex].vertex, 0,
@@ -180,7 +179,6 @@ void OSeagull::func_8008241C(s32 objectIndex, s32 arg1) {
object_next_state(objectIndex);
}
-
void OSeagull::func_80082714(s32 objectIndex, s32 arg1) {
switch (gObjectList[objectIndex].state) {
case 1:
@@ -190,4 +188,4 @@ void OSeagull::func_80082714(s32 objectIndex, s32 arg1) {
default:
break;
}
-} \ No newline at end of file
+}