thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-27 12:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename "Controller Buttons" to "Controller Icons".

Browse source
This commit is contained in:
Skyth 2024-12-07 16:47:58 +03:00
parent 2651bfa5a1
commit aec99b4f42
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UnleashedRecomp/gpu/video.cpp
View file

@ -2614,7 +2614,7 @@ static void ProcSetViewport(const RenderCommand& cmd)
static void SetTexture(GuestDevice* device, uint32_t index, GuestTexture* texture) static void SetTexture(GuestDevice* device, uint32_t index, GuestTexture* texture)
{ {
if (Config::ControllerButtons == EControllerButtons::PlayStation && texture != nullptr && texture->patchedTexture != nullptr) if (Config::ControllerIcons == EControllerIcons::PlayStation && texture != nullptr && texture->patchedTexture != nullptr)
texture = texture->patchedTexture.get(); texture = texture->patchedTexture.get();
RenderCommand cmd; RenderCommand cmd;

10
UnleashedRecomp/locale/config_locale.h
View file

@ -131,18 +131,18 @@ CONFIG_DEFINE_ENUM_LOCALE(ETimeOfDayTransition)
} }
}; };
CONFIG_DEFINE_LOCALE(ControllerButtons) CONFIG_DEFINE_LOCALE(ControllerIcons)
{ {
{ ELanguage::English, { "Controller Buttons", "[PLACEHOLDER]" } } { ELanguage::English, { "Controller Icons", "[PLACEHOLDER]" } }
}; };
CONFIG_DEFINE_ENUM_LOCALE(EControllerButtons) CONFIG_DEFINE_ENUM_LOCALE(EControllerIcons)
{ {
{ {
ELanguage::English, ELanguage::English,
{ {
{ EControllerButtons::Xbox, { "XBOX", "[PLACEHOLDER]" } }, { EControllerIcons::Xbox, { "XBOX", "[PLACEHOLDER]" } },
{ EControllerButtons::PlayStation, { "PLAYSTATION", "[PLACEHOLDER]" } } { EControllerIcons::PlayStation, { "PLAYSTATION", "[PLACEHOLDER]" } }
} }
} }
}; };

2
UnleashedRecomp/patches/resident_patches.cpp
View file

@ -114,7 +114,7 @@ void LoadingScreenControllerMidAsmHook()
0x820301E8, // 360_super 0x820301E8, // 360_super
}; };
const char* prefix = Config::ControllerButtons == EControllerButtons::PlayStation ? "ps3" : "360"; const char* prefix = Config::ControllerIcons == EControllerIcons::PlayStation ? "ps3" : "360";
for (auto address : STR_ADDRESSES) for (auto address : STR_ADDRESSES)
memcpy(g_memory.Translate(address), prefix, 3); memcpy(g_memory.Translate(address), prefix, 3);
} }

2
UnleashedRecomp/ui/options_menu.cpp
View file

@ -790,7 +790,7 @@ static void DrawConfigOptions()
DrawConfigOption(rowCount++, yOffset, &Config::InvertCameraX, true); DrawConfigOption(rowCount++, yOffset, &Config::InvertCameraX, true);
DrawConfigOption(rowCount++, yOffset, &Config::InvertCameraY, true); DrawConfigOption(rowCount++, yOffset, &Config::InvertCameraY, true);
DrawConfigOption(rowCount++, yOffset, &Config::AllowBackgroundInput, true); DrawConfigOption(rowCount++, yOffset, &Config::AllowBackgroundInput, true);
DrawConfigOption(rowCount++, yOffset, &Config::ControllerButtons, true); DrawConfigOption(rowCount++, yOffset, &Config::ControllerIcons, true);
break; break;
case 2: // AUDIO case 2: // AUDIO
DrawConfigOption(rowCount++, yOffset, &Config::MusicVolume, true); DrawConfigOption(rowCount++, yOffset, &Config::MusicVolume, true);

2
UnleashedRecomp/user/config.h
View file

@ -24,7 +24,7 @@ public:
CONFIG_DEFINE_LOCALISED("Input", bool, XButtonHoming, true); CONFIG_DEFINE_LOCALISED("Input", bool, XButtonHoming, true);
CONFIG_DEFINE_LOCALISED("Input", bool, AllowCancellingUnleash, false); CONFIG_DEFINE_LOCALISED("Input", bool, AllowCancellingUnleash, false);
CONFIG_DEFINE_LOCALISED("Input", bool, AllowBackgroundInput, false); CONFIG_DEFINE_LOCALISED("Input", bool, AllowBackgroundInput, false);
CONFIG_DEFINE_ENUM_LOCALISED("Input", EControllerButtons, ControllerButtons, EControllerButtons::Xbox); CONFIG_DEFINE_ENUM_LOCALISED("Input", EControllerIcons, ControllerIcons, EControllerIcons::Xbox);
CONFIG_DEFINE_LOCALISED("Audio", float, MusicVolume, 1.0f); CONFIG_DEFINE_LOCALISED("Audio", float, MusicVolume, 1.0f);
CONFIG_DEFINE_LOCALISED("Audio", float, EffectsVolume, 1.0f); CONFIG_DEFINE_LOCALISED("Audio", float, EffectsVolume, 1.0f);

8
UnleashedRecomp/user/config_detail.h
View file

@ -67,16 +67,16 @@ CONFIG_DEFINE_ENUM_TEMPLATE(ETimeOfDayTransition)
{ "PlayStation", ETimeOfDayTransition::PlayStation } { "PlayStation", ETimeOfDayTransition::PlayStation }
}; };
enum class EControllerButtons : uint32_t enum class EControllerIcons : uint32_t
{ {
Xbox, Xbox,
PlayStation PlayStation
}; };
CONFIG_DEFINE_ENUM_TEMPLATE(EControllerButtons) CONFIG_DEFINE_ENUM_TEMPLATE(EControllerIcons)
{ {
{ "Xbox", EControllerButtons::Xbox }, { "Xbox", EControllerIcons::Xbox },
{ "PlayStation", EControllerButtons::PlayStation } { "PlayStation", EControllerIcons::PlayStation }
}; };
enum class EVoiceLanguage : uint32_t enum class EVoiceLanguage : uint32_t