From d9851c5e7864121e804b4563eedffef830d5117e Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Tue, 20 Sep 2022 17:28:35 +0200 Subject: menu: Implement join_menu --- src/system/CMakeLists.txt | 2 +- src/system/ps1/src/init.c | 4 +++- src/system/sdl-1.2/src/system.c | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/system') diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index 011aee6..4c315b9 100644 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -1,5 +1,5 @@ set(inc "inc") -set(privdeps gfx sfx) +set(privdeps gfx sfx net) if(PS1_BUILD) set(src "ps1/src/init.c") diff --git a/src/system/ps1/src/init.c b/src/system/ps1/src/init.c index 4c30fbd..4ad12c2 100644 --- a/src/system/ps1/src/init.c +++ b/src/system/ps1/src/init.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -20,13 +21,14 @@ void system_deinit(void) { gfx_deinit(); sfx_deinit(); + net_deinit(); } int system_init(void) { SetVBlankHandler(vblank); - if (gfx_init() || sfx_init()) + if (gfx_init() || sfx_init() || net_init()) return -1; return 0; diff --git a/src/system/sdl-1.2/src/system.c b/src/system/sdl-1.2/src/system.c index 24c3e18..bff5e4f 100644 --- a/src/system/sdl-1.2/src/system.c +++ b/src/system/sdl-1.2/src/system.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -19,6 +20,7 @@ void system_deinit(void) { gfx_deinit(); sfx_deinit(); + net_deinit(); SDL_Quit(); } @@ -29,7 +31,7 @@ int system_init(void) fprintf(stderr, "SDL_Init: %s\n", SDL_GetError()); goto failure; } - else if (gfx_init() || sfx_init()) + else if (gfx_init() || sfx_init() || net_init()) goto failure; SDL_WM_SetCaption("rts", NULL); -- cgit v1.2.3