Mercurial > mm7
diff mm7_5.cpp @ 336:ea55d6414029
Event_proceccor preliminary
author | Gloval |
---|---|
date | Thu, 21 Feb 2013 00:33:12 +0400 |
parents | 8e23edf57e27 |
children | d27e30e0158a |
line wrap: on
line diff
--- a/mm7_5.cpp Wed Feb 20 21:35:13 2013 +0400 +++ b/mm7_5.cpp Thu Feb 21 00:33:12 2013 +0400 @@ -1278,8 +1278,8 @@ if ( (signed int)uActiveCharacter < v0 || (signed int)uActiveCharacter > 4 ) uActiveCharacter = pParty->GetNextActiveCharacter(); pGUIWindow_CurrentMenu->Release(); - if ( pGUIWindow_CurrentMenu == ptr_507BC0 ) - ptr_507BC0 = 0; + if ( pGUIWindow_CurrentMenu == window_SpeakInHouse ) + window_SpeakInHouse = 0; pGUIWindow_CurrentMenu = 0; pEventTimer->Resume(); pCurrentScreen = SCREEN_GAME; @@ -1311,8 +1311,8 @@ if ( (signed int)uActiveCharacter < v0 || (signed int)uActiveCharacter > 4 ) uActiveCharacter = pParty->GetNextActiveCharacter(); pGUIWindow_CurrentMenu->Release(); - if ( pGUIWindow_CurrentMenu == ptr_507BC0 ) - ptr_507BC0 = 0; + if ( pGUIWindow_CurrentMenu == window_SpeakInHouse ) + window_SpeakInHouse = 0; pGUIWindow_CurrentMenu = 0; pEventTimer->Resume(); pCurrentScreen = SCREEN_GAME; @@ -1518,8 +1518,8 @@ if ( (signed int)uActiveCharacter < v0 || (signed int)uActiveCharacter > 4 ) uActiveCharacter = pParty->GetNextActiveCharacter(); pGUIWindow_CurrentMenu->Release(); - if ( pGUIWindow_CurrentMenu == ptr_507BC0 ) - ptr_507BC0 = 0; + if ( pGUIWindow_CurrentMenu == window_SpeakInHouse ) + window_SpeakInHouse = 0; pGUIWindow_CurrentMenu = 0; pEventTimer->Resume(); pCurrentScreen = SCREEN_GAME; @@ -1547,7 +1547,7 @@ sub_4B1D27(); pAudioPlayer->PlaySound((SoundID)(SOUND_EnteringAHouse|0x1), 814, 0, -1, 0, 0, 0, 0); pVideoPlayer->Unload(); - pGUIWindow_CurrentMenu = ptr_507BC0; + pGUIWindow_CurrentMenu = window_SpeakInHouse; //goto LABEL_322; if ( pGUIWindow_Settings ) { @@ -1568,8 +1568,8 @@ if ( (signed int)uActiveCharacter < v0 || (signed int)uActiveCharacter > 4 ) uActiveCharacter = pParty->GetNextActiveCharacter(); pGUIWindow_CurrentMenu->Release(); - if ( pGUIWindow_CurrentMenu == ptr_507BC0 ) - ptr_507BC0 = 0; + if ( pGUIWindow_CurrentMenu == window_SpeakInHouse ) + window_SpeakInHouse = 0; pGUIWindow_CurrentMenu = 0; pEventTimer->Resume(); pCurrentScreen = SCREEN_GAME; @@ -1641,8 +1641,8 @@ if ( (signed int)uActiveCharacter < v0 || (signed int)uActiveCharacter > 4 ) uActiveCharacter = pParty->GetNextActiveCharacter(); pGUIWindow_CurrentMenu->Release(); - if ( pGUIWindow_CurrentMenu == ptr_507BC0 ) - ptr_507BC0 = 0; + if ( pGUIWindow_CurrentMenu == window_SpeakInHouse ) + window_SpeakInHouse = 0; pGUIWindow_CurrentMenu = 0; pEventTimer->Resume(); pCurrentScreen = SCREEN_GAME; @@ -1670,8 +1670,8 @@ if ( (signed int)uActiveCharacter < v0 || (signed int)uActiveCharacter > 4 ) uActiveCharacter = pParty->GetNextActiveCharacter(); pGUIWindow_CurrentMenu->Release(); - if ( pGUIWindow_CurrentMenu == ptr_507BC0 ) - ptr_507BC0 = 0; + if ( pGUIWindow_CurrentMenu == window_SpeakInHouse ) + window_SpeakInHouse = 0; pGUIWindow_CurrentMenu = 0; pEventTimer->Resume(); pCurrentScreen = SCREEN_GAME; @@ -1705,8 +1705,8 @@ if ( (signed int)uActiveCharacter < v0 || (signed int)uActiveCharacter > 4 ) uActiveCharacter = pParty->GetNextActiveCharacter(); pGUIWindow_CurrentMenu->Release(); - if ( pGUIWindow_CurrentMenu == ptr_507BC0 ) - ptr_507BC0 = 0; + if ( pGUIWindow_CurrentMenu == window_SpeakInHouse ) + window_SpeakInHouse = 0; pGUIWindow_CurrentMenu = 0; pEventTimer->Resume(); pCurrentScreen = SCREEN_GAME; @@ -1849,10 +1849,10 @@ } else { - dword_597F18 = dword_5C341C; + start_event_seq_number = dword_5C341C; EventProcessor(dword_5C3418, 0, v0); } - dword_597F18 = 0; + start_event_seq_number = 0; if ( !_strcmpi(byte_6BE3B0, "d05.blv") ) pParty->uTimePlayed += 1474560i64; continue; @@ -1860,7 +1860,7 @@ CloseWindowBackground(); pVideoPlayer->Unload(); sub_44603D(); - dword_597F18 = 0; + start_event_seq_number = 0; goto LABEL_422; case UIMSG_CycleCharacters: v39 = GetAsyncKeyState(VK_SHIFT); @@ -2126,7 +2126,7 @@ dword_6BE364_game_settings_1 |= v0; uGameState = 2; //v53 = p2DEvents_minus1_::30[26 * (unsigned int)ptr_507BC0->ptr_1C]; - v53 = p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1]._quest_related; + v53 = p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1]._quest_related; if ( v53 < 0 ) { v54 = abs(v53) - 1; @@ -12572,7 +12572,7 @@ int v2; // ecx@1 int v3; // eax@1 - v0 = ptr_507BC0->ptr_1C; + v0 = window_SpeakInHouse->ptr_1C; dword_4E1874 = 5; v1 = &stru_4E1890[(int)((char *)v0 - 108)]; amuint_4E1860 = v1->field_4; @@ -15815,9 +15815,9 @@ continue; } pWindowList[pVisibleWindowsIdxs[i] - 1]._4B3157(); - if ( !ptr_507BC0 ) - continue; - v10 = ptr_507BC0->ptr_1C; + if ( !window_SpeakInHouse ) + continue; + v10 = window_SpeakInHouse->ptr_1C; if ( (signed int)v10 >= 53 ) continue; v11 = pParty->field_3C._shop_ban_times[2 * (_DWORD)v10 + 1];