Various corrections, debug logs removed

Author: phomm

code/gameoptions.pas

@@ -80,7 +80,7 @@ function MusicLevel(): Byte;
 
 procedure SetMusicLevel(AValue: Byte);
 begin
-  SetValue<byte>(MusicKey, AValue);
+  SetValue<Integer>(MusicKey, AValue);
 end;
 
 procedure SetDifficulty(AValue: NDifficulty);

code/gameviewcredits.pas

@@ -28,7 +28,9 @@ implementation
 // System
   SysUtils,
 // Castle  
-  castlewindow, CastleOpenDocument;
+  castlewindow, CastleOpenDocument,
+// Own  
+  gameviewmain;
 
 constructor TViewCredits.Create(AOwner: TComponent);
 begin
@@ -51,14 +53,14 @@ function TViewCredits.Press(const Event: TInputPressRelease): Boolean;
 
   if Event.IsKey(keyEscape) or Event.IsKey(keyBackSpace) then
   begin
-    Container.PopView();
+    Container.View := ViewMain;
     Exit(true); // key was handled
   end; 
 end;
 
 procedure TViewCredits.ButtonMenuClick(Sender: TObject);
 begin
-  Container.PopView();
+  Container.View := ViewMain;
 end;
 
 procedure TViewCredits.ButtonCastleClick(Sender: TObject);

code/gameviewformula.pas

@@ -196,7 +196,7 @@ function TViewFormula.CalcFormula(AFormula: string): Integer;
 begin
   LOp := hwNo;
   LValue := 0;
-  WriteLnLog('Original formula: ' + AFormula);
+  //WriteLnLog('Original formula: ' + AFormula);
   I := 1;
   while I <= Length(AFormula) do
   begin
@@ -219,7 +219,7 @@ function TViewFormula.CalcFormula(AFormula: string): Integer;
   end;
   if LOp = hwMultiply then
     AFormula := Copy(AFormula, 1, Length(AFormula) - MultLen) + (Arg1 * LValue).ToString;
-  WriteLnLog('Modified formula: ' + AFormula);
+  //WriteLnLog('Modified formula: ' + AFormula);
 
   Result := 0;
   LValue := 0;  

code/gameviewleaders.pas

@@ -115,8 +115,11 @@ procedure TViewLeaders.ButtonMenuClick(Sender: TObject);
 procedure TViewLeaders.ButtonSyncClick(Sender: TObject);
 begin
 // Sync with server, and update the list of leaders for the current difficulty.
-  if not TCastleRest.IsRunning() then 
-    TCastleRest.ServerRequest(ServerApiUrl, GetLeadersFinished)
+  if not TCastleRest.IsRunning() then
+  begin 
+    PanelNotifications.Show('Retrieving Leaders from server...');
+    TCastleRest.ServerRequest(ServerApiUrl, GetLeadersFinished);
+  end
   else
     PanelNotifications.Show('Another request is running');
 end;

code/gameviewmain.pas

@@ -189,12 +189,12 @@ procedure TViewMain.ButtonExitClick(Sender: TObject);
 
 procedure TViewMain.ButtonStartClick(Sender: TObject);
 begin
-  Container.View := (ViewGame);
+  Container.View := ViewGame;
 end;
 
 procedure TViewMain.ButtonLeadersClick(Sender: TObject);
 begin
-  Container.PushView(ViewLeaders);
+  Container.View := ViewLeaders;
 end;
 
 procedure TViewMain.ButtonOptionsClick(Sender: TObject);
@@ -204,7 +204,7 @@ procedure TViewMain.ButtonOptionsClick(Sender: TObject);
 
 procedure TViewMain.ButtonCreditsClick(Sender: TObject);
 begin
-  Container.PushView(ViewCredits);
+  Container.View := ViewCredits;
 end;
 
 function TViewMain.Press(const Event: TInputPressRelease): Boolean;

code/gameviewwin.pas

@@ -137,6 +137,7 @@ procedure TViewWin.SubmitScoresFinished(const AContent: string; ASuccess: Boolea
   end
   else 
     PanelNotifications.Show('Submit failed: ' + AContent);
+  EditName.Enabled := True;
 end;
 
 end.

code/models.pas

@@ -74,14 +74,14 @@ implementation
 
 function TProblemDetails.ToString(): string; 
 begin
-  Result := Title;
+  Result := Title + ': ' + Detail;
 end;
 
 constructor TSubmitLeader.Create(const AName: string; AScore: Integer; ADifficulty: NDifficulty);
 begin
   inherited Create();
   Name := AName;
-  Guid := IIF(UserName = Name, UserGuid, '');
+  Guid := UserGuid;
   Score := AScore;
   Difficulty := Ord(ADifficulty);
   CalcHash();
@@ -96,7 +96,7 @@ procedure TSubmitLeader.CalcHash();
   LHashResult: IHashResult; 
 begin
   FHash := Format(HashTemplate, [Difficulty, IIF(Guid = '', '', ':Guid='+ Guid), Name, Salt, Score]);
-  WriteLnLog('ForHash ' + FHash);
+  //WriteLnLog('ForHash ' + FHash);
 
   LHash := THashFactory.TCrypto.CreateSHA2_256();
   LHashResult := LHash.ComputeString(FHash, TEncoding.UTF8);