Mercurial > mm7
diff Events.cpp @ 788:f004c7ceb7bd
Слияние
| author | Ritor1 |
|---|---|
| date | Mon, 25 Mar 2013 02:21:14 +0600 |
| parents | 3a77fbf7d0b8 b27dd658ea77 |
| children | 11dab247bd72 |
line wrap: on
line diff
--- a/Events.cpp Mon Mar 25 02:20:57 2013 +0600 +++ b/Events.cpp Mon Mar 25 02:21:14 2013 +0600 @@ -319,7 +319,7 @@ dword_5B65C4 = 0; if ( !uEventID ) { - if ( !GameUI_StatusBar_TimedStringTimeLeft ) + if ( !GameUI_Footer_TimeLeft ) ShowStatusBarString(pGlobalTXT_LocalizationStrings[521], 2u);// Nothing here return; } @@ -1033,7 +1033,7 @@ case EVENT_InputString: if ( !start_event_seq_number ) { - strcpy(GameUI_StatusBar_TimedString, &pLevelStr[pLevelStrOffsets[EVT_DWORD(_evt->v5 )]]); + strcpy(GameUI_Footer_TimedString, &pLevelStr[pLevelStrOffsets[EVT_DWORD(_evt->v5 )]]); v105 = curr_seq_num; v121 = 26; LABEL_295: @@ -1045,8 +1045,8 @@ return; } v84 = _evt->v13 + ((_evt->v14 + ((_evt->v15 + ((uint)_evt->v16 << 8)) << 8)) << 8); - if ( !_strcmpi(GameUI_StatusBar_TimedString, &pLevelStr[pLevelStrOffsets[_evt->v9 + ((_evt->v10 + ((_evt->v11 + ((uint)_evt->v12 << 8)) << 8)) << 8)]]) - || !_strcmpi(GameUI_StatusBar_TimedString, &pLevelStr[pLevelStrOffsets[v84]]) ) + if ( !_strcmpi(GameUI_Footer_TimedString, &pLevelStr[pLevelStrOffsets[_evt->v9 + ((_evt->v10 + ((_evt->v11 + ((uint)_evt->v12 << 8)) << 8)) << 8)]]) + || !_strcmpi(GameUI_Footer_TimedString, &pLevelStr[pLevelStrOffsets[v84]]) ) { v11 = _evt->v17; LABEL_130: @@ -1349,7 +1349,7 @@ else { pGameLoadingUI_ProgressBar->uType = (GUIProgressBar::Type)((activeLevelDecoration == NULL) + 1); - sub_44987B(v99, 0); + sub_44987B(v99, MapStartPoint_Party); v133 = 1; if ( pCurrentScreen == SCREEN_HOUSE ) {