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

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

This commit is contained in:
MysterD 2023-11-06 23:29:01 -08:00
parent f3323550bd 802089f790
commit 076dc9f602
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/personal-starcount-ex.lua
View File

@ -122,7 +122,7 @@ local function set_hud_star_positions(m, height, width)
-- Move HUD graphics away from the TIMER HUD
if timer_current_value ~= 0 then
timer_offset_X = 60
timer_offset_Y = 17
timer_offset_Y = -17
end
star_counter_offset_X = is_in_cutscenes[m.action] and 22 or 76
@ -173,7 +173,7 @@ local function set_hud_star_positions(m, height, width)
-- Move HUD graphics away from the TIMER HUD
if timer_current_value ~= 0 then
timer_offset_X = 0
timer_offset_Y = -10
timer_offset_Y = 12
end
star_counter_offset_X = 76

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;
s8 room = 0;
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);
*data += 1;
@ -407,7 +407,7 @@ static void load_static_surfaces(s16 **data, s16 *vertexData, s16 surfaceType, s
if (surface != NULL) {
surface->room = room;
surface->type = surfaceType;
surface->flags = (s8) flags;
surface->flags = flags;
if (hasForce) {
surface->force = *(*data + 3);
@ -671,7 +671,7 @@ void load_object_surfaces(s16** data, s16* vertexData) {
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;
// The DDD warp is initially loaded at the origin and moved to the proper