Remade android lose/win crash fix

Author: phomm

code/gameoptions.pas

@@ -60,43 +60,20 @@ implementation
   UserNameKey = 'UserName';
   UserGuidKey = 'UserGuid';
 
-{
 procedure SetValue<T>(const AKey: string; AValue: T);
 begin
   UserConfig.SetValue(AKey, AValue);
   if UserConfig.Modified then
     UserConfig.Save();
 end;
-}
-
-procedure SetValue(const AKey: string; const AValue: string); overload;
-begin
-  UserConfig.SetValue(AKey, AValue);
-  if UserConfig.Modified then
-    UserConfig.Save();
-end;
-
-procedure SetValue(const AKey: string; AValue: Boolean); overload;
-begin
-  UserConfig.SetValue(AKey, AValue);
-  if UserConfig.Modified then
-    UserConfig.Save();
-end;
-
-procedure SetValue(const AKey: string; AValue: Integer); overload;
-begin
-  UserConfig.SetValue(AKey, AValue);
-  if UserConfig.Modified then
-    UserConfig.Save();
-end;
 
 function Difficulty(): NDifficulty;
 begin
   Result := NDifficulty(EnumValue(ETPDifficulty, UserConfig.GetValue(DifficultyKey, '')));
   if Ord(Result) in [0..254] then
     Exit;
   Result := DifficultyDefault;
-  SetValue(DifficultyKey, EnumName(ETPDifficulty, Ord(Result)));
+  SetValue<string>(DifficultyKey, EnumName(ETPDifficulty, Ord(Result)));
 end;
 
 function MusicLevel(): Byte;
@@ -106,12 +83,12 @@ function MusicLevel(): Byte;
 
 procedure SetMusicLevel(AValue: Byte);
 begin
-  SetValue(MusicKey, AValue);
+  SetValue<byte>(MusicKey, AValue);
 end;
 
 procedure SetDifficulty(AValue: NDifficulty);
 begin
-  SetValue(DifficultyKey, DifficultyName(AValue));
+  SetValue<string>(DifficultyKey, DifficultyName(AValue));
 end;
 
 function DifficultyName(AValue: NDifficulty): string;
@@ -126,7 +103,7 @@ function Fullscreen(): Boolean;
 
 procedure SetFullscreen(AValue: Boolean);
 begin
-  SetValue(FullscreenKey, AValue);
+  SetValue<Boolean>(FullscreenKey, AValue);
   Application.MainWindow.FullScreen := AValue;
 end;
 
@@ -137,7 +114,7 @@ function UseTimer(): Boolean;
 
 procedure SetUseTimer(AValue: Boolean);
 begin
-  SetValue(UseTimerKey, AValue);
+  SetValue<Boolean>(UseTimerKey, AValue);
 end;
 
 function UserName(): string;
@@ -147,7 +124,7 @@ function UserName(): string;
 
 procedure SetUserName(const AValue: string);
 begin
-  SetValue(UserNameKey, AValue);
+  SetValue<string>(UserNameKey, AValue);
 end;
 
 function UserGuid(): string;
@@ -157,7 +134,7 @@ function UserGuid(): string;
 
 procedure SetUserGuid(const AValue: string);
 begin
-  SetValue(UserGuidKey, AValue);
+  SetValue<string>(UserGuidKey, AValue);
 end;
 
 initialization

code/gameviewgame.pas

@@ -443,8 +443,8 @@ procedure TViewGame.TimerBloodTick(ASender: TObject);
 
   if Map.Hero.Dead then
   begin
-    TimerPreEnd.Exists := True;
-    FViewEnd := ViewDefeat;
+    //TimerPreEnd.Exists := True;
+    Container.View := ViewDefeat;
   end
   else
   begin
@@ -464,21 +464,22 @@ procedure TViewGame.TimerBloodTick(ASender: TObject);
 
     if LWeapon = hwNo then
       WeaponClick(hwNo);
+    UpdateRooms();
+    UpdateMiniBossRooms();
     //WriteLnLog(Format('T%d S%d L%d L%d', [Map.HeroTowerIndex, Map.HeroStockIndex, Map.LastTower, Map.LastStock]));
     if Map.IsFinalRoom(Map.HeroTowerIndex + 1, Map.HeroStockIndex + 1) then
     begin
-      TimerPreEnd.Exists := True;
-      FViewEnd := ViewWin;
+      //TimerPreEnd.Exists := True;
       ViewWin.Score := Map.Score(FGameTicks);
+      Container.View := ViewWin;
     end;
-    UpdateRooms();
-    UpdateMiniBossRooms();
   end;
   FSkip := False;  
 end;
 
 procedure TViewGame.TimerPreEndTick(ASender: TObject);
 begin
+  FPause := True;
   TimerPreEnd.Exists := False;
   Container.View := FViewEnd;
 end;