From 8564b4f8e3d8f57c052da63c16f1e5181ac08bba Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 9 Sep 2021 16:58:52 +0200 Subject: [PATCH] Fix compilation problem when HAVE_BSV_MOVIE is not defined --- command.c | 4 +++- command.h | 2 +- retroarch.c | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/command.c b/command.c index f4fc40f792..52e783aacb 100644 --- a/command.c +++ b/command.c @@ -948,7 +948,7 @@ bool command_event_save_auto_state( void command_event_init_cheats( bool apply_cheats_after_load, const char *path_cheat_db, - bsv_movie_t *bsv_movie_state_handle) + void *bsv_movie_data) { #ifdef HAVE_NETWORKING bool allow_cheats = !netplay_driver_ctl( @@ -957,6 +957,8 @@ void command_event_init_cheats( bool allow_cheats = true; #endif #ifdef HAVE_BSV_MOVIE + bsv_movie_t * + bsv_movie_state_handle = (bsv_movie_t*)bsv_movie_data; allow_cheats &= !(bsv_movie_state_handle != NULL); #endif diff --git a/command.h b/command.h index 0d99d68ade..087c9b9bb0 100644 --- a/command.h +++ b/command.h @@ -382,7 +382,7 @@ bool command_set_shader(command_t *cmd, const char *arg); void command_event_init_cheats( bool apply_cheats_after_load, const char *path_cheat_db, - bsv_movie_t *bsv_movie_state_handle); + void *bsv_movie_data); #endif #if defined(HAVE_COMMAND) diff --git a/retroarch.c b/retroarch.c index 5125f81dbb..6d63b3eeba 100644 --- a/retroarch.c +++ b/retroarch.c @@ -30392,9 +30392,15 @@ bool retroarch_main_init(int argc, char *argv[]) #ifdef HAVE_CHEATS cheat_manager_state_free(); - command_event_init_cheats(settings->bools.apply_cheats_after_load, - settings->paths.path_cheat_database, - p_rarch->bsv_movie_state_handle); + command_event_init_cheats( + settings->bools.apply_cheats_after_load, + settings->paths.path_cheat_database, +#ifdef HAVE_BSV_MOVIE + p_rarch->bsv_movie_state_handle +#else + NULL +#endif + ); #endif drivers_init(p_rarch, settings, DRIVERS_CMD_ALL, verbosity_enabled); #ifdef HAVE_COMMAND