Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix camera bug introduced by a previous PR (#505) 

* Fix camera bug introduced by a previous PR

* Readjust camera collision code
This commit is contained in:
Sunk 2023-11-06 01:40:05 -05:00 committed by GitHub
parent cec1d3de73
commit 375639e849
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/engine/surface_load.c
View File

@ -392,7 +392,7 @@ static void load_static_surfaces(s16 **data, s16 *vertexData, s16 surfaceType, s
struct Surface *surface; struct Surface *surface;
s8 room = 0; s8 room = 0;
bool hasForce = surface_has_force(surfaceType); bool hasForce = surface_has_force(surfaceType);
bool flags = surf_has_no_cam_collision(surfaceType); s8 flags = surf_has_no_cam_collision(surfaceType) ? SURFACE_FLAG_NO_CAM_COLLISION : 0;
numSurfaces = *(*data); numSurfaces = *(*data);
*data += 1; *data += 1;
@ -407,7 +407,7 @@ static void load_static_surfaces(s16 **data, s16 *vertexData, s16 surfaceType, s
if (surface != NULL) { if (surface != NULL) {
surface->room = room; surface->room = room;
surface->type = surfaceType; surface->type = surfaceType;
surface->flags = (s8) flags; surface->flags = flags;
if (hasForce) { if (hasForce) {
surface->force = *(*data + 3); surface->force = *(*data + 3);
@ -671,7 +671,7 @@ void load_object_surfaces(s16** data, s16* vertexData) {
hasForce = surface_has_force(surfaceType); hasForce = surface_has_force(surfaceType);
flags = surf_has_no_cam_collision(surfaceType); flags = surf_has_no_cam_collision(surfaceType) ? SURFACE_FLAG_NO_CAM_COLLISION : 0;
flags |= SURFACE_FLAG_DYNAMIC; flags |= SURFACE_FLAG_DYNAMIC;
// The DDD warp is initially loaded at the origin and moved to the proper // The DDD warp is initially loaded at the origin and moved to the proper