mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-21 14:31:17 +00:00
Fix a number of warnings when compiling with GCC (#1239)
* Silence a number of GCC warnings * Remove * Suggested changes * Format * Fix comment in en_go2
This commit is contained in:
parent
5015af4c57
commit
451b24f79b
71 changed files with 298 additions and 86 deletions
|
@ -789,6 +789,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play) {
|
|||
this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f22);
|
||||
this->unk_150[i].unk_23 = 0;
|
||||
this->unk_150[i].unk_22++;
|
||||
FALLTHROUGH;
|
||||
case 1:
|
||||
if (this->actor.params == DEMOKANKYO_WARP_OUT) {
|
||||
if (func_800BB2B4(&camPos, &sWarpRoll, &sWarpFoV, sWarpOutCameraPoints, &this->unk_150[i].unk_20,
|
||||
|
@ -834,6 +835,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play) {
|
|||
case 0:
|
||||
this->unk_150[i].unk_18 = Rand_ZeroOne();
|
||||
this->unk_150[i].unk_23++;
|
||||
FALLTHROUGH;
|
||||
case 1:
|
||||
Math_SmoothStepToF(&this->unk_150[i].unk_18, 1.0f, 0.5f, 0.4f, 0.2f);
|
||||
if (this->unk_150[i].unk_18 >= 1.0f) {
|
||||
|
@ -927,6 +929,7 @@ void DemoKankyo_DrawSparkles(Actor* thisx, PlayState* play) {
|
|||
this->unk_150[i].unk_0.z = (s16)((Rand_ZeroOne() - 0.5f) * 16.0f * temp_f20);
|
||||
this->unk_150[i].unk_23 = 0;
|
||||
this->unk_150[i].unk_22++;
|
||||
FALLTHROUGH;
|
||||
case 1:
|
||||
if (func_800BB2B4(&camPos, &sSparklesRoll, &sSparklesFoV, sSparklesCameraPoints,
|
||||
&this->unk_150[i].unk_20, &this->unk_150[i].unk_1C) != 0) {
|
||||
|
@ -950,6 +953,7 @@ void DemoKankyo_DrawSparkles(Actor* thisx, PlayState* play) {
|
|||
case 0:
|
||||
this->unk_150[i].unk_18 = Rand_ZeroOne();
|
||||
this->unk_150[i].unk_23++;
|
||||
FALLTHROUGH;
|
||||
case 1:
|
||||
Math_SmoothStepToF(&this->unk_150[i].unk_18, 1.0f, 0.5f, 0.4f, 0.2f);
|
||||
if (1.0f <= this->unk_150[i].unk_18) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue