mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-27 19:44:40 +00:00
Code Issues Projects Releases Wiki Activity

Remove useless // clang-format off

Browse source
This commit is contained in:
Dragorn421 2022-04-09 12:33:40 +02:00
parent 32a5fe097d
commit 541def8f29
No known key found for this signature in database
GPG key ID: 8ACAE4BA399BD6B0
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/code/code_800EC960.c
View file

@ -1166,7 +1166,6 @@ OcarinaSongInfo gOcarinaSongNotes[OCARINA_SONG_MAX] = {
// Lost Woods Memory Game // Lost Woods Memory Game
{ 0, { 0, 0, 0, 0, 0, 0, 0, 0 } }, { 0, { 0, 0, 0, 0, 0, 0, 0, 0 } },
}; };
// clang-format on
/** /**
* BSS * BSS

5
src/code/code_800FD970.c
View file

@ -75,8 +75,7 @@ f32 Rand_ZeroOne_Variable(u32* rndNum) {
f32 Rand_Centered_Variable(u32* rndNum) { f32 Rand_Centered_Variable(u32* rndNum) {
u32 next = (*rndNum * 1664525) + 1013904223; u32 next = (*rndNum * 1664525) + 1013904223;
// clang-format off *rndNum = next;
*rndNum = next; sRandFloat = (next >> 9) | 0x3F800000; sRandFloat = (next >> 9) | 0x3F800000;
// clang-format on
return *((f32*)&sRandFloat) - 1.5f; return *((f32*)&sRandFloat) - 1.5f;
} }

2
src/code/graph.c
View file

@ -10,7 +10,6 @@ FaultClient sGraphFaultClient;
CfbInfo sGraphCfbInfos[3]; CfbInfo sGraphCfbInfos[3];
FaultClient sGraphUcodeFaultClient; FaultClient sGraphUcodeFaultClient;
// clang-format off
UCodeInfo D_8012D230[3] = { UCodeInfo D_8012D230[3] = {
{ UCODE_F3DZEX, D_80155F50 }, { UCODE_F3DZEX, D_80155F50 },
{ UCODE_UNK, NULL }, { UCODE_UNK, NULL },
@ -22,7 +21,6 @@ UCodeInfo D_8012D248[3] = {
{ UCODE_UNK, NULL }, { UCODE_UNK, NULL },
{ UCODE_S2DEX, D_80113070 }, { UCODE_S2DEX, D_80113070 },
}; };
// clang-format on
void Graph_FaultClient(void) { void Graph_FaultClient(void) {
void* nextFb = osViGetNextFramebuffer(); void* nextFb = osViGetNextFramebuffer();

11
src/code/z_en_a_keep.c
View file

@ -139,9 +139,9 @@ void EnAObj_Init(Actor* thisx, GlobalContext* globalCtx) {
EnAObj_SetupBlockRot(this, thisx->params); EnAObj_SetupBlockRot(this, thisx->params);
break; break;
case A_OBJ_UNKNOWN_6: case A_OBJ_UNKNOWN_6:
// clang-format off this->focusYoffset = 10.0f;
thisx->flags |= ACTOR_FLAG_0; this->dyna.bgId = 5; this->focusYoffset = 10.0f; thisx->flags |= ACTOR_FLAG_0;
// clang-format on this->dyna.bgId = 5;
thisx->gravity = -2.0f; thisx->gravity = -2.0f;
EnAObj_SetupWaitTalk(this, thisx->params); EnAObj_SetupWaitTalk(this, thisx->params);
break; break;
@ -153,9 +153,8 @@ void EnAObj_Init(Actor* thisx, GlobalContext* globalCtx) {
case A_OBJ_SIGNPOST_OBLONG: case A_OBJ_SIGNPOST_OBLONG:
case A_OBJ_SIGNPOST_ARROW: case A_OBJ_SIGNPOST_ARROW:
thisx->textId = (this->textId & 0xFF) | 0x300; thisx->textId = (this->textId & 0xFF) | 0x300;
// clang-format off thisx->targetArrowOffset = 500.0f;
thisx->flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3; thisx->targetArrowOffset = 500.0f; thisx->flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3;
// clang-format on
this->focusYoffset = 45.0f; this->focusYoffset = 45.0f;
EnAObj_SetupWaitTalk(this, thisx->params); EnAObj_SetupWaitTalk(this, thisx->params);
Collider_InitCylinder(globalCtx, &this->collider); Collider_InitCylinder(globalCtx, &this->collider);