From 591630c6e1c775214b23b02678d6318b3d263e0a Mon Sep 17 00:00:00 2001 From: Shadow15510 Date: Sat, 5 Jun 2021 18:29:37 +0200 Subject: [PATCH] Add compatility code for G35+E II --- Plague.g1a | Bin 69008 -> 69072 bytes src/main.c | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Plague.g1a b/Plague.g1a index 0a4f243644afe7e52dfdc641974a56962bd08e6d..70aace225d3d8503e9d69ba771982468fca98d37 100644 GIT binary patch delta 5203 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 AMgRZ+ delta 5112 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 CO;_{) diff --git a/src/main.c b/src/main.c index a04c32f..71e2a5d 100644 --- a/src/main.c +++ b/src/main.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "core.h" #include "display_engine.h" @@ -74,12 +75,12 @@ int main(void) current_game.grid.data[95 + 20 * current_game.grid.width] = 1; current_game.humans[0] = (current_game.grid.width * current_game.grid.height) - 1 - BLANK_CASES; - read_save(¤t_game); + gint_world_switch(GINT_CALL(read_save, (void *)¤t_game)); int to_save = main_loop(¤t_game); - if (to_save) write_save(¤t_game); - else delete_save(); + if (to_save) gint_world_switch(GINT_CALL(write_save, (void *)¤t_game)); + else gint_world_switch(GINT_CALL(delete_save)); // Free memory free(current_game.grid.data);