comparison TurnEngine.cpp @ 1696:7d99124bccd8

Merge
author Grumpy7
date Sun, 22 Sep 2013 10:51:08 +0200
parents 4da5644df18f
children a86c60679949
comparison
equal deleted inserted replaced
1695:33df22a5e376 1696:7d99124bccd8
543 _494035_timed_effects__water_walking_damage__etc(); 543 _494035_timed_effects__water_walking_damage__etc();
544 uActionPointsLeft = 130; 544 uActionPointsLeft = 130;
545 } 545 }
546 546
547 //----- (004063A1) -------------------------------------------------------- 547 //----- (004063A1) --------------------------------------------------------
548 int stru262_TurnBased::StepTurnQueue() 548 bool stru262_TurnBased::StepTurnQueue()
549 { 549 {
550 int v9; // dx@12 550 int v9; // dx@12
551 int j; 551 int j;
552 552
553 SortTurnQueue(); 553 SortTurnQueue();
554 viewparams->bRedrawGameUI = 1; 554 viewparams->bRedrawGameUI = 1;
562 { 562 {
563 --pQueue[j].actor_initiative; 563 --pQueue[j].actor_initiative;
564 } 564 }
565 --turn_initiative; 565 --turn_initiative;
566 if (turn_initiative == 0) 566 if (turn_initiative == 0)
567 return 1; 567 return true;
568 } 568 }
569 while (pQueue[0].actor_initiative != 0); 569 while (pQueue[0].actor_initiative != 0);
570 } 570 }
571 else 571 else
572 { 572 {
584 if (pQueue[j].actor_initiative == 0) 584 if (pQueue[j].actor_initiative == 0)
585 pQueue[j].uActionLength = 0; 585 pQueue[j].uActionLength = 0;
586 } 586 }
587 --turn_initiative; 587 --turn_initiative;
588 if (turn_initiative == 0) 588 if (turn_initiative == 0)
589 return 1; 589 return true;
590 } 590 }
591 while (pQueue[0].actor_initiative > 0); 591 while (pQueue[0].actor_initiative > 0);
592 } 592 }
593 } 593 }
594 } 594 }
595 } 595 }
596 return 0; 596 return false;
597 } 597 }
598 598
599 //----- (00406457) -------------------------------------------------------- 599 //----- (00406457) --------------------------------------------------------
600 void stru262_TurnBased::_406457( int a2 ) 600 void stru262_TurnBased::_406457( int a2 )
601 { 601 {