Move cheat_manager and state_manager to root folder

This commit is contained in:
twinaphex 2020-10-15 05:29:20 +02:00
parent e703607e4f
commit 44b7234756
30 changed files with 48 additions and 52 deletions

View File

@ -272,7 +272,7 @@ OBJ += \
ifeq ($(HAVE_REWIND), 1) ifeq ($(HAVE_REWIND), 1)
DEFINES += -DHAVE_REWIND DEFINES += -DHAVE_REWIND
OBJ += managers/state_manager.o OBJ += state_manager.o
endif endif
OBJ += \ OBJ += \
@ -286,7 +286,7 @@ OBJ += \
ifeq ($(HAVE_CHEATS), 1) ifeq ($(HAVE_CHEATS), 1)
DEFINES += -DHAVE_CHEATS DEFINES += -DHAVE_CHEATS
OBJ += managers/cheat_manager.o OBJ += cheat_manager.o
endif endif
OBJ += \ OBJ += \

View File

@ -29,25 +29,25 @@
#include <features/features_cpu.h> #include <features/features_cpu.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "config.h"
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
#include "../menu/menu_driver.h" #include "menu/menu_driver.h"
#endif #endif
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
#include "../cheevos/cheevos.h" #include "cheevos/cheevos.h"
#endif #endif
#include "cheat_manager.h" #include "cheat_manager.h"
#include "../msg_hash.h" #include "msg_hash.h"
#include "../configuration.h" #include "configuration.h"
#include "../retroarch.h" #include "retroarch.h"
#include "../dynamic.h" #include "dynamic.h"
#include "../core.h" #include "core.h"
#include "../verbosity.h" #include "verbosity.h"
/* TODO/FIXME - public global variables */ /* TODO/FIXME - public global variables */
cheat_manager_t cheat_manager_state; cheat_manager_t cheat_manager_state;

View File

@ -30,7 +30,7 @@
#include "../../ui/drivers/cocoa/cocoa_common.h" #include "../../ui/drivers/cocoa/cocoa_common.h"
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "../../managers/state_manager.h" #include "../../state_manager.h"
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
#include "../../menu/menu_driver.h" #include "../../menu/menu_driver.h"
@ -1003,14 +1003,10 @@ typedef struct MTLALIGN(16)
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
if (state_manager_frame_is_reversed()) if (state_manager_frame_is_reversed())
{
_engine.pass[i].frame_direction = -1; _engine.pass[i].frame_direction = -1;
}
else else
#else #else
{
_engine.pass[i].frame_direction = 1; _engine.pass[i].frame_direction = 1;
}
#endif #endif
for (unsigned j = 0; j < SLANG_CBUFFER_MAX; j++) for (unsigned j = 0; j < SLANG_CBUFFER_MAX; j++)

View File

@ -32,7 +32,7 @@
#include "../../configuration.h" #include "../../configuration.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "../../managers/state_manager.h" #include "../../state_manager.h"
#endif #endif
#include "../font_driver.h" #include "../font_driver.h"

View File

@ -47,7 +47,7 @@
#include "../video_shader_parse.h" #include "../video_shader_parse.h"
#include "../drivers_shader/slang_process.h" #include "../drivers_shader/slang_process.h"
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "../../managers/state_manager.h" #include "../../state_manager.h"
#endif #endif
#include "../common/d3d_common.h" #include "../common/d3d_common.h"

View File

@ -34,7 +34,7 @@
#include "../../configuration.h" #include "../../configuration.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "../../managers/state_manager.h" #include "../../state_manager.h"
#endif #endif
#ifdef HAVE_MENU #ifdef HAVE_MENU

View File

@ -34,7 +34,7 @@
#include "../../configuration.h" #include "../../configuration.h"
#include "../../dynamic.h" #include "../../dynamic.h"
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "../../managers/state_manager.h" #include "../../state_manager.h"
#endif #endif
#include "../../retroarch.h" #include "../../retroarch.h"

View File

@ -27,7 +27,7 @@
#include "../../retroarch.h" #include "../../retroarch.h"
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "../../managers/state_manager.h" #include "../../state_manager.h"
#endif #endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H

View File

