| Revision | a39b5a9cfce8393f60a4d88537b7ed45abbba587 (tree) |
|---|---|
| Time | 2017-02-10 11:14:29 |
| Author | ryan <> |
| Commiter | ryan <> |
Cleanup
src/sbs/elevator.cpp (diff)| @@ -571,13 +571,16 @@ bool Elevator::Stop(bool emergency) | ||
| 571 | 571 | { |
| 572 | 572 | //Tells elevator to stop moving, no matter where it is |
| 573 | 573 | |
| 574 | - //exit if in inspection mode | |
| 575 | - if (InspectionService == true && emergency == true) | |
| 576 | - return ReportError("cannot stop while in inspection service mode"); | |
| 574 | + if (emergency == true) | |
| 575 | + { | |
| 576 | + //exit if in inspection mode | |
| 577 | + if (InspectionService == true) | |
| 578 | + return ReportError("cannot stop while in inspection service mode"); | |
| 577 | 579 | |
| 578 | - //exit if in fire service phase 1 recall | |
| 579 | - if (FireServicePhase1 == 1 && FireServicePhase2 == 0 && emergency == true) | |
| 580 | - return ReportError("cannot stop while in fire service 1 recall mode"); | |
| 580 | + //exit if in fire service phase 1 recall | |
| 581 | + if (FireServicePhase1 == 1 && FireServicePhase2 == 0) | |
| 582 | + return ReportError("cannot stop while in fire service 1 recall mode"); | |
| 583 | + } | |
| 581 | 584 | |
| 582 | 585 | if (IsMoving == false) |
| 583 | 586 | { |
Fork