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

Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable

Browse source
This commit is contained in:
MysterD 2022-05-04 00:14:42 -07:00
commit 327d97ad06
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/envfx_snow.c
View file

@ -431,7 +431,7 @@ Gfx *envfx_update_snow_internal(s32 snowMode, Vec3s marioPos, Vec3s camFrom, Vec
s16 radius, pitch, yaw; s16 radius, pitch, yaw;
Vec3s snowCylinderPos; Vec3s snowCylinderPos;
struct SnowFlakeVertex vertex1, vertex2, vertex3; struct SnowFlakeVertex vertex1, vertex2, vertex3;
Gfx *gfxStart; Gfx *gfxStart = NULL;
Gfx *gfx; Gfx *gfx;
vertex1 = gSnowFlakeVertex1; vertex1 = gSnowFlakeVertex1;
@ -455,7 +455,9 @@ Gfx *envfx_update_snow_internal(s32 snowMode, Vec3s marioPos, Vec3s camFrom, Vec
return NULL; return NULL;
} }
envfx_update_snowflake_count(snowMode, marioPos); if (!interpolated) {
envfx_update_snowflake_count(snowMode, marioPos);
}
// Note: to and from are inverted here, so the resulting vector goes towards the camera // Note: to and from are inverted here, so the resulting vector goes towards the camera
orbit_from_positions(camTo, camFrom, &radius, &pitch, &yaw); orbit_from_positions(camTo, camFrom, &radius, &pitch, &yaw);

3
src/pc/crash_handler.c
View file

@ -120,6 +120,9 @@ void render_create_dl_ortho_matrix() {
} }
static void crash_handler_produce_one_frame() { static void crash_handler_produce_one_frame() {
extern u8 gRenderingInterpolated;
gRenderingInterpolated = false;
// Start frame // Start frame
gfx_start_frame(); gfx_start_frame();
load_gfx_memory_pool(); load_gfx_memory_pool();