fixes somethigns
This commit is contained in:
@@ -490,7 +490,12 @@ Gfx *geo_switch_mario_cap_effect(s32 callContext, struct GraphNode *node, UNUSED
|
||||
struct MarioBodyState *bodyState = &gBodyStates[switchCase->numCases];
|
||||
|
||||
if (callContext == GEO_CONTEXT_RENDER) {
|
||||
switchCase->selectedCase = bodyState->modelState >> 8;
|
||||
// switchCase->selectedCase = bodyState->modelState >> 8;
|
||||
if (bodyState->modelState >> 8 >= 2){ // temporarily disables metal cap
|
||||
switchCase->selectedCase = 0;
|
||||
} else {
|
||||
switchCase->selectedCase = bodyState->modelState >> 8;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+1
-3
@@ -259,9 +259,7 @@ SM64_LIB_FN void sm64_mario_tick( int32_t marioId, const struct SM64MarioInputs
|
||||
outState->forwardVelocity = gMarioState->forwardVel;
|
||||
outState->action = gMarioState->action;
|
||||
|
||||
struct AnimInfo animInfo = gMarioState->marioObj->header.gfx.animInfo;
|
||||
outState->animID = animInfo.animID;
|
||||
outState->animFrame = animInfo.animFrame;
|
||||
outState->animInfo = &gMarioState->marioObj->header.gfx.animInfo;
|
||||
|
||||
outState->flags = gMarioState->flags;
|
||||
outState->particleFlags = gMarioState->particleFlags;
|
||||
|
||||
+1
-2
@@ -61,8 +61,7 @@ struct SM64MarioState
|
||||
float forwardVelocity;
|
||||
int16_t health;
|
||||
uint32_t action;
|
||||
int32_t animID;
|
||||
int16_t animFrame;
|
||||
struct AnimInfo* animInfo;
|
||||
uint32_t flags;
|
||||
uint32_t particleFlags;
|
||||
int16_t invincTimer;
|
||||
|
||||
Reference in New Issue
Block a user