mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-19 21:11:59 -04:00
Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer
This commit is contained in:
@@ -2930,12 +2930,6 @@ bool dMeterButton_c::isClose() {
|
||||
}
|
||||
|
||||
void dMeterButton_c::setString(char* i_string, u8 i_button, u8 param_2, u8 param_3) {
|
||||
#if TARGET_PC
|
||||
char* i_string_full = i_string;
|
||||
char i_string_buf[sizeof(mButtonText[0])];
|
||||
dusk::SafeStringCopyTruncate(i_string_buf, i_string);
|
||||
i_string = i_string_buf;
|
||||
#endif
|
||||
if (strcmp(mButtonText[param_2], i_string) != 0 || field_0x4be[param_2] != i_button) {
|
||||
if (param_2 == 0 && strcmp(mButtonText[1], i_string) == 0 &&
|
||||
((i_button == BUTTON_A_e && field_0x4be[1] == BUTTON_A_e) ||
|
||||
@@ -3031,10 +3025,6 @@ void dMeterButton_c::setString(char* i_string, u8 i_button, u8 param_2, u8 param
|
||||
|
||||
strcpy(mButtonText[param_2], i_string);
|
||||
|
||||
#if TARGET_PC
|
||||
i_string = i_string_full;
|
||||
#endif
|
||||
|
||||
if (param_2 == 0) {
|
||||
if (param_3 != 0) {
|
||||
field_0x4d9 = param_2;
|
||||
|
||||
Reference in New Issue
Block a user