Download as
Browse Code »

Commit fc8185c8b3de8fbff40790d253661a12b982fa93

Authored by Carlos Picanco
1 parent e67c4f7a
Exists in master

runner: fix missing points for admins

Showing 1 changed file with 17 additions and 11 deletions   Show diff stats
experiment_runner/units/game_control.pas
  Diff comments   View file @fc8185c
@@ -522,7 +522,7 @@ begin @@ -522,7 +522,7 @@ begin
522 LConsequence := TConsequence.Create(nil,S); 522 LConsequence := TConsequence.Create(nil,S);
523 Result := LConsequence.GenerateMessage(ForGroup); 523 Result := LConsequence.GenerateMessage(ForGroup);
524 if ShowPopUp then 524 if ShowPopUp then
525 - LConsequence.PresentMessage(FormMatrixGame.GBIndividualAB); 525 + LConsequence.PresentMessage(FormMatrixGame.GBIndividualAB);
526 case FActor of 526 case FActor of
527 gaPlayer: 527 gaPlayer:
528 if ForGroup then 528 if ForGroup then
@@ -1014,7 +1014,9 @@ procedure TGameControl.ReceiveMessage(AMessage: TStringList); @@ -1014,7 +1014,9 @@ procedure TGameControl.ReceiveMessage(AMessage: TStringList);
1014 WriteLn('A Prompt consequence should have shown.'); 1014 WriteLn('A Prompt consequence should have shown.');
1015 {$ENDIF} 1015 {$ENDIF}
1016 end; 1016 end;
1017 - ShowPopUp(LQConsequence); 1017 +
  1018 + if LQConsequence <> '' then
  1019 + ShowPopUp(LQConsequence);
1018 end; 1020 end;
1019 ResumeNextTurn; 1021 ResumeNextTurn;
1020 if AMessage[2] <> #32 then 1022 if AMessage[2] <> #32 then
@@ -1381,15 +1383,19 @@ procedure TGameControl.ReceiveReply(AReply: TStringList); @@ -1381,15 +1383,19 @@ procedure TGameControl.ReceiveReply(AReply: TStringList);
1381 begin 1383 begin
1382 LConsequence := TConsequence.Create(nil,ExtractDelimited(i,AReply[6],['+'])); 1384 LConsequence := TConsequence.Create(nil,ExtractDelimited(i,AReply[6],['+']));
1383 LConsequence.GenerateMessage(False); 1385 LConsequence.GenerateMessage(False);
1384 - if LConsequence.ShouldPublishMessage then  
1385 - //FZMQActor.SendMessage([K_MESSAGE,Self.ID,ExtractDelimited(i,AReply[6],['+']),BoolToStr(False)])  
1386 - LAnnouncer.Append([K_MESSAGE,Self.ID,ExtractDelimited(i,AReply[6],['+']),BoolToStr(False)])  
1387 - else  
1388 - begin  
1389 - LConsequence.PresentMessage(FormMatrixGame.GBIndividualAB);  
1390 - LConsequence.PresentPoints(FormMatrixGame.LabelIndACount,FormMatrixGame.LabelIndBCount,  
1391 - FormMatrixGame.LabelIndCount,FormMatrixGame.LabelGroupCount);  
1392 - end; 1386 + LAnnouncer.Append([K_MESSAGE,
  1387 + Self.ID,
  1388 + ExtractDelimited(i,AReply[6],['+']),
  1389 + BoolToStr(LConsequence.ShouldPublishMessage)]);
  1390 + //if LConsequence.ShouldPublishMessage then
  1391 + // //FZMQActor.SendMessage([K_MESSAGE,Self.ID,ExtractDelimited(i,AReply[6],['+']),BoolToStr(False)])
  1392 + // LAnnouncer.Append([K_MESSAGE,Self.ID,ExtractDelimited(i,AReply[6],['+']),BoolToStr(False)])
  1393 + //else
  1394 + // begin
  1395 + // LConsequence.PresentMessage(FormMatrixGame.GBIndividualAB);
  1396 + // LConsequence.PresentPoints(FormMatrixGame.LabelIndACount,FormMatrixGame.LabelIndBCount,
  1397 + // FormMatrixGame.LabelIndCount,FormMatrixGame.LabelGroupCount);
  1398 + // end;
1393 {$IFDEF DEBUG} 1399 {$IFDEF DEBUG}
1394 WriteLn('A consequence should have shown.'); 1400 WriteLn('A consequence should have shown.');
1395 {$ENDIF} 1401 {$ENDIF}