mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-05-23 15:02:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Palm Tree Interp (#675)

Browse Source 
* Update actors.c

* Update actors.c

* Update SkyCloud.cpp

* Update render_objects.c
This commit is contained in:
MegaMech
2026-03-09 18:43:17 -06:00
committed by GitHub
parent 132357d9fb
commit d16bdd75b1
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/sky/SkyCloud.cpp
+8 -8
View File
@@ -28,22 +28,22 @@ SkyCloud::SkyCloud(ScreenContext* screen, u16 cloudVariant, u16 posY, u16 rotY,
mRotY = rotY;
mScale = (f32) scalePercent / 100.0;
// Stock
if (GameEngine_ResourceGetTexTypeByName((const char*)CM_GetProps()->CloudTexture) != 1) {
mTexture = ((u8*) LOAD_ASSET_RAW(CM_GetProps()->CloudTexture)) + (cloudVariant * 1024);
mTextureWidth = 64;
mTextureHeight = 32;
mVtx = (Vtx*)D_0D005FB0;
} else {
} else { // Texture pack
mTexture = CM_GetProps()->CloudTexture;
if (strcmp((const char*)CM_GetProps()->CloudTexture, gTextureExhaust0) == 0 ||
if ((strcmp((const char*)CM_GetProps()->CloudTexture, gTextureExhaust3) == 0) ||
(strcmp((const char*)CM_GetProps()->CloudTexture, gTextureExhaust4) == 0) ||
(strcmp((const char*)CM_GetProps()->CloudTexture, gTextureExhaust5) == 0)) {
mVtx = cloudvtx[cloudVariant];
} else if (strcmp((const char*)CM_GetProps()->CloudTexture, gTextureExhaust0) == 0 ||
strcmp((const char*)CM_GetProps()->CloudTexture, gTextureExhaust1) == 0 ||
strcmp((const char*)CM_GetProps()->CloudTexture, gTextureExhaust2) == 0) {
mTextureWidth = 64;
mTextureHeight = 32;
mVtx = cloudvtx2[cloudVariant];
} else {
mTextureWidth = 64;
mTextureHeight = 32;
mVtx = cloudvtx2[cloudVariant];
}
}
src/racing/actors.c
+3
View File
@@ -568,6 +568,7 @@ void render_cows(Camera* camera, Mat4 arg1) {
break;
}
} else {
FrameInterpolation_RecordCloseChild();
return;
}
@@ -691,6 +692,7 @@ void render_palm_trees(Camera* camera, Mat4 arg1) {
if (test == 6) {
mtxf_pos_rotation_xyz(sp90, spD4, sp88);
if (!(gMatrixObjectCount < MTX_OBJECT_POOL_SIZE)) {
FrameInterpolation_RecordCloseChild();
break;
}
render_set_position(sp90, 0);
@@ -718,6 +720,7 @@ void render_palm_trees(Camera* camera, Mat4 arg1) {
break;
}
} else {
FrameInterpolation_RecordCloseChild();
break;
}
var_s1++;
src/render_objects.c
+1 -1
View File
@@ -3502,7 +3502,7 @@ void func_80051C60(ScreenContext* screen, s16 arg0, s32 arg1) {
D_8018D228 = 0xFF;
gSPDisplayList(gDisplayListHead++, D_0D007A60);
DrawSkyActors(screen, arg0);
DrawSkyActors(screen, var_s5);
}
void func_80051EBC(ScreenContext* screen) {