From d799830ad9254349c0af94dca17918176197c274 Mon Sep 17 00:00:00 2001 From: Louis Pearson Date: Thu, 4 Aug 2022 18:07:23 -0600 Subject: [PATCH] Get the game running again --- src/game.zig | 15 +++++---------- src/main.zig | 4 ++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/game.zig b/src/game.zig index 207a480..02c3211 100644 --- a/src/game.zig +++ b/src/game.zig @@ -144,7 +144,7 @@ var fba_buf: [4096]u8 = undefined; var fba = std.heap.FixedBufferAllocator.init(&fba_buf); var alloc = fba.allocator(); -var frame_fba_buf: [4096]u8 = undefined; +var frame_fba_buf: [8192]u8 = undefined; var frame_fba = std.heap.FixedBufferAllocator.init(&frame_fba_buf); var frame_alloc = frame_fba.allocator(); @@ -194,11 +194,6 @@ const playerAnim = pac: { break :pac animArr.slice(); }; -fn showErr(msg: []const u8) noreturn { - w4.traceNoF(msg); - unreachable; -} - pub fn start() !void { particles = try ParticleSystem.init(); @@ -619,10 +614,10 @@ fn updateCircuit() !void { (circuit.isEnabled(cellEnd) and end.pinned)) wire.enabled = true; } // map.reset(&assets.solid); - const enabledDoors = try circuit.enabledDoors(frame_alloc); - for (enabledDoors.items) |door| { - try map.set_cell(door, 0); - } + // const enabledDoors = try circuit.enabledDoors(frame_alloc); + // for (enabledDoors.items) |door| { + // try map.set_cell(door, 0); + // } } fn wirePhysicsProcess(dt: f32, wire: *Wire) !void { diff --git a/src/main.zig b/src/main.zig index f66e40d..7cfaaf9 100644 --- a/src/main.zig +++ b/src/main.zig @@ -29,7 +29,7 @@ export fn update() void { .Menu => menu.update(), .Game => game.update(time) catch |e| switch (e) { error.Overflow => showErr(@errorName(e)), - error.OutOfBounds => showErr(@errorName(e)), + // error.OutOfBounds => showErr(@errorName(e)), // error.EndOfStream => showErr(@errorName(e)), error.OutOfMemory => showErr(@errorName(e)), }, @@ -40,7 +40,7 @@ export fn update() void { .Menu => menu.start(), .Game => game.start() catch |e| switch (e) { error.Overflow => showErr(@errorName(e)), - error.OutOfBounds => showErr(@errorName(e)), + // error.OutOfBounds => showErr(@errorName(e)), error.EndOfStream => showErr(@errorName(e)), error.OutOfMemory => showErr(@errorName(e)), error.NullTiles => showErr(@errorName(e)),