@ -47,7 +47,7 @@
#include "../../driver.h" #include "../../driver.h"
#include "../../configuration.h" #include "../../configuration.h"
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "../../managers/state_manager.h" #include "../../state_manager.h"
#endif #endif
#include "../../retroarch.h" #include "../../retroarch.h"

View File

@ -33,7 +33,7 @@
#include "../common/d3d9_common.h" #include "../common/d3d9_common.h"
#include "../video_shader_parse.h" #include "../video_shader_parse.h"
#include "../../managers/state_manager.h" #include "../../state_manager.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../verbosity.h" #include "../../verbosity.h"

View File

@ -50,7 +50,7 @@
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "../../managers/state_manager.h" #include "../../state_manager.h"
#endif #endif
#define PREV_TEXTURES (GFX_MAX_TEXTURES - 1) #define PREV_TEXTURES (GFX_MAX_TEXTURES - 1)

View File

@ -35,7 +35,7 @@
#include "shader_glsl.h" #include "shader_glsl.h"
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "../../managers/state_manager.h" #include "../../state_manager.h"
#endif #endif
#include "../../core.h" #include "../../core.h"
#include "../../verbosity.h" #include "../../verbosity.h"

View File

@ -227,7 +227,7 @@ MD5
CHEATS CHEATS
============================================================ */ ============================================================ */
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../managers/cheat_manager.c" #include "../cheat_manager.c"
#endif #endif
#include "../libretro-common/hash/rhash.c" #include "../libretro-common/hash/rhash.c"
@ -1104,7 +1104,7 @@ CONFIGURATION
STATE MANAGER STATE MANAGER
============================================================ */ ============================================================ */
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "../managers/state_manager.c" #include "../state_manager.c"
#endif #endif
/*============================================================ /*============================================================

View File

@ -21,7 +21,7 @@
#include "../../configuration.h" #include "../../configuration.h"
#include "../../msg_hash.h" #include "../../msg_hash.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../../managers/cheat_manager.h" #include "../../cheat_manager.h"
#endif #endif
#ifndef BIND_ACTION_CANCEL #ifndef BIND_ACTION_CANCEL

View File

@ -35,9 +35,9 @@
#include "../../core_info.h" #include "../../core_info.h"
#include "../../configuration.h" #include "../../configuration.h"
#include "../../file_path_special.h" #include "../../file_path_special.h"
#include "../../managers/core_option_manager.h" #include "../../core_option_manager.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../../managers/cheat_manager.h" #include "../../cheat_manager.h"
#endif #endif
#include "../../performance_counters.h" #include "../../performance_counters.h"
#include "../../paths.h" #include "../../paths.h"

View File

@ -21,7 +21,7 @@
#include "../menu_cbs.h" #include "../menu_cbs.h"
#include "../../file_path_special.h" #include "../../file_path_special.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../../managers/cheat_manager.h" #include "../../cheat_manager.h"
#endif #endif
#ifndef BIND_ACTION_LABEL #ifndef BIND_ACTION_LABEL

View File

@ -35,7 +35,7 @@
#include "../../core.h" #include "../../core.h"
#include "../../core_info.h" #include "../../core_info.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../../managers/cheat_manager.h" #include "../../cheat_manager.h"
#endif #endif
#include "../../file_path_special.h" #include "../../file_path_special.h"
#include "../../driver.h" #include "../../driver.h"

View File

@ -56,9 +56,9 @@
#include "../../core_info.h" #include "../../core_info.h"
#include "../../frontend/frontend_driver.h" #include "../../frontend/frontend_driver.h"
#include "../../defaults.h" #include "../../defaults.h"
#include "../../managers/core_option_manager.h" #include "../../core_option_manager.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../../managers/cheat_manager.h" #include "../../cheat_manager.h"
#endif #endif
#ifdef HAVE_AUDIOMIXER #ifdef HAVE_AUDIOMIXER
#include "../../tasks/task_audio_mixer.h" #include "../../tasks/task_audio_mixer.h"

View File

@ -35,7 +35,7 @@
#include "../../core.h" #include "../../core.h"
#include "../../core_info.h" #include "../../core_info.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../../managers/cheat_manager.h" #include "../../cheat_manager.h"
#endif #endif
#include "../../file_path_special.h" #include "../../file_path_special.h"
#include "../../retroarch.h" #include "../../retroarch.h"

View File

@ -33,9 +33,9 @@
#include "../../configuration.h" #include "../../configuration.h"
#include "../../core.h" #include "../../core.h"
#include "../../core_info.h" #include "../../core_info.h"
#include "../../managers/core_option_manager.h" #include "../../core_option_manager.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../../managers/cheat_manager.h" #include "../../cheat_manager.h"
#endif #endif
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../verbosity.h" #include "../../verbosity.h"

View File

@ -23,7 +23,7 @@
#include "../menu_cbs.h" #include "../menu_cbs.h"
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../managers/core_option_manager.h" #include "../../core_option_manager.h"
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
#include "../../cheevos/cheevos.h" #include "../../cheevos/cheevos.h"
@ -45,7 +45,7 @@
#include "../../core_updater_list.h" #include "../../core_updater_list.h"
#endif #endif
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../../managers/cheat_manager.h" #include "../../cheat_manager.h"
#endif #endif
#include "../../tasks/tasks_internal.h" #include "../../tasks/tasks_internal.h"

View File

@ -24,7 +24,7 @@
#include "../../retroarch.h" #include "../../retroarch.h"
#include "../../configuration.h" #include "../../configuration.h"
#include "../../managers/core_option_manager.h" #include "../../core_option_manager.h"
#include "../../core_info.h" #include "../../core_info.h"
#ifndef BIND_ACTION_GET_TITLE #ifndef BIND_ACTION_GET_TITLE

View File

@ -84,9 +84,9 @@
#include "../defaults.h" #include "../defaults.h"
#include "../verbosity.h" #include "../verbosity.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../managers/cheat_manager.h" #include "../cheat_manager.h"
#endif #endif
#include "../managers/core_option_manager.h" #include "../core_option_manager.h"
#include "../paths.h" #include "../paths.h"
#include "../retroarch.h" #include "../retroarch.h"
#include "../core.h" #include "../core.h"

View File

@ -96,7 +96,7 @@
#include "../retroarch.h" #include "../retroarch.h"
#include "../gfx/video_display_server.h" #include "../gfx/video_display_server.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../managers/cheat_manager.h" #include "../cheat_manager.h"
#endif #endif
#include "../verbosity.h" #include "../verbosity.h"
#include "../playlist.h" #include "../playlist.h"

View File

@ -232,12 +232,12 @@
#include "core.h" #include "core.h"
#include "configuration.h" #include "configuration.h"
#include "list_special.h" #include "list_special.h"
#include "managers/core_option_manager.h" #include "core_option_manager.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "managers/cheat_manager.h" #include "cheat_manager.h"
#endif #endif
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
#include "managers/state_manager.h" #include "state_manager.h"
#endif #endif
#ifdef HAVE_AUDIOMIXER #ifdef HAVE_AUDIOMIXER
#include "tasks/task_audio_mixer.h" #include "tasks/task_audio_mixer.h"

View File

@ -28,13 +28,13 @@
#include <compat/intrinsics.h> #include <compat/intrinsics.h>
#include "state_manager.h" #include "state_manager.h"
#include "../msg_hash.h" #include "msg_hash.h"
#include "../core.h" #include "core.h"
#include "../retroarch.h" #include "retroarch.h"
#include "../verbosity.h" #include "verbosity.h"
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
#include "../network/netplay/netplay.h" #include "network/netplay/netplay.h"
#endif #endif
/* This makes Valgrind throw errors if a core overflows its savestate size. */ /* This makes Valgrind throw errors if a core overflows its savestate size. */

View File

@ -55,7 +55,7 @@
#include "../verbosity.h" #include "../verbosity.h"
#include "tasks_internal.h" #include "tasks_internal.h"
#ifdef HAVE_CHEATS #ifdef HAVE_CHEATS
#include "../managers/cheat_manager.h" #include "../cheat_manager.h"
#endif #endif
#if defined(HAVE_LIBNX) || defined(_3DS) #if defined(HAVE_LIBNX) || defined(_3DS)