mirror of
https://github.com/zeldaret/oot.git
synced 2025-05-12 03:53:47 +00:00
Fixed minor style inconsistencies for CollisionCheckInfoInit (#1603)
This commit is contained in:
parent
25ff0a27de
commit
dcab429bf2
7 changed files with 7 additions and 19 deletions
|
@ -62,9 +62,7 @@ static ColliderJntSphInit sJntSphInit = {
|
||||||
sJntSphElementsInit,
|
sJntSphElementsInit,
|
||||||
};
|
};
|
||||||
|
|
||||||
static CollisionCheckInfoInit2 sColChkInfoInit2 = {
|
static CollisionCheckInfoInit2 sColChkInfoInit2 = { 1, 2, 25, 25, MASS_IMMOVABLE };
|
||||||
1, 2, 25, 25, MASS_IMMOVABLE,
|
|
||||||
};
|
|
||||||
|
|
||||||
static Vec3f sEffectAccel = { 0.0f, -0.5f, 0.0f };
|
static Vec3f sEffectAccel = { 0.0f, -0.5f, 0.0f };
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ static ColliderCylinderInit sCylinderInit = {
|
||||||
{ 18, 32, 0, { 0, 0, 0 } },
|
{ 18, 32, 0, { 0, 0, 0 } },
|
||||||
};
|
};
|
||||||
|
|
||||||
static CollisionCheckInfoInit sColChkInfoInit = { 0x01, 0x0012, 0x0020, MASS_IMMOVABLE };
|
static CollisionCheckInfoInit sColChkInfoInit = { 1, 18, 32, MASS_IMMOVABLE };
|
||||||
|
|
||||||
static DamageTable sDamageTable = {
|
static DamageTable sDamageTable = {
|
||||||
/* Deku nut */ DMG_ENTRY(0, 0x1),
|
/* Deku nut */ DMG_ENTRY(0, 0x1),
|
||||||
|
|
|
@ -54,9 +54,7 @@ static ColliderCylinderInit sCylinderInit = {
|
||||||
{ 20, 46, 0, { 0, 0, 0 } },
|
{ 20, 46, 0, { 0, 0, 0 } },
|
||||||
};
|
};
|
||||||
|
|
||||||
static CollisionCheckInfoInit2 sColChkInfoInit = {
|
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
|
||||||
0, 0, 0, 0, MASS_IMMOVABLE,
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
/* 0 */ ENDU_ANIM_0,
|
/* 0 */ ENDU_ANIM_0,
|
||||||
|
|
|
@ -66,9 +66,7 @@ static ColliderCylinderInit sCylinderInit = {
|
||||||
{ 20, 46, 0, { 0, 0, 0 } },
|
{ 20, 46, 0, { 0, 0, 0 } },
|
||||||
};
|
};
|
||||||
|
|
||||||
static CollisionCheckInfoInit2 sColChkInfoInit = {
|
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
|
||||||
0, 0, 0, 0, MASS_IMMOVABLE,
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
/* 0 */ ENGO_ANIM_0,
|
/* 0 */ ENGO_ANIM_0,
|
||||||
|
|
|
@ -92,9 +92,7 @@ static ColliderCylinderInit sCylinderInit = {
|
||||||
{ 40, 65, 0, { 0, 0, 0 } },
|
{ 40, 65, 0, { 0, 0, 0 } },
|
||||||
};
|
};
|
||||||
|
|
||||||
static CollisionCheckInfoInit2 sColChkInfoInit = {
|
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
|
||||||
0, 0, 0, 0, MASS_IMMOVABLE,
|
|
||||||
};
|
|
||||||
|
|
||||||
ActorInit En_Go2_InitVars = {
|
ActorInit En_Go2_InitVars = {
|
||||||
/**/ ACTOR_EN_GO2,
|
/**/ ACTOR_EN_GO2,
|
||||||
|
|
|
@ -56,9 +56,7 @@ static ColliderCylinderInit sCylinderInit = {
|
||||||
{ 18, 46, 0, { 0, 0, 0 } },
|
{ 18, 46, 0, { 0, 0, 0 } },
|
||||||
};
|
};
|
||||||
|
|
||||||
static CollisionCheckInfoInit2 sColChkInfoInit = {
|
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
|
||||||
0, 0, 0, 0, MASS_IMMOVABLE,
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
/* 0 */ ENIN_ANIM_0,
|
/* 0 */ ENIN_ANIM_0,
|
||||||
|
|
|
@ -65,9 +65,7 @@ static ColliderCylinderInit sCylinderInit = {
|
||||||
{ 20, 46, 0, { 0, 0, 0 } },
|
{ 20, 46, 0, { 0, 0, 0 } },
|
||||||
};
|
};
|
||||||
|
|
||||||
static CollisionCheckInfoInit2 sColChkInfoInit = {
|
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
|
||||||
0, 0, 0, 0, MASS_IMMOVABLE,
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
/* 0 */ ENSA_ANIM1_0,
|
/* 0 */ ENSA_ANIM1_0,
|
||||||
|
|
Loading…
Add table
Reference in a new issue