Mercurial > mm7

comparison Events.cpp @ 783:b27dd658ea77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Taveling by foot fixed.
author Nomad
date Sun, 24 Mar 2013 21:14:28 +0200
parents c319601893af
children f004c7ceb7bd
comparison
equal deleted inserted replaced
778:64cef5a0782a 783:b27dd658ea77
317 v133 = 0; 317 v133 = 0;
318 EvtTargetObj = targetObj; 318 EvtTargetObj = targetObj;
319 dword_5B65C4 = 0; 319 dword_5B65C4 = 0;
320 if ( !uEventID ) 320 if ( !uEventID )
321 { 321 {
322 if ( !GameUI_StatusBar_TimedStringTimeLeft ) 322 if ( !GameUI_Footer_TimeLeft )
323 ShowStatusBarString(pGlobalTXT_LocalizationStrings[521], 2u);// Nothing here 323 ShowStatusBarString(pGlobalTXT_LocalizationStrings[521], 2u);// Nothing here
324 return; 324 return;
325 } 325 }
326 player_choose = (uActiveCharacter == 0)?6:4; //4 - active or 6 - random player if active =0 326 player_choose = (uActiveCharacter == 0)?6:4; //4 - active or 6 - random player if active =0
327 curr_seq_num = start_event_seq_number; 327 curr_seq_num = start_event_seq_number;
1031 v4 = v124; 1031 v4 = v124;
1032 break; 1032 break;
1033 case EVENT_InputString: 1033 case EVENT_InputString:
1034 if ( !start_event_seq_number ) 1034 if ( !start_event_seq_number )
1035 { 1035 {
1036 strcpy(GameUI_StatusBar_TimedString, &pLevelStr[pLevelStrOffsets[EVT_DWORD(_evt->v5 )]]); 1036 strcpy(GameUI_Footer_TimedString, &pLevelStr[pLevelStrOffsets[EVT_DWORD(_evt->v5 )]]);
1037 v105 = curr_seq_num; 1037 v105 = curr_seq_num;
1038 v121 = 26; 1038 v121 = 26;
1039 LABEL_295: 1039 LABEL_295:
1040 sub_4451A8_press_any_key(uEventID, v105, v121); 1040 sub_4451A8_press_any_key(uEventID, v105, v121);
1041 LABEL_301: 1041 LABEL_301:
1043 LABEL_302: 1043 LABEL_302:
1044 OnMapLeave(); 1044 OnMapLeave();
1045 return; 1045 return;
1046 } 1046 }
1047 v84 = _evt->v13 + ((_evt->v14 + ((_evt->v15 + ((uint)_evt->v16 << 8)) << 8)) << 8); 1047 v84 = _evt->v13 + ((_evt->v14 + ((_evt->v15 + ((uint)_evt->v16 << 8)) << 8)) << 8);
1048 if ( !_strcmpi(GameUI_StatusBar_TimedString, &pLevelStr[pLevelStrOffsets[_evt->v9 + ((_evt->v10 + ((_evt->v11 + ((uint)_evt->v12 << 8)) << 8)) << 8)]]) 1048 if ( !_strcmpi(GameUI_Footer_TimedString, &pLevelStr[pLevelStrOffsets[_evt->v9 + ((_evt->v10 + ((_evt->v11 + ((uint)_evt->v12 << 8)) << 8)) << 8)]])
1049 || !_strcmpi(GameUI_StatusBar_TimedString, &pLevelStr[pLevelStrOffsets[v84]]) ) 1049 || !_strcmpi(GameUI_Footer_TimedString, &pLevelStr[pLevelStrOffsets[v84]]) )
1050 { 1050 {
1051 v11 = _evt->v17; 1051 v11 = _evt->v17;
1052 LABEL_130: 1052 LABEL_130:
1053 //v124 = -1; 1053 //v124 = -1;
1054 LABEL_131: 1054 LABEL_131:
1346 } 1346 }
1347 } 1347 }
1348 else 1348 else
1349 { 1349 {
1350 pGameLoadingUI_ProgressBar->uType = (GUIProgressBar::Type)((activeLevelDecoration == NULL) + 1); 1350 pGameLoadingUI_ProgressBar->uType = (GUIProgressBar::Type)((activeLevelDecoration == NULL) + 1);
1351 sub_44987B(v99, 0); 1351 sub_44987B(v99, MapStartPoint_Party);
1352 v133 = 1; 1352 v133 = 1;
1353 if ( pCurrentScreen == SCREEN_HOUSE ) 1353 if ( pCurrentScreen == SCREEN_HOUSE )
1354 { 1354 {
1355 if ( uGameState == 2 ) 1355 if ( uGameState == 2 )
1356 { 1356 {