Mercurial > mm7

comparison mm7_5.cpp @ 1450:8ff3c675a726

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more renaming TE
author Gloval
date Wed, 07 Aug 2013 08:55:34 +0400
parents 27b7ee003c7c
children bfe342ae0c1f
comparison
equal deleted inserted replaced
1449:27b7ee003c7c 1450:8ff3c675a726
2408 Actor::StealFrom(uMessageParam); 2408 Actor::StealFrom(uMessageParam);
2409 continue; 2409 continue;
2410 } 2410 }
2411 if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3 ) 2411 if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3 )
2412 continue; 2412 continue;
2413 if ( !(pTurnEngine->field_18 & TE_FLAG_2) ) 2413 if ( !(pTurnEngine->field_18 & TE_HAVE_PENDING_ACTIONS) )
2414 { 2414 {
2415 if ( pActors[uMessageParam].uAIState == 5 ) 2415 if ( pActors[uMessageParam].uAIState == 5 )
2416 stru_50C198.LootActor(&pActors[uMessageParam]); 2416 stru_50C198.LootActor(&pActors[uMessageParam]);
2417 else 2417 else
2418 Actor::StealFrom(uMessageParam); 2418 Actor::StealFrom(uMessageParam);
2427 _42ECB5_PlayerAttacksActor(); 2427 _42ECB5_PlayerAttacksActor();
2428 continue; 2428 continue;
2429 } 2429 }
2430 if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3 ) 2430 if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 3 )
2431 continue; 2431 continue;
2432 if ( !(pTurnEngine->field_18 & TE_FLAG_2) ) 2432 if ( !(pTurnEngine->field_18 & TE_HAVE_PENDING_ACTIONS) )
2433 _42ECB5_PlayerAttacksActor(); 2433 _42ECB5_PlayerAttacksActor();
2434 continue; 2434 continue;
2435 case UIMSG_ExitRest: 2435 case UIMSG_ExitRest:
2436 GUIWindow::Create(pButton_RestUI_Exit->uX, pButton_RestUI_Exit->uY, 0, 0, WINDOW_CloseRestWindowBtn, (int)pButton_RestUI_Exit, pGlobalTXT_LocalizationStrings[81]);// "Exit Rest" 2436 GUIWindow::Create(pButton_RestUI_Exit->uX, pButton_RestUI_Exit->uY, 0, 0, WINDOW_CloseRestWindowBtn, (int)pButton_RestUI_Exit, pGlobalTXT_LocalizationStrings[81]);// "Exit Rest"
2437 continue; 2437 continue;