* Remove ^M's.
* Re-indent automatically.
* Remove whitespace at the end of lines.
This commit is contained in:
jean.chalard
2008-11-12 13:45:42 +00:00
parent 6ad6f9b668
commit c97dd1f260
116 changed files with 18073 additions and 18073 deletions
+1 -1
View File
@@ -2782,7 +2782,7 @@ public:
if( newPhase == MTG_PHASE_COMBATDAMAGE){ if( newPhase == MTG_PHASE_COMBATDAMAGE){
nbOpponents = 0; nbOpponents = 0;
MTGCardInstance * opponent = source->getNextOpponent(); MTGCardInstance * opponent = source->getNextOpponent();
while (opponent && opponent->hasColor(MTG_COLOR_GREEN) || opponent->hasColor(MTG_COLOR_WHITE)){ while ((opponent && opponent->hasColor(MTG_COLOR_GREEN)) || opponent->hasColor(MTG_COLOR_WHITE)){
opponents[nbOpponents] = opponent; opponents[nbOpponents] = opponent;
nbOpponents ++; nbOpponents ++;
opponent = source->getNextOpponent(opponent); opponent = source->getNextOpponent(opponent);
+4 -4
View File
@@ -265,19 +265,19 @@ menuFont = GameApp::CommonRes->GetJLBFont("graphics/f3");
return; return;
} }
if (mStage == STAGE_WAITING || mStage == STAGE_ONSCREEN_MENU){ if (mStage == STAGE_WAITING || mStage == STAGE_ONSCREEN_MENU){
if (mEngine->GetButtonState(PSP_CTRL_LEFT)){ if (mEngine->GetButtonClick(PSP_CTRL_LEFT)){
last_user_activity = 0; last_user_activity = 0;
currentCard = displayed_deck->getNext(currentCard,colorFilter); currentCard = displayed_deck->getNext(currentCard,colorFilter);
mStage = STAGE_TRANSITION_LEFT; mStage = STAGE_TRANSITION_LEFT;
} }
else if (mEngine->GetButtonState(PSP_CTRL_RIGHT)) else if (mEngine->GetButtonClick(PSP_CTRL_RIGHT))
{ {
last_user_activity = 0; last_user_activity = 0;
currentCard = displayed_deck->getPrevious(currentCard,colorFilter); currentCard = displayed_deck->getPrevious(currentCard,colorFilter);
mStage = STAGE_TRANSITION_RIGHT; mStage = STAGE_TRANSITION_RIGHT;
} }
else if (mEngine->GetButtonState(PSP_CTRL_UP)) else if (mEngine->GetButtonClick(PSP_CTRL_UP))
{ {
last_user_activity = 0; last_user_activity = 0;
mStage = STAGE_TRANSITION_UP; mStage = STAGE_TRANSITION_UP;
@@ -285,7 +285,7 @@ menuFont = GameApp::CommonRes->GetJLBFont("graphics/f3");
if (colorFilter < -1) colorFilter = MTG_COLOR_LAND; if (colorFilter < -1) colorFilter = MTG_COLOR_LAND;
} }
else if (mEngine->GetButtonState(PSP_CTRL_DOWN)) else if (mEngine->GetButtonClick(PSP_CTRL_DOWN))
{ {
last_user_activity = 0; last_user_activity = 0;
mStage = STAGE_TRANSITION_DOWN; mStage = STAGE_TRANSITION_DOWN;