etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 03:55:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add geo_update_layer_transparency param 30 for not setting anim state

Browse source
This commit is contained in:
Agent X 2024-06-21 12:32:24 -04:00
parent 7a38540211
commit 807996c225
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/object_helpers.c
View file

@ -75,7 +75,7 @@ Gfx *geo_update_layer_transparency(s32 callContext, struct GraphNode *node, UNUS
dlStart = NULL;
if (callContext == GEO_CONTEXT_RENDER) {
objectGraphNode = (struct Object *) gCurGraphNodeObject; // TODO: change this to object pointer?
objectGraphNode = (struct Object *) gCurGraphNodeObject;
currentGraphNode = (struct GraphNodeGenerated *) node;
sp2C = (struct GraphNodeGenerated *) node;
@ -98,7 +98,9 @@ Gfx *geo_update_layer_transparency(s32 callContext, struct GraphNode *node, UNUS
0x100 | (currentGraphNode->fnNode.node.flags & 0xFF);
}
objectGraphNode->oAnimState = 0;
if (currentGraphNode->parameter != 30) {
objectGraphNode->oAnimState = 0;
}
} else {
if (currentGraphNode->parameter == 20) {
currentGraphNode->fnNode.node.flags =
@ -108,7 +110,9 @@ Gfx *geo_update_layer_transparency(s32 callContext, struct GraphNode *node, UNUS
0x500 | (currentGraphNode->fnNode.node.flags & 0xFF);
}
objectGraphNode->oAnimState = 1;
if (currentGraphNode->parameter != 30) {
objectGraphNode->oAnimState = 1;
}
#ifdef VERSION_JP
if (currentGraphNode->parameter == 10) {

3
src/pc/network/network.c
View file

@ -30,6 +30,7 @@
#include "menu/intro_geo.h"
#include "game/ingame_menu.h"
#include "game/first_person_cam.h"
#include "game/envfx_snow.h"
#ifdef DISCORD_SDK
#include "pc/discord/discord.h"
@ -679,7 +680,7 @@ void network_shutdown(bool sendLeaving, bool exiting, bool popup, bool reconnect
gFogColor[2] = 255;
gFogIntensity = 1;
gOverrideBackground = -1;
gOverrideEnvFx = -1;
gOverrideEnvFx = ENVFX_MODE_NO_OVERRIDE;
gRomhackCameraAllowCentering = TRUE;
gOverrideAllowToxicGasCamera = FALSE;
gRomhackCameraAllowDpad = FALSE;