diff --git a/src/projectile.c b/src/projectile.c index a25a98f8..061d3caa 100644 --- a/src/projectile.c +++ b/src/projectile.c @@ -356,8 +356,6 @@ void delete_projectiles(ProjectileList *projlist) { } void calc_projectile_collision(Projectile *p, ProjCollisionResult *out_col) { - assert(out_col != NULL); - out_col->type = PCOL_NONE; out_col->entity = NULL; out_col->fatal = false; diff --git a/src/renderer/gl33/gl33.c b/src/renderer/gl33/gl33.c index 2e430456..98be9f03 100644 --- a/src/renderer/gl33/gl33.c +++ b/src/renderer/gl33/gl33.c @@ -429,7 +429,7 @@ static void gl33_sync_magic_uniforms(void) { r_uniform_mat4(u[UMAGIC_MATRIX_PROJ], *_r_matrices.projection.head); r_uniform_mat4(u[UMAGIC_MATRIX_TEX], *_r_matrices.texture.head); r_uniform_vec4_rgba(u[UMAGIC_COLOR], &R.color); - r_uniform_vec4_vec(u[UMAGIC_VIEWPORT], &R.viewport.active.x); + r_uniform_vec4_vec(u[UMAGIC_VIEWPORT], (float*)&R.viewport.active); int num_color_out; diff --git a/src/replay/replay.c b/src/replay/replay.c index 41c8847b..178d9ab3 100644 --- a/src/replay/replay.c +++ b/src/replay/replay.c @@ -121,7 +121,6 @@ bool replay_load_syspath(Replay *rpy, const char *path, ReplayReadMode mode) { } int replay_find_stage_idx(Replay *rpy, uint8_t stageid) { - assert(rpy != NULL); assert(rpy->stages != NULL); for(int i = 0; i < rpy->numstages; ++i) { diff --git a/src/replay/stage.c b/src/replay/stage.c index 0f9aca1f..da64c1c1 100644 --- a/src/replay/stage.c +++ b/src/replay/stage.c @@ -74,8 +74,6 @@ void replay_stage_sync_player_state(ReplayStage *stg, Player *plr) { } void replay_stage_event(ReplayStage *stg, uint32_t frame, uint8_t type, uint16_t value) { - assert(stg != NULL); - dynarray_size_t old_capacity = stg->events.capacity; ReplayEvent *e = dynarray_append(&stg->events);