From 5737c621712ff755a6110546badc43e5ad27d17c Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 5 Apr 2024 20:05:19 -0700 Subject: [PATCH] engine: minor App event sending cleanup Signed-off-by: Stephen Gutekanst --- src/engine.zig | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/engine.zig b/src/engine.zig index f4e79e97..732e75c0 100644 --- a/src/engine.zig +++ b/src/engine.zig @@ -114,14 +114,14 @@ pub const App = struct { pub fn init(app: *@This()) !void { app.* = .{ .modules = undefined }; try app.modules.init(allocator); - app.modules.send(.engine, .init, .{}); + app.modules.mod.engine.send(.init, .{}); try app.modules.dispatch(); } - pub fn deinit(app: *@This()) void { - app.modules.send(.engine, .deinit, .{}); - // TODO: improve error handling - app.modules.dispatch() catch |err| @panic(@errorName(err)); // dispatch .deinit + pub fn deinit(app: *@This()) !void { + app.modules.mod.engine.send(.deinit, .{}); + // TODO: dispatch until no remaining events + try app.modules.dispatch(); // dispatch .deinit app.modules.deinit(gpa.allocator()); _ = gpa.deinit(); } @@ -131,6 +131,7 @@ pub const App = struct { app.modules.mod.engine.sendGlobal(.tick, .{}); try app.modules.dispatch(); // dispatch .tick try app.modules.dispatch(); // dispatch any events produced by .tick + return app.modules.mod.engine.state().should_exit; } };