Revert "skins: SkinManager + hot-swap (F7), classic/nes a data/skins/"
This reverts commit ebfcad6f22.
This commit is contained in:
@@ -5,8 +5,6 @@
|
||||
#include "core/input/input.h"
|
||||
#include "core/locale/lang.h"
|
||||
#include "core/rendering/screen.h"
|
||||
#include "core/resources/resource.h"
|
||||
#include "core/resources/skin_manager.hpp"
|
||||
#include "game/options.hpp"
|
||||
#include "utils/utils.h"
|
||||
|
||||
@@ -20,7 +18,6 @@ namespace GlobalInputs {
|
||||
constexpr int LANG_SHADER = 99;
|
||||
constexpr int LANG_PRESET = 100;
|
||||
constexpr int LANG_EXIT_CONFIRM = 101;
|
||||
constexpr int LANG_SKIN = 102;
|
||||
|
||||
constexpr Uint32 NOTIFY_MS = 1500;
|
||||
constexpr Uint32 EXIT_CONFIRM_MS = 2000;
|
||||
@@ -66,11 +63,6 @@ namespace GlobalInputs {
|
||||
Screen::get()->notify(MSG, GREEN, BLACK, NOTIFY_MS);
|
||||
}
|
||||
|
||||
void notifySkin() {
|
||||
const std::string MSG = Lang::get()->getText(LANG_SKIN) + " " + SkinManager::get()->currentDisplayName();
|
||||
Screen::get()->notify(MSG, CYAN, BLACK, NOTIFY_MS);
|
||||
}
|
||||
|
||||
void onExit() {
|
||||
const Uint32 NOW = SDL_GetTicks();
|
||||
if (NOW < exit_window_until_ticks) {
|
||||
@@ -125,14 +117,6 @@ namespace GlobalInputs {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (Input::get()->checkInput(Input::Action::NEXT_SKIN, Input::Repeat::OFF)) {
|
||||
const std::string NEXT_ID = SkinManager::get()->nextSkinId();
|
||||
if (NEXT_ID != SkinManager::get()->current()) {
|
||||
Resource::get()->reloadForSkin(NEXT_ID);
|
||||
}
|
||||
notifySkin();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user