mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-05-31 01:16:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix mistakes (#672)

Browse Source
This commit is contained in:
MegaMech
2026-03-05 23:45:11 -07:00
committed by GitHub
parent ba0a24e28f
commit 89cd738955
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actors/fake_item_box/render.inc.c
+1 -1
View File
@@ -25,7 +25,7 @@ void render_actor_fake_item_box(Camera* camera, struct FakeItemBox* fakeItemBox)
f32 temp_f2_2;
f32 someMultiplier;
FrameInterpolation_RecordOpenChild("Fake Item Box", TAG_ITEM_ADDR((((struct Actor*)fakeItemBox) - gActorList) << 5) || (camera - cameras));
FrameInterpolation_RecordOpenChild("Fake Item Box", TAG_ITEM_ADDR((((struct Actor*)fakeItemBox) - gActorList) << 5) | (camera - cameras));
if (is_within_render_distance(camera->pos, fakeItemBox->pos, camera->rot[1], 2500.0f, camera->fieldOfView,
1000000.0f) < 0 &&
src/actors/item_box/render.inc.c
+1 -1
View File
@@ -27,7 +27,7 @@ void render_actor_item_box(Camera* camera, struct ItemBox* item_box) {
f32 temp_f2_2;
f32 someMultiplier;
FrameInterpolation_RecordOpenChild("itembox", TAG_ITEM_ADDR((((struct Actor*)item_box) - gActorList) << 5) || (camera - cameras));
FrameInterpolation_RecordOpenChild("itembox", TAG_ITEM_ADDR((((struct Actor*)item_box) - gActorList) << 5) | (camera - cameras));
temp_f0 = is_within_render_distance(camera->pos, item_box->pos, camera->rot[1], 0.0f, camera->fieldOfView,
4000000.0f);
src/engine/tracks/KoopaTroopaBeach.cpp
+1 -6
View File
@@ -112,11 +112,6 @@ KoopaTroopaBeach::KoopaTroopaBeach() {
Props.Skybox.FloorTopLeft = {48, 152, 120};
Props.Sequence = MusicSeq::MUSIC_SEQ_KOOPA_TROOPA_BEACH;
mVtx[0].v.ob[0] = 129; mVtx[0].v.ob[1] = 1; mVtx[0].v.ob[2] = 2257;
mVtx[1].v.ob[0] = 112; mVtx[1].v.ob[1] = 1; mVtx[1].v.ob[2] = 2298;
mVtx[2].v.ob[0] = 129; mVtx[2].v.ob[1] = 40; mVtx[2].v.ob[2] = 2257;
mVtx[3].v.ob[0] = 112; mVtx[3].v.ob[1] = 40; mVtx[3].v.ob[2] = 2298;
Props.WaterLevel = 0.0f;
gWaterVelocity = -0.1f;
WaterVolumes.push_back({0.8f, 67.0f, 239.0f, 2233.0f, 2405.0f});
@@ -136,7 +131,7 @@ void KoopaTroopaBeach::Load() {
InvertTriangleWindingByName(d_course_koopa_troopa_beach_packed_dl_2C0);
InvertTriangleWindingByName(d_course_koopa_troopa_beach_packed_dl_9E70);
}
add_vtx_from_quadrangle(mVtx, 4);
parse_track_displaylists((TrackSections*)LOAD_ASSET_RAW(d_course_koopa_troopa_beach_addr));
func_80295C6C();
find_vtx_and_set_colours((Gfx*) d_course_koopa_troopa_beach_packed_dl_ADE0, 150, 255, 255, 255);
src/engine/tracks/KoopaTroopaBeach.h
-1
View File
@@ -40,5 +40,4 @@ public:
virtual void Tick() override;
virtual void DrawTransparency(ScreenContext* screen, uint16_t pathCounter, uint16_t cameraRot, uint16_t playerDirection) override;
virtual void Destroy() override;
Vtx mVtx[4];
};
src/racing/actors.c
+4 -4
View File
@@ -547,7 +547,7 @@ void render_cows(Camera* camera, Mat4 arg1) {
arg1[3][1] = sp88[1];
arg1[3][2] = sp88[2];
FrameInterpolation_RecordOpenChild("render_actor_cow", TAG_ITEM_ADDR((i << 5) || (camera - cameras)));
FrameInterpolation_RecordOpenChild("render_actor_cow", TAG_ITEM_ADDR((i << 5) | (camera - cameras)));
if ((gMatrixObjectCount < MTX_OBJECT_POOL_SIZE) && (render_set_position(arg1, 0) != 0)) {
switch (var_s1->someId) {
@@ -684,7 +684,7 @@ void render_palm_trees(Camera* camera, Mat4 arg1) {
var_s1++;
continue;
}
FrameInterpolation_RecordOpenChild("render_palm_tree", TAG_ITEM_ADDR((i << 5) || (camera - cameras)));
FrameInterpolation_RecordOpenChild("render_palm_tree", TAG_ITEM_ADDR((i << 5) | (camera - cameras)));
test &= 0xF;
test = (s16) test;
@@ -737,7 +737,7 @@ void render_actor_shell(Camera* camera, Mat4 matrix, struct ShellActor* shell) {
char* phi_t3;
bool reverseShell = false;
FrameInterpolation_RecordOpenChild("shell", TAG_ITEM_ADDR(((( (struct Actor*)shell ) - gActorList) << 5) || (camera - cameras)));
FrameInterpolation_RecordOpenChild("shell", TAG_ITEM_ADDR(((( (struct Actor*)shell ) - gActorList) << 5) | (camera - cameras)));
f32 temp_f0 =
is_within_render_distance(camera->pos, shell->pos, camera->rot[1], 0, camera->fieldOfView, 490000.0f);
@@ -2381,7 +2381,7 @@ void render_course_actors(ScreenContext* screen) {
continue;
}
FrameInterpolation_RecordOpenChild(actor, (i << 4) || (screen - gScreenContexts));
FrameInterpolation_RecordOpenChild(actor, (i << 4) | (screen - gScreenContexts));
switch (actor->type) {
default: // Skip custom actor