diff options
| author | MegaMech <7255464+MegaMech@users.noreply.github.com> | 2024-12-30 20:39:31 -0700 |
|---|---|---|
| committer | MegaMech <7255464+MegaMech@users.noreply.github.com> | 2024-12-30 20:39:31 -0700 |
| commit | 7ee714e4e93609a5dbf1dc648df0ce504e3d7284 (patch) | |
| tree | e63c623057b555fedd3d017b5d6c34d12de31098 /src/engine/Smoke.cpp | |
| parent | 41fb92b7b989290947d8f39c442219afe12d0215 (diff) | |
| parent | 57afb90c3901b4c5dc586f1be3f6604c52c423d6 (diff) | |
Merge branch 'next' of https://github.com/MegaMech/SpaghettiKart into next
Diffstat (limited to 'src/engine/Smoke.cpp')
| -rw-r--r-- | src/engine/Smoke.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/Smoke.cpp b/src/engine/Smoke.cpp index 9d74397dc..9841bfffb 100644 --- a/src/engine/Smoke.cpp +++ b/src/engine/Smoke.cpp @@ -24,7 +24,7 @@ void TrainSmokeTick() { Object* object; for (auto& vehicle : gWorldInstance.Vehicles) { - if (auto train = dynamic_cast<ATrain*>(vehicle.get())) { + if (auto train = dynamic_cast<ATrain*>(vehicle)) { if (train->SmokeTimer != 0) { train->SmokeTimer -= 1; } @@ -48,7 +48,7 @@ void TrainSmokeTick() { train->SmokeTimer = 100; } } - } else if (auto boat = dynamic_cast<ABoat*>(vehicle.get())) { + } else if (auto boat = dynamic_cast<ABoat*>(vehicle)) { if (boat->SmokeTimer != 0) { boat->SmokeTimer -= 1; } @@ -79,7 +79,7 @@ void TrainSmokeTick() { void TrainSmokeDraw(s32 cameraId) { Camera* camera = &camera1[cameraId]; for (auto& vehicle : gWorldInstance.Vehicles) { - if (auto train = dynamic_cast<ATrain*>(vehicle.get())) { + if (auto train = dynamic_cast<ATrain*>(vehicle)) { gSPDisplayList(gDisplayListHead++, (Gfx*)D_0D007AE0); load_texture_block_i8_nomirror((uint8_t*)D_0D029458, 32, 32); func_8004B72C(255, 255, 255, 255, 255, 255, 255); @@ -92,7 +92,7 @@ void TrainSmokeDraw(s32 cameraId) { render_object_train_smoke_particle(train->SmokeParticles[i], cameraId); } } - } else if (auto boat = dynamic_cast<ABoat*>(vehicle.get())) { + } else if (auto boat = dynamic_cast<ABoat*>(vehicle)) { gSPDisplayList(gDisplayListHead++, (Gfx*)D_0D007AE0); load_texture_block_i8_nomirror((uint8_t*)D_0D029458, 32, 32); |