Mercurial > mm7
diff mm7_6.cpp @ 2242:c4f87fb3cfee
for NextTurn()
| author | Ritor1 |
|---|---|
| date | Mon, 24 Feb 2014 16:19:01 +0600 |
| parents | 34035536bbf5 |
| children | 8817c398b792 |
line wrap: on
line diff
--- a/mm7_6.cpp Sun Feb 23 03:07:46 2014 +0100 +++ b/mm7_6.cpp Mon Feb 24 16:19:01 2014 +0600 @@ -638,7 +638,7 @@ { char icon_name[32]; sprintf(icon_name, "turn%u", i); - pIconIDs_Turn[i] = pIconsFrameTable->FindIcon("turn0"); + pIconIDs_Turn[i] = pIconsFrameTable->FindIcon(icon_name); pIconsFrameTable->InitializeAnimation(pIconIDs_Turn[i]); } @@ -914,7 +914,7 @@ pPartyActionQueue->Add(partyAction); break; } - if (pTurnEngine->turn_stage != 1 && pTurnEngine->turn_stage != 2 && pTurnEngine->uActionPointsLeft > 0 ) + if (pTurnEngine->turn_stage != TE_WAIT && pTurnEngine->turn_stage != TE_ATTACK && pTurnEngine->uActionPointsLeft > 0 ) { pTurnEngine->uActionPointsLeft -= 26; if ( pParty->uFlags2 & PARTY_FLAGS_2_RUNNING) @@ -937,7 +937,7 @@ pPartyActionQueue->Add(partyAction); break; } - if ( pTurnEngine->turn_stage != 1 && pTurnEngine->turn_stage != 2 && pTurnEngine->uActionPointsLeft > 0 ) + if ( pTurnEngine->turn_stage != TE_WAIT && pTurnEngine->turn_stage != TE_ATTACK && pTurnEngine->uActionPointsLeft > 0 ) { pTurnEngine->uActionPointsLeft -= 26; if ( pParty->uFlags2 & 2 ) @@ -957,7 +957,7 @@ pPartyActionQueue->Add(partyAction); break; } - if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 2 || pTurnEngine->uActionPointsLeft <= 0 ) + if ( pTurnEngine->turn_stage == TE_WAIT || pTurnEngine->turn_stage == TE_ATTACK || pTurnEngine->uActionPointsLeft <= 0 ) break; pTurnEngine->uActionPointsLeft -= 26; partyAction = PARTY_StrafeLeft; @@ -972,7 +972,7 @@ pPartyActionQueue->Add(partyAction); break; } - if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 2 || pTurnEngine->uActionPointsLeft <= 0 ) + if ( pTurnEngine->turn_stage == TE_WAIT || pTurnEngine->turn_stage == TE_ATTACK || pTurnEngine->uActionPointsLeft <= 0 ) break; pTurnEngine->uActionPointsLeft -= 26; partyAction = PARTY_StrafeRight; @@ -985,7 +985,7 @@ { if (pParty->bTurnBasedModeOn) { - if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 2 || pTurnEngine->uActionPointsLeft <= 0 ) + if ( pTurnEngine->turn_stage == TE_WAIT || pTurnEngine->turn_stage == TE_ATTACK || pTurnEngine->uActionPointsLeft <= 0 ) break; pTurnEngine->uActionPointsLeft -= 26; } @@ -1009,7 +1009,7 @@ { if (pParty->bTurnBasedModeOn) { - if ( pTurnEngine->turn_stage == 1 || pTurnEngine->turn_stage == 2 || pTurnEngine->uActionPointsLeft <= 0 ) + if ( pTurnEngine->turn_stage == TE_WAIT || pTurnEngine->turn_stage == TE_ATTACK || pTurnEngine->uActionPointsLeft <= 0 ) break; pTurnEngine->uActionPointsLeft -= 26; } @@ -1042,7 +1042,7 @@ case INPUT_Pass: if ( pCurrentScreen ) break; - if (pParty->bTurnBasedModeOn && pTurnEngine->turn_stage == 3) + if (pParty->bTurnBasedModeOn && pTurnEngine->turn_stage == TE_MOVEMENT) { pTurnEngine->field_18 |= TE_FLAG_8; break; @@ -1063,7 +1063,7 @@ { if (pParty->bTurnBasedModeOn) { - if (pTurnEngine->turn_stage == 3 || PID_TYPE(pTurnEngine->pQueue[0].uPackedID) == OBJECT_Player) + if (pTurnEngine->turn_stage == TE_MOVEMENT || PID_TYPE(pTurnEngine->pQueue[0].uPackedID) == OBJECT_Player) { pParty->bTurnBasedModeOn = 0; pTurnEngine->End(true); @@ -1079,7 +1079,7 @@ case INPUT_CastReady: if (pCurrentScreen != SCREEN_GAME) break; - if (pParty->bTurnBasedModeOn && pTurnEngine->turn_stage == 3) + if (pParty->bTurnBasedModeOn && pTurnEngine->turn_stage == TE_MOVEMENT) { pTurnEngine->field_18 |= TE_FLAG_8; break; @@ -1105,7 +1105,7 @@ case INPUT_Attack: if (pCurrentScreen != SCREEN_GAME) break; - if (pParty->bTurnBasedModeOn == 1 && pTurnEngine->turn_stage == 3) + if (pParty->bTurnBasedModeOn == true && pTurnEngine->turn_stage == TE_MOVEMENT) { pTurnEngine->field_18 |= TE_FLAG_8; break;