Brought in changes needed for ps2

This commit is contained in:
Carlos Sanchez 2024-09-07 00:38:59 -04:00
parent a1be233d45
commit 5c58a436aa
2 changed files with 5 additions and 1 deletions

@ -1 +1 @@
Subproject commit d0d225aca5b36332e145f8cc9ee5b5c407acbe45 Subproject commit 317393d033bc5220e527ea6b35330924831dc7bc

4
maze.c
View File

@ -473,6 +473,7 @@ void sys_world(ecs_world *w, mecs **ecs) {
w->state->maze[m.x + m.y * w->state->size] |= MAZEFLIP; w->state->maze[m.x + m.y * w->state->size] |= MAZEFLIP;
SKIPFLIPPOLYADD:; SKIPFLIPPOLYADD:;
} }
haloo3d_easyrender_calctotals(w->instancer->render);
eprintf("INIT MAZE COMPLETE, spinning up walls\n"); eprintf("INIT MAZE COMPLETE, spinning up walls\n");
maze_to_pos(&w->state->end, w->endobj->pos.v, w->state->cellsize); maze_to_pos(&w->state->end, w->endobj->pos.v, w->state->cellsize);
w->state->state = WSTATE_SPINUP; w->state->state = WSTATE_SPINUP;
@ -1293,6 +1294,9 @@ int main() { // int argc, char **argv) {
// Just to get the compiler to STOP COMPLAINING about unused // Just to get the compiler to STOP COMPLAINING about unused
mecs_deleteentity(&ecs, worldid); mecs_deleteentity(&ecs, worldid);
// NOTE:the tex delete PROBABLY should throw some segmentation fault or
// something, since I'm trying to free memory that wasn't malloc'd (all
// textures are global consts)
haloo3d_easystore_deleteallobj(&storage, haloo3d_obj_free); haloo3d_easystore_deleteallobj(&storage, haloo3d_obj_free);
haloo3d_easystore_deletealltex(&storage, haloo3d_fb_free); haloo3d_easystore_deletealltex(&storage, haloo3d_fb_free);
} }