mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 08:00:01 +00:00
tried to fix CMenuManager::Process but still issues
This commit is contained in:
parent
90e093cd47
commit
f1951acd6e
|
@ -64,15 +64,14 @@ CMenuManager &FrontEndMenuManager = *(CMenuManager*)0x8F59D8;
|
|||
float lodMultiplier = *(float*)0x5F726C;
|
||||
|
||||
// Stuff not in CMenuManager:
|
||||
uint32 VibrationTime;
|
||||
uint32 &VibrationTime = *(uint32*)0x628CF8;
|
||||
char* pEditString = (char*)0x628D00;
|
||||
int32 *&pControlEdit = *(int32**)0x628D08;
|
||||
int8 DisplayComboButtonErrMsg;
|
||||
int8 MouseButtonJustClicked;
|
||||
int8 JoyButtonJustClicked;
|
||||
bool &DisplayComboButtonErrMsg = *(bool*)0x628D14;
|
||||
int32 &MouseButtonJustClicked = *(int32*)0x628D0C;
|
||||
int32 &JoyButtonJustClicked = *(int32*)0x628D10;
|
||||
int32 &nTimeForSomething = *(int32*)0x628D54;
|
||||
int32 TypeOfControl = 0;
|
||||
int32 *pControlTemp = 0;
|
||||
//int32 *pControlTemp = 0;
|
||||
|
||||
// Frontend inputs.
|
||||
|
||||
|
@ -164,7 +163,7 @@ void CMenuManager::BuildStatLine(char *text, float *stat, bool aFloat, float* st
|
|||
else
|
||||
sprintf(gString2, " %d %s %d", *(int*)stat, UnicodeToAscii(TheText.Get("FEST_OO")), *(int*)stat2);
|
||||
}
|
||||
else if (stat2) {
|
||||
else if (stat) {
|
||||
if (aFloat)
|
||||
sprintf(gString2, " %.2f", *stat);
|
||||
else
|
||||
|
@ -1330,11 +1329,10 @@ void CMenuManager::Process(void)
|
|||
if (!m_bSaveMenuActive && TheCamera.GetScreenFadeStatus() != FADE_0)
|
||||
return;
|
||||
|
||||
//m_bLanguageLoaded = false; //XXX
|
||||
m_bStartGameLoading = false;
|
||||
InitialiseChangedLanguageSettings();
|
||||
|
||||
if (GetPadExitEnter()) //XXX only escape
|
||||
if (CPad::GetPad(0)->GetEscapeJustDown())
|
||||
RequestFrontEndStartUp();
|
||||
|
||||
SwitchMenuOnAndOff();
|
||||
|
@ -1403,7 +1401,10 @@ void CMenuManager::Process(void)
|
|||
SaveSettings();
|
||||
}
|
||||
|
||||
if (field_113 && !field_456) {
|
||||
if (field_113) {
|
||||
if (field_456)
|
||||
field_456 = 0;
|
||||
else {
|
||||
pControlEdit = CPad::EditCodesForControls(pControlEdit, 1);
|
||||
JoyButtonJustClicked = 0;
|
||||
MouseButtonJustClicked = 0;
|
||||
|
@ -1422,6 +1423,7 @@ void CMenuManager::Process(void)
|
|||
|
||||
JoyButtonJustClicked = ControlsManager.GetJoyButtonJustDown();
|
||||
|
||||
int32 TypeOfControl = 0;
|
||||
if (JoyButtonJustClicked)
|
||||
TypeOfControl = 3;
|
||||
if (MouseButtonJustClicked)
|
||||
|
@ -1454,6 +1456,7 @@ void CMenuManager::Process(void)
|
|||
field_456 = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((m_nCurrScreen == MENUPAGE_13 || m_nCurrScreen == MENUPAGE_16) && CTimer::GetTimeInMillisecondsPauseMode() > field_558) {
|
||||
m_nCurrScreen = m_nPrevScreen;
|
||||
|
@ -1469,6 +1472,7 @@ void CMenuManager::Process(void)
|
|||
else {
|
||||
UnloadTextures();
|
||||
field_452 = 0;
|
||||
*(bool*)0x5F33E4 = true;
|
||||
// byte_5F33E4 = 1; // unused
|
||||
m_nPrevScreen = 0;
|
||||
m_nCurrScreen = m_nPrevScreen;
|
||||
|
|
Loading…
Reference in a new issue