diff --git a/rpcs3/Emu/IdManager.h b/rpcs3/Emu/IdManager.h index 3f69e74d41..276199ef74 100644 --- a/rpcs3/Emu/IdManager.h +++ b/rpcs3/Emu/IdManager.h @@ -714,17 +714,8 @@ public: } }; -#include "Utilities/typemap.h" #include "util/fixed_typemap.hpp" -extern utils::typemap g_typemap; - -constexpr utils::typemap* g_idm = &g_typemap; - -using utils::id_new; -using utils::id_any; -using utils::id_always; - extern stx::manual_fixed_typemap<void> g_fixed_typemap; constexpr stx::manual_fixed_typemap<void>* g_fxo = &g_fixed_typemap; diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 68a6e8b67d..43ef0792ca 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -48,8 +48,6 @@ stx::manual_fixed_typemap<void> g_fixed_typemap; -utils::typemap g_typemap{nullptr}; - cfg_root g_cfg; bool g_use_rtm; @@ -319,7 +317,6 @@ void Emulator::Init() idm::init(); fxm::init(); - g_idm->init(); g_fxo->reset(); // Reset defaults, cache them @@ -1727,7 +1724,6 @@ void Emulator::Stop(bool restart) lv2_obj::cleanup(); idm::clear(); fxm::clear(); - g_idm->init(); g_fxo->reset(); LOG_NOTICE(GENERAL, "Objects cleared...");