mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-25 13:35:12 +00:00
Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable
This commit is contained in:
commit
327d97ad06
2 changed files with 7 additions and 2 deletions
|
@ -431,7 +431,7 @@ Gfx *envfx_update_snow_internal(s32 snowMode, Vec3s marioPos, Vec3s camFrom, Vec
|
|||
s16 radius, pitch, yaw;
|
||||
Vec3s snowCylinderPos;
|
||||
struct SnowFlakeVertex vertex1, vertex2, vertex3;
|
||||
Gfx *gfxStart;
|
||||
Gfx *gfxStart = NULL;
|
||||
Gfx *gfx;
|
||||
|
||||
vertex1 = gSnowFlakeVertex1;
|
||||
|
@ -455,7 +455,9 @@ Gfx *envfx_update_snow_internal(s32 snowMode, Vec3s marioPos, Vec3s camFrom, Vec
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if (!interpolated) {
|
||||
envfx_update_snowflake_count(snowMode, marioPos);
|
||||
}
|
||||
|
||||
// Note: to and from are inverted here, so the resulting vector goes towards the camera
|
||||
orbit_from_positions(camTo, camFrom, &radius, &pitch, &yaw);
|
||||
|
|
|
@ -120,6 +120,9 @@ void render_create_dl_ortho_matrix() {
|
|||
}
|
||||
|
||||
static void crash_handler_produce_one_frame() {
|
||||
extern u8 gRenderingInterpolated;
|
||||
gRenderingInterpolated = false;
|
||||
|
||||
// Start frame
|
||||
gfx_start_frame();
|
||||
load_gfx_memory_pool();
|
||||
|
|
Loading…
Reference in a new issue