mirror of
https://github.com/HarbourMasters/Starship
synced 2026-06-21 08:51:44 -04:00
corrections
This commit is contained in:
@@ -285,11 +285,11 @@ ObjectInfo gObjectInfo[] = {
|
||||
/* OBJ_ACTOR_DEBRIS */ {(void*) ActorDebris_Draw, 1, (ObjectFunc) ActorDebris_Update, gNoHitbox, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_MISSILE_SEEK_TEAM */ {(void*) ActorMissileSeek_Draw, 1, (ObjectFunc) ActorMissileSeek_Update, gActorMissileSeekHitbox, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
|
||||
/* OBJ_MISSILE_SEEK_PLAYER */ {(void*) ActorMissileSeek_Draw, 1, (ObjectFunc) ActorMissileSeek_Update, gActorMissileSeekHitbox, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_CO_SKIBOT */ {(void*) ActorSkibot_Draw, 1, (ObjectFunc) ActorSkibot_Update, aCoActorSkibotHitbox, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
|
||||
/* OBJ_ACTOR_CO_RADAR */ {(void*) ActorRadar_Draw, 1, (ObjectFunc) ActorRadar_Update, aCoActorRadarHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_CO_SKIBOT */ {(void*) CoSkibot_Draw, 1, (ObjectFunc) CoSkibot_Update, aCoActorSkibotHitbox, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
|
||||
/* OBJ_ACTOR_CO_RADAR */ {(void*) CoRadar_Draw, 1, (ObjectFunc) CoRadar_Update, aCoActorRadarHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_ME_MORA */ {(void*) MeMora_Draw, 1, (ObjectFunc) MeMora_Update, gMeMoraHitbox, 200.0f, 0, 1, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_CUTSCENE */ {(void*) ActorCutscene_Draw, 1, (ObjectFunc) ActorCutscene_Update, gNoHitbox, 20000.0f, 0, 1, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_CO_MOLE_MISSILE */ {(void*) ActorMoleMissile_Draw, 1, (ObjectFunc) ActorMoleMissile_Update, aCoMoleMissileHitbox, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_CO_MOLE_MISSILE */ {(void*) CoMoleMissile_Draw, 1, (ObjectFunc) CoMoleMissile_Update, aCoMoleMissileHitbox, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ALLRANGE */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorAllRange_Update, gActorAllRangeHItbox, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_TEAM_BOSS */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorTeamBoss_Update, gTeamHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_199 */ {(void*) Andross_Actor199_Draw, 1, (ObjectFunc) Andross_Actor199_Update, gNoHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
|
||||
|
||||
+236
-87
File diff suppressed because it is too large
Load Diff
@@ -1780,7 +1780,7 @@ void Actor_Despawn(Actor* this) {
|
||||
}
|
||||
}
|
||||
|
||||
void ActorSkibot_Update(ActorSkibot* this) {
|
||||
void CoSkibot_Update(CoSkibot* this) {
|
||||
this->gravity = 0.4f;
|
||||
|
||||
if (this->obj.pos.y <= gGroundHeight + 130.0f) {
|
||||
@@ -1848,7 +1848,7 @@ void ActorSkibot_Update(ActorSkibot* this) {
|
||||
}
|
||||
}
|
||||
|
||||
void func_enmy_8006684C(ActorSkibot* this) {
|
||||
void func_enmy_8006684C(CoSkibot* this) {
|
||||
s32 pad;
|
||||
|
||||
if (this->timer_0BE != 0) {
|
||||
@@ -1874,7 +1874,7 @@ void func_enmy_8006684C(ActorSkibot* this) {
|
||||
}
|
||||
}
|
||||
|
||||
void ActorRadar_Update(CoRadar* this) {
|
||||
void CoRadar_Update(CoRadar* this) {
|
||||
if (this->timer_0BC != 0) {
|
||||
if (this->timer_0BC == 1) {
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
|
||||
@@ -396,7 +396,7 @@ void func_enmy2_8006BB1C(f32 xPos, f32 yPos, f32 zPos) {
|
||||
}
|
||||
}
|
||||
|
||||
void ActorMoleMissile_Update(ActorMoleMissile* this) {
|
||||
void CoMoleMissile_Update(CoMoleMissile* this) {
|
||||
Vec3f sp44;
|
||||
|
||||
switch (this->state) {
|
||||
|
||||
Reference in New Issue
Block a user