From 4ede1abcc1942508da9d0455c64f8ba92617696a Mon Sep 17 00:00:00 2001 From: En Yi Date: Tue, 7 Nov 2023 20:47:30 +0800 Subject: [PATCH] Fix crashes in main application Changelog: - Fix crash on empty emitter config - Fix engine de-init order - Update assets file to load for main application --- engine/particle_sys.c | 1 + main.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/particle_sys.c b/engine/particle_sys.c index fbaecc6..4109f71 100644 --- a/engine/particle_sys.c +++ b/engine/particle_sys.c @@ -20,6 +20,7 @@ void init_particle_system(ParticleSystem_t* system) void play_particle_emitter(ParticleSystem_t* system, const ParticleEmitter_t* in_emitter) { if (in_emitter == NULL) return; + if (in_emitter->config == NULL) return; if (sc_queue_empty(&system->free_list)) return; uint32_t idx = sc_queue_del_first(&system->free_list); diff --git a/main.c b/main.c index 016a1b0..8fe81a5 100644 --- a/main.c +++ b/main.c @@ -28,7 +28,7 @@ int main(void) InitWindow(screenWidth, screenHeight, "raylib"); SetTargetFPS(60); // Set our game to run at 60 frames-per-second #ifndef NDEBUG - load_from_infofile("res/assets_debug.info", &engine.assets); + load_from_infofile("res/assets.info.raw", &engine.assets); init_player_creation("res/player_spr.info", &engine.assets); #else load_from_rres("res/myresources.rres", &engine.assets); @@ -92,6 +92,6 @@ int main(void) free_sandbox_scene(&sandbox_scene); free_game_scene(&level_scene); free_menu_scene(&menu_scene); - CloseWindow(); deinit_engine(&engine); + CloseWindow(); }