Commit 92aa0944f7b5a89db2bb4bd6f9236bc8b91e86c0
1 parent
e91bd904
Exists in
master
add xsNone TExperiment state
TExperiment must be set to xsWaiting when waiting for players after loading from file.
Showing
1 changed file
with
4 additions
and
2 deletions
Show diff stats
experiment_runner/units/game_experiment.pas
... | ... | @@ -28,7 +28,7 @@ type |
28 | 28 | |
29 | 29 | { TExperiment } |
30 | 30 | |
31 | - TExperimentState = (xsWaiting,xsRunning,xsPaused,xsCanceled); | |
31 | + TExperimentState = (xsNone,xsWaiting,xsRunning,xsPaused,xsCanceled); | |
32 | 32 | TConditions = array of TCondition; |
33 | 33 | |
34 | 34 | TExperiment = class(TComponent) |
... | ... | @@ -750,6 +750,7 @@ constructor TExperiment.Create(AOwner: TComponent); |
750 | 750 | begin |
751 | 751 | inherited Create(AOwner); |
752 | 752 | FTurnsRandom := TStringList.Create; |
753 | + State := xsNone; | |
753 | 754 | end; |
754 | 755 | |
755 | 756 | constructor TExperiment.Create(AOwner: TComponent;AppPath:string); |
... | ... | @@ -758,6 +759,7 @@ begin |
758 | 759 | inherited Create(AOwner); |
759 | 760 | FExperimentPath := AppPath; |
760 | 761 | FTurnsRandom := TStringList.Create; |
762 | + State := xsNone; | |
761 | 763 | //LoadExperimentFromResource(Self); |
762 | 764 | //LDataPath := AppPath+VAL_RESEARCHER+'es'+PathDelim+Researcher+PathDelim+ExperimentName+PathDelim; |
763 | 765 | // |
... | ... | @@ -782,7 +784,7 @@ begin |
782 | 784 | FTurnsRandom := TStringList.Create; |
783 | 785 | LoadExperimentFromFile(Self,AFilename); |
784 | 786 | CheckNeedForRandomTurns; |
785 | - | |
787 | + State := xsWaiting; | |
786 | 788 | //FReportReader := TReportReader.Create; |
787 | 789 | //FRegData := TRegData.Create(Self, AppPath+VAL_RESEARCHER+'es'+PathDelim+Researcher+PathDelim+ExperimentName+PathDelim+'000.dat'); |
788 | 790 | end; | ... | ... |