WebSVN – spacemission – Diff – /GamMain.pas

   public
     constructor Create(AParent: TSprite); override;
     destructor Destroy; override;
   end;
+  TEnemyClass = class of TEnemy;
   TEnemy = class(TImageSprite)
   private
     FCounter: Integer;
     FLife: integer;
     FMode: Integer;
-    procedure Hit; virtual;
   protected
     procedure HitEnemy(ADead: Boolean); virtual;
   public
+    procedure Hit(AHitStrength: integer = 1);
-    constructor Create(AParent: TSprite); override;
+    constructor Create(AParent: TSprite; ALifes: integer); virtual;
     destructor Destroy; override;
   end;
   TEnemyTama = class(TImageSprite)
   private
   TEnemyMeteor = class(TEnemy)
   protected
     procedure DoMove(MoveCount: Integer); override;
     procedure HitEnemy(ADead: Boolean); override;
   public
-    constructor Create(AParent: TSprite); override;
+    constructor Create(AParent: TSprite; ALifes: integer); override;
   end;
   TEnemyUFO = class(TEnemy)
   protected
     procedure DoMove(MoveCount: Integer); override;
     procedure HitEnemy(ADead: Boolean); override;
   public
-    constructor Create(AParent: TSprite); override;
+    constructor Create(AParent: TSprite; ALifes: integer); override;
   end;
   TEnemyUFO2 = class(TEnemy)
   private
     FCounter: Integer;
     FOldTamaTime: Integer;
   protected
     procedure DoMove(MoveCount: Integer); override;
     procedure HitEnemy(ADead: Boolean); override;
   public
-    constructor Create(AParent: TSprite); override;
+    constructor Create(AParent: TSprite; ALifes: integer); override;
   end;
   TEnemyAttacker = class(TEnemy)
   protected
     procedure DoMove(MoveCount: Integer); override;
     procedure HitEnemy(ADead: Boolean); override;
   public
-    constructor Create(AParent: TSprite); override;
+    constructor Create(AParent: TSprite; ALifes: integer); override;
   end;
   TEnemyAttacker2 = class(TEnemy)
   private
     FCounter: Integer;
     FPutTama: Boolean;
   protected
     procedure DoMove(MoveCount: Integer); override;
     procedure HitEnemy(ADead: Boolean); override;
   public
-    constructor Create(AParent: TSprite); override;
+    constructor Create(AParent: TSprite; ALifes: integer); override;
   end;
   TEnemyAttacker3 = class(TEnemy)
   private
     FCounter: Integer;
     FOldTamaTime: Integer;
   protected
     procedure DoMove(MoveCount: Integer); override;
     procedure HitEnemy(ADead: Boolean); override;
   public
-    constructor Create(AParent: TSprite); override;
+    constructor Create(AParent: TSprite; ALifes: integer); override;
   end;
   TEnemyBoss = class(TEnemy)
   private
     FCounter: Integer;
     waiter1, waiter2: integer;
   protected
     procedure DoMove(MoveCount: Integer); override;
     procedure HitEnemy(ADead: Boolean); override;
   public
-    constructor Create(AParent: TSprite); override;
+    constructor Create(AParent: TSprite; ALifes: integer); override;
   end;
-  TNothing = class(TImageSprite);
-  TSpriteClass = class of TSprite;
   TEnemyAdvent = record
-    spriteClass: TSpriteClass;
+    spriteClass: TEnemyClass;
     x: extended;
     y: extended;
     lifes: integer;
   end;
     FMusic: TMusicTrack;
     FBlink: DWORD;
     FBlinkTime: DWORD;
     FFrame, FAngle, FCounter, FEnemyAdventPos: Integer;
     PlayerSprite: TPlayerSprite;
+    TimerCS: TRTLCriticalSection;
     procedure StartScene(Scene: TGameScene);
     procedure EndScene;
     procedure BlinkStart;
     procedure BlinkUpdate;
     procedure StartSceneTitle;
     FNotSave: boolean;
     FLife: integer;
     FLevel: integer;
     FMenuItem: integer;
     FBossLife: integer;
-    FRestEnemys: integer;
+    FRestEnemies: integer;
     FCheat: boolean;
     { VCL-Ersatz }
     dxdraw: TDxDraw;
     imagelist: TDxImageList;
     spriteengine: tdxspriteengine;
   end;
 var
   MainForm: TMainForm;
+implementation
+uses
+  GamSplash, GamSpeicherung, ComInfo, GamCheat, Global;
 const
   // TODO: ini file
   conleicht = 650 div 60; // 10
   conmittel = 1000 div 60; // 16
   conschwer = 1350 div 60; // 22
   conmaster = 2000 div 60; // 33
   lives = 6;
+  // TODO: Auch für Enemies
+  PLAYER_MODE_NORMAL = 0;
-implementation
+  PLAYER_MODE_DEAD = 1;
+  PLAYER_MODE_DEAD_VANISHED = 2;
+  PLAYER_MODE_FLYAWAY = 3;
+  PLAYER_MODE_ENTER = 4;
-uses
-  GamSplash, GamSpeicherung, ComInfo, GamCheat, Global;
+  DEFAULT_ANIMSPEED = 15/1000;
 resourcestring
   FileError = 'Die Datei kann von SpaceMission nicht geöffnet werden!';
 {$R *.DFM}
 var // TODO: irgendwo hinpacken. irgendwo!!!
-  EnemyAdventTable: array[0..9999] of TEnemyAdvent; // TODO: dyn
+  EnemyAdventTable: array of TEnemyAdvent;
-  Crash2, ec: integer;
+  Crash2, EnemyCounter: integer;
   BossExists, Crash, crashsound: boolean;
-  pos: array[1..4] of integer;
-  enemys: array[1..27] of TSpriteClass;
-  levact: integer;
 const
   DXInputButton = [isButton1, isButton2, isButton3,
     isButton4, isButton5, isButton6, isButton7, isButton8, isButton9, isButton10, isButton11,
     isButton12, isButton13, isButton14, isButton15, isButton16, isButton17, isButton18,
     isButton19, isButton20, isButton21, isButton22, isButton23, isButton24, isButton25,
     isButton26, isButton27, isButton28, isButton29, isButton30, isButton31, isButton32];
-const // TODO: Auch für Enemies
-  PLAYER_MODE_NORMAL = 0;
-  PLAYER_MODE_DEAD = 1;
-  PLAYER_MODE_DEAD_VANISHED = 2;
-  PLAYER_MODE_FLYAWAY = 3;
-  PLAYER_MODE_ENTER = 4;
-  DEFAULT_ANIMSPEED = 15/1000;
 // TODO: Code komplett überarbeiten. Bessere Ableitungen machen
 constructor TPlayerSprite.Create(AParent: TSprite);
 begin
   inherited Create(AParent);
         end;
         FOldTamaTime := FCounter;
       end;
     end;
     Collision;
+  end
-  end else if FMode=PLAYER_MODE_DEAD then
+  else if FMode=PLAYER_MODE_DEAD then
   begin
     if FCounter>200 then
     begin
       FCounter := 0;
       FMode := PLAYER_MODE_DEAD_VANISHED;
       Visible := false;
     end;
+  end
-  end else if FMode=PLAYER_MODE_DEAD_VANISHED then
+  else if FMode=PLAYER_MODE_DEAD_VANISHED then
   begin
     if FCounter>1500 then
     begin
       MainForm.FNextScene := gsGameOver;
       MainForm.PlaySound('SceneMov', false);
       MainForm.PalleteAnim(RGBQuad(0, 0, 0), 300);
       Sleep(200);
     end;
+  end
-  end else if FMode=PLAYER_MODE_FLYAWAY then
+  else if FMode=PLAYER_MODE_FLYAWAY then
   begin
     // FUT: "Wusch" sound?
     X := X + MoveCount*(300/1000) * (X/MainForm.DXDraw.Width + WegduesKonstante);
     if X > MainForm.DXDraw.Width+Width then
     begin
       inc(mainform.FLevel);
       MainForm.FNextScene := gsNewLevel;
       MainForm.PlaySound('SceneMov', false);
       MainForm.PalleteAnim(RGBQuad(0, 0, 0), 300);
     end;
+  end
-  end else if FMode = PLAYER_MODE_ENTER then
+  else if FMode = PLAYER_MODE_ENTER then
   begin
     X := X + MoveCount*(300/1000);
     if X > 19 then FMode := PLAYER_MODE_NORMAL;
   end;
   inc(FCounter, MoveCount);
     DXDraw.Finalize;
     if OptionFullScreen.Checked then
     begin
       if not (doFullScreen in DXDraw.Options) then StoreWindow;
       DXDraw.Options := DXDraw.Options + [doFullScreen];
+    end
-    end else
+    else
     begin
       if doFullScreen in DXDraw.Options then RestoreWindow;
       DXDraw.Options := DXDraw.Options - [doFullScreen];
     end;
     if not OptionBreitBild.checked then
   Dec(FPlayerSprite.FTamaCount);
 end;
 procedure TTamaSprite.DoCollision(Sprite: TSprite; var Done: Boolean);
 begin
-  if (Sprite is TEnemy) and (not (Sprite is TEnemyTama)) then
+  if (Sprite is TEnemy) and not (Sprite is TEnemyTama) then
   begin
     TEnemy(Sprite).Hit;
     Dead;
   end;
   Done := False;
   inherited DoMove(MoveCount);
   X := X - MoveCount*(600/1000);
   if X<-Width then Dead;
 end;
-procedure TEnemy.Hit;
+procedure TEnemy.Hit(AHitStrength: integer = 1);
 begin
-  Dec(FLife);
+  Dec(FLife, AHitStrength);
   if FLife<=0 then
   begin
     Collisioned := False;
     HitEnemy(True);
   end
     HitEnemy(False);
 end;
 procedure TEnemy.HitEnemy(ADead: Boolean);
 begin
+  if ADead then
-  if ADead then MainForm.PlaySound('Explosion', False);
+    MainForm.PlaySound('Explosion', False)
+  else
+    MainForm.PlaySound('Hit', False);
 end;
-constructor TEnemyUFO.Create(AParent: TSprite);
+constructor TEnemyUFO.Create(AParent: TSprite; ALifes: integer);
 begin
-  inherited Create(AParent);
+  inherited Create(AParent, ALifes);
   Image := MainForm.ImageList.Items.Find('Enemy-disk');
   Width := Image.Width;
   Height := Image.Height;
   AnimCount := Image.PatternCount;
   AnimLooped := True;
   AnimSpeed := DEFAULT_ANIMSPEED;
-  FLife := EnemyAdventTable[mainform.FEnemyAdventPos].lifes;
 end;
-constructor TEnemy.Create(AParent: TSprite);
+constructor TEnemy.Create(AParent: TSprite; ALifes: integer);
 begin
   inherited Create(AParent);
-  dec(mainform.FRestEnemys);
+  FLife := ALifes;
-  inc(ec);
+  inc(EnemyCounter);
 end;
 destructor TEnemy.Destroy;
 begin
   inherited Destroy;
-  dec(ec);
+  dec(EnemyCounter);
 end;
 procedure TEnemyUFO.HitEnemy(ADead: Boolean);
 begin
+  inherited HitEnemy(ADead);
   if ADead then
   begin
-    MainForm.PlaySound('Explosion', False);
     FMode := 2;
     FCounter := 0;
     Inc(MainForm.FScore, 1000);
     Image := MainForm.ImageList.Items.Find('Explosion');
     Width := Image.Width;
     Height := Image.Height;
     AnimCount := Image.PatternCount;
     AnimLooped := False;
     AnimSpeed := DEFAULT_ANIMSPEED;
     AnimPos := 0;
+  end
-  end else
+  else
   begin
-    MainForm.PlaySound('Hit', False);
     Inc(MainForm.FScore, 100);
   end;
 end;
 procedure TEnemyUFO2.DoMove(MoveCount: Integer);
         Y := Self.Y+Self.Height div 2-Height div 2;
         Z := 10;
       end;
       FOldTamaTime := FCounter;
     end;
+  end
-  end else if FMode=2 then
+  else if FMode=2 then
   begin
     X := X - MoveCount*(300/1000);
     if FCounter>200 then Dead;
   end;
   inc(FCounter, MoveCount);
 end;
 procedure TEnemyUFO2.HitEnemy(ADead: Boolean);
 begin
+  inherited HitEnemy(ADead);
   if ADead then
   begin
-    MainForm.PlaySound('Explosion', False);
     FMode := 2;
     FCounter := 0;
     Inc(MainForm.FScore, 1000);
     Image := MainForm.ImageList.Items.Find('Explosion');
     Width := Image.Width;
     Height := Image.Height;
     AnimCount := Image.PatternCount;
     AnimLooped := False;
     AnimSpeed := DEFAULT_ANIMSPEED;
     AnimPos := 0;
+  end
-  end else
+  else
   begin
-    MainForm.PlaySound('Hit', False);
     Inc(MainForm.FScore, 100);
   end;
 end;
-constructor TEnemyUFO2.Create(AParent: TSprite);
+constructor TEnemyUFO2.Create(AParent: TSprite; ALifes: integer);
 begin
-  inherited Create(AParent);
+  inherited Create(AParent, ALifes);
   Image := MainForm.ImageList.Items.Find('Enemy-disk2');
   Width := Image.Width;
   Height := Image.Height;
   AnimCount := Image.PatternCount;
   AnimLooped := True;
   AnimSpeed := DEFAULT_ANIMSPEED;
-  FLife := EnemyAdventTable[mainform.FEnemyAdventPos].lifes;
 end;
 procedure TEnemyUFO.DoMove(MoveCount: Integer);
 begin
   inherited DoMove(MoveCount);
   if FMode=0 then
   begin
     X := X - MoveCount*(300/1000);
     Y := Y + Cos256(FCounter div 15)*2;
     if X<-Width then Dead;
+  end
-  end else if FMode=2 then
+  else if FMode=2 then
   begin
     X := X - MoveCount*(300/1000);
     if FCounter>200 then Dead;
   end;
   inc(FCounter, MoveCount);
 end;
-constructor TEnemyAttacker.Create(AParent: TSprite);
+constructor TEnemyAttacker.Create(AParent: TSprite; ALifes: integer);
 begin
-  inherited Create(AParent);
+  inherited Create(AParent, ALifes);
   Image := MainForm.ImageList.Items.Find('Enemy-Attacker');
   Width := Image.Width;
   Height := Image.Height;
   AnimCount := Image.PatternCount;
   AnimLooped := True;
   AnimSpeed := DEFAULT_ANIMSPEED;
   PixelCheck := True;
-  FLife := EnemyAdventTable[mainform.FEnemyAdventPos].lifes;
 end;
 procedure TEnemyAttacker.HitEnemy(ADead: Boolean);
 begin
+  inherited HitEnemy(ADead);
   if ADead then
   begin
-    MainForm.PlaySound('Explosion', False);
     FMode := 2;
     FCounter := 0;
     Inc(MainForm.FScore, 1000);
     Image := MainForm.ImageList.Items.Find('Explosion');
     Width := Image.Width;
     Height := Image.Height;
     AnimCount := Image.PatternCount;
     AnimLooped := False;
     AnimSpeed := DEFAULT_ANIMSPEED;
     AnimPos := 0;
+  end
-  end else
+  else
   begin
-    MainForm.PlaySound('Hit', False);
     Inc(MainForm.FScore, 100);
   end;
 end;
 procedure TEnemyAttacker.DoMove(MoveCount: Integer);
   inherited DoMove(MoveCount);
   if FMode=0 then
   begin
     X := X - MoveCount*(300/1000)-FCounter div 128;
     if X < -Width then Dead;
+  end
-  end else if FMode=2 then
+  else if FMode=2 then
   begin
     X := X - MoveCount*(300/1000);
     if FCounter>200 then Dead;
   end;
   inc(FCounter, MoveCount);
 end;
-constructor TEnemyBoss.Create(AParent: TSprite);
+constructor TEnemyBoss.Create(AParent: TSprite; ALifes: integer);
 begin
-  inherited Create(AParent);
+  inherited Create(AParent, ALifes);
   Image := MainForm.ImageList.Items.Find('Enemy-boss');
   Width := Image.Width;
   Height := Image.Height;
   BossExists := true;
   MainForm.PlayMusic(mtBoss);
   AnimCount := Image.PatternCount;
   AnimLooped := True;
   AnimSpeed := DEFAULT_ANIMSPEED;
   PixelCheck := True;
   Collisioned := False;
-  FLife := EnemyAdventTable[mainform.FEnemyAdventPos].lifes;
   MainForm.FBossLife := FLife;
   waiter1 := 0;
   waiter2 := 0;
 end;
 procedure TEnemyBoss.HitEnemy(ADead: Boolean);
 begin
+  inherited HitEnemy(ADead);
   if ADead then
   begin
-    MainForm.PlaySound('Explosion', False);
     FMode := 2;
     FCounter := 0;
     Inc(MainForm.FScore, 100000);
     BossExists := false;
     dec(MainForm.FBossLife);
+  end
-  end else
+  else
   begin
-    MainForm.PlaySound('Hit', False);
     Inc(MainForm.FScore, 100);
     dec(MainForm.FBossLife);
   end;
 end;
       Collisioned := True;
       FMode := 1;
       FPutTama := True;
     end;
     Y := Y + Cos256(FCounter div 15)*5;
+  end
-  end else if FMode=1 then
+  else if FMode=1 then
   begin
     Y := Y + Cos256(FCounter div 15)*5;
     if FPutTama then
     begin
       if FTamaT>100 then
         Inc(FTamaF);
         if FTamaF>Random(30) then FPutTama := False;
         FTamaT := 0;
       end;
       FTamaT := FTamaT + MoveCount;
+    end
-    end else
+    else
     begin
       FTamaT := FTamaT + MoveCount;
       if FTamaT>2000+Random(500) then
       begin
         FPutTama := True;
         FTamaF := 0;
         FTamaT := 0;
       end;
     end;
+  end
-  end else if FMode=2 then
+  else if FMode=2 then
   begin
     inc(waiter1);
     if waiter1 = 3 then
     begin
       waiter1 := 0;
       begin
         Inc(MainForm.FScore, 1000);
         FMode := 3;
       end;
     end;
+  end
-  end else if FMode=3 then
+  else if FMode=3 then
   begin
-    if FCounter>4000 then dead;
+    if FCounter>4000 then Dead;
   end;
   inc(FCounter, MoveCount);
 end;
-constructor TEnemyAttacker2.Create(AParent: TSprite);
+constructor TEnemyAttacker2.Create(AParent: TSprite; ALifes: integer);
 begin
-  inherited Create(AParent);
+  inherited Create(AParent, ALifes);
   Image := MainForm.ImageList.Items.Find('Enemy-Attacker2');
   Width := Image.Width;
   Height := Image.Height;
   AnimCount := Image.PatternCount;
   AnimLooped := True;
   AnimSpeed := DEFAULT_ANIMSPEED;
   PixelCheck := True;
-  FLife := EnemyAdventTable[mainform.FEnemyAdventPos].lifes;
 end;
 procedure TEnemyAttacker2.HitEnemy(ADead: Boolean);
 begin
+  inherited HitEnemy(ADead);
   if ADead then
   begin
-    MainForm.PlaySound('Explosion', False);
     FMode := 2;
     FCounter := 0;
     Inc(MainForm.FScore, 5000);
     Image := MainForm.ImageList.Items.Find('Explosion');
     Width := Image.Width;
     Height := Image.Height;
     AnimCount := Image.PatternCount;
     AnimLooped := False;
     AnimSpeed := DEFAULT_ANIMSPEED;
     AnimPos := 0;
+  end
-  end else
+  else
   begin
-    MainForm.PlaySound('Hit', False);
     Inc(MainForm.FScore, 100);
   end;
 end;
 procedure TEnemyAttacker2.DoMove(MoveCount: Integer);
       Collisioned := True;
       FMode := 1;
       FPutTama := True;
     end;
     Y := Y + Cos256(FCounter div 15)*5;
+  end
-  end else if FMode=1 then
+  else if FMode=1 then
   begin
     Y := Y + Cos256(FCounter div 15)*5;
     if FPutTama then
     begin
       if FTamaT>100 then
         Inc(FTamaF);
         if FTamaF>Random(30) then FPutTama := False;
         FTamaT := 0;
       end;
       FTamaT := FTamaT + MoveCount;
+    end
-    end else
+    else
     begin
       FTamaT := FTamaT + MoveCount;
       if FTamaT>2000+Random(500) then
       begin
         FPutTama := True;
         FTamaF := 0;
         FTamaT := 0;
       end;
     end;
+  end
-  end else if FMode=2 then
+  else if FMode=2 then
   begin
     if FCounter>200 then Dead;
   end;
   inc(FCounter, MoveCount);
 end;
 procedure TEnemyAttacker3.HitEnemy(ADead: Boolean);
 begin
+  inherited HitEnemy(ADead);
   if ADead then
   begin
-    MainForm.PlaySound('Explosion', False);
     FMode := 1;
     FCounter := 0;
     Inc(MainForm.FScore, 5000);
     Image := MainForm.ImageList.Items.Find('Explosion');
     Width := Image.Width;
     Height := Image.Height;
     AnimCount := Image.PatternCount;
     AnimLooped := False;
     AnimSpeed := DEFAULT_ANIMSPEED;
     AnimPos := 0;
+  end
-  end else
+  else
   begin
-    MainForm.PlaySound('Hit', False);
     Inc(MainForm.FScore, 100);
   end;
 end;
 procedure TEnemyAttacker3.DoMove(MoveCount: Integer);
         Y := Self.Y+Self.Height div 2-Height div 2;
         Z := 10;
       end;
       FOldTamaTime := FCounter;
      end;
+  end
-  end else if FMode=1 then
+  else if FMode=1 then
   begin
     if FCounter>200 then Dead;
   end;
   inc(FCounter, MoveCount);
 end;
-constructor TEnemyAttacker3.Create(AParent: TSprite);
+constructor TEnemyAttacker3.Create(AParent: TSprite; ALifes: integer);
 begin
-  inherited Create(AParent);
+  inherited Create(AParent, ALifes);
   Image := MainForm.ImageList.Items.Find('Enemy-Attacker3');
   Width := Image.Width;
   Height := Image.Height;
   AnimCount := Image.PatternCount;
   AnimLooped := True;
   AnimSpeed := DEFAULT_ANIMSPEED;
   PixelCheck := True;
-  FLife := EnemyAdventTable[mainform.FEnemyAdventPos].lifes;
 end;
 function TMainForm.SoundKarte: boolean;
 begin
   result := WaveOutGetNumDevs > 0;
   imagelist.DXDraw := dxdraw;
   spriteengine := tdxspriteengine.create(self);
   spriteengine.DXDraw := dxdraw;
+  InitializeCriticalSection(TimerCS);
   { Ende VCL-Ersatz }
   Application.Title := 'SpaceMission '+ProgramVersion;
   LoadOptions;
   DXInit;
 procedure TMainForm.GamePauseClick(Sender: TObject);
 begin
   GamePause.Checked := not GamePause.Checked;
   DXTimer.Enabled := not GamePause.Checked;
-  if GamePause.Checked then PauseMusic(FMusic) else
+  if GamePause.Checked then
+    PauseMusic(FMusic)
+  else
     ResumeMusic(FMusic);
 end;
 // http://www.delphipraxis.net/post43515.html
 Function GetHTML(AUrl: string): string;
 begin
   if doFullScreen in DXDraw.Options then
   begin
     BorderStyle := bsNone;
     DXDraw.Cursor := crNone;
+  end
-  end else
+  else
   begin
     BorderStyle := bsSingle;
     DXDraw.Cursor := crDefault;
   end;
 end;
   result := MCIStatus;
 end;
 procedure TMainForm.DXTimerTimer(Sender: TObject; LagCount: Integer);
 begin
+  EnterCriticalSection(TimerCS);
+  try
-  if StatusMusic(FMusic) = 'stopped' then
+    if StatusMusic(FMusic) = 'stopped' then
-    PlayMusic(FMusic); {...}
+      PlayMusic(FMusic); {...}
-  if crash then
+    if crash then
-  begin
+    begin
-    inc(Crash2);
+      inc(Crash2);
-  begin
+    begin
-    StartScene(FNextScene);
+      StartScene(FNextScene);
-    FNextScene := gsNone;
+      FNextScene := gsNone;
-  end;
+    end;
-  DXDraw.Flip;
+    DXDraw.Flip;
+  finally
+    LeaveCriticalSection(TimerCS);
+  end;
 end;
 procedure TMainForm.BlinkStart;
 begin
   FBlink := 0;
 procedure TMainForm.WriteOptions;
 var
   INIDatei: TIniFile;
 begin
   INIDatei := TIniFile.Create(FDirectory+'Einstellungen\SpaceMission.ini');
+  try
-  if OptionMusic.checked then INIDatei.WriteBool('Settings', 'Music', true)
+    if OptionMusic.checked then INIDatei.WriteBool('Settings', 'Music', true)
-    else INIDatei.WriteBool('Settings', 'Music', false);
+      else INIDatei.WriteBool('Settings', 'Music', false);
-  if OptionSound.checked then INIDatei.WriteBool('Settings', 'Sound', true)
+    if OptionSound.checked then INIDatei.WriteBool('Settings', 'Sound', true)
-    else INIDatei.WriteBool('Settings', 'Sound', false);
+      else INIDatei.WriteBool('Settings', 'Sound', false);
-  if OptionFullScreen.checked then INIDatei.WriteBool('Settings', 'FullScreen', true)
+    if OptionFullScreen.checked then INIDatei.WriteBool('Settings', 'FullScreen', true)
-    else INIDatei.WriteBool('Settings', 'ScreenAutoSize', false);
+      else INIDatei.WriteBool('Settings', 'ScreenAutoSize', false);
-  if FInterval = giLeicht then INIDatei.WriteInteger('Settings', 'Speed', 1);
+    if FInterval = giLeicht then INIDatei.WriteInteger('Settings', 'Speed', 1);
-  if FInterval = giMittel then INIDatei.WriteInteger('Settings', 'Speed', 2);
+    if FInterval = giMittel then INIDatei.WriteInteger('Settings', 'Speed', 2);
-  if FInterval = giSchwer then INIDatei.WriteInteger('Settings', 'Speed', 3);
+    if FInterval = giSchwer then INIDatei.WriteInteger('Settings', 'Speed', 3);
-  if FInterval = giMaster then INIDatei.WriteInteger('Settings', 'Speed', 4);
+    if FInterval = giMaster then INIDatei.WriteInteger('Settings', 'Speed', 4);
+  finally
-  INIDatei.Free;
+    INIDatei.Free;
-end;
+  end;
+end;
 procedure TMainForm.LoadOptions;
 var
   INIDatei: TIniFile;
 begin
   INIDatei := TIniFile.Create(FDirectory+'Einstellungen\SpaceMission.ini');
+  try
-  optionmusic.checked := INIDatei.ReadBool('Settings', 'Music', true);
+    optionmusic.checked := INIDatei.ReadBool('Settings', 'Music', true);
-  optionsound.checked := INIDatei.ReadBool('Settings', 'Sound', true);
+    optionsound.checked := INIDatei.ReadBool('Settings', 'Sound', true);
-  optionfullscreen.checked := INIDatei.ReadBool('Settings', 'fullscreen', false);
+    optionfullscreen.checked := INIDatei.ReadBool('Settings', 'fullscreen', false);
-  OptionBreitBild.checked := INIDatei.ReadBool('Settings', 'ScreenAutoSize', true);
+    OptionBreitBild.checked := INIDatei.ReadBool('Settings', 'ScreenAutoSize', true);
-  if INIDatei.ReadInteger('Settings', 'Speed', 2) = 1 then
+    if INIDatei.ReadInteger('Settings', 'Speed', 2) = 1 then
-  if INIDatei.ReadInteger('Settings', 'Speed', 2) = 4 then
+    if INIDatei.ReadInteger('Settings', 'Speed', 2) = 4 then
-  begin
+    begin
-    FInterval := giMaster;
+      FInterval := giMaster;
-    Master.checked := true;
+      Master.checked := true;
-  end;
+    end;
+  finally
-  INIDatei.Free;
+    INIDatei.Free;
+  end;
   WriteOptions;
 end;
 procedure TMainForm.BlinkUpdate;
 begin
         for i := 0 to 255 do
           DXDraw.ColorTable[i] := ComposeColor(Col, DXDraw.DefColorTable[i], t2);
         DXDraw.UpdatePalette;
         ChangePalette := True;
       end;
+    end
-    end else
+    else
+    begin
       Sleep(Time);
+    end;
     for i := 0 to 4 do
     begin
       DXDraw.Surface.Fill(c);
       DXDraw.Flip;
     end;
   sleep(500);
   FCounter := 0;
   NewLevel(FLevel);
   BossExists := false;
   PlayMusic(mtGame);
-  FEnemyAdventPos := 1;
+  FEnemyAdventPos := 0;
   FFrame := -4;
   PlayerSprite := TPlayerSprite.Create(SpriteEngine.Engine);
   with TBackground.Create(SpriteEngine.Engine) do
   begin
     SetMapSize(1, 1);
 begin
   {  Ende Win  }
 end;
 procedure TMainForm.DeleteArray();
-var
-  i: integer;
 begin
-  for i := Low(EnemyAdventTable) to High(EnemyAdventTable) do
-  begin
-    EnemyAdventTable[i].spriteClass := TNothing;
-    EnemyAdventTable[i].x := 0;
+  SetLength(EnemyAdventTable, 0);
-    EnemyAdventTable[i].y := 0;
+  FRestEnemies := 0;
-    EnemyAdventTable[i].lifes := 0;
-  end;
+end;
+const
-  FRestEnemys := 0;
+  ADDITIONAL_ENEMIES_PER_LEVEL = 75;
+function GetLevelFileName(lev: integer): string;
+begin
+  result := FDirectory+'Levels\Level '+inttostr(lev)+'.lev';
 end;
 procedure TMainForm.NewLevel(lev: integer);
 resourcestring
   LNG_LEVEL_INVALID = 'Das Level Nr. %d ist ungültig!'+#13#10+'Das Programm wird beendet.';
 var
   act: integer;
   filex: textfile;
   ergebniss: string;
+  Enemies: array[1..27] of TEnemyClass;
+  e: TEnemyAdvent;
 begin
   DeleteArray;
   if FMenuItem = 2 then
   begin
-    enemys[1] := TEnemyAttacker;
+    Enemies[1] := TEnemyAttacker;
-    enemys[2] := TEnemyMeteor;
+    Enemies[2] := TEnemyMeteor;
-    enemys[3] := TEnemyUFO;
+    Enemies[3] := TEnemyUFO;
-    enemys[4] := TEnemyAttacker;
+    Enemies[4] := TEnemyAttacker;
-    enemys[5] := TEnemyMeteor;
+    Enemies[5] := TEnemyMeteor;
-    enemys[6] := TEnemyUFO;
+    Enemies[6] := TEnemyUFO;
-    enemys[7] := TEnemyAttacker;
+    Enemies[7] := TEnemyAttacker;
-    enemys[8] := TEnemyMeteor;
+    Enemies[8] := TEnemyMeteor;
-    enemys[9] := TEnemyUFO;
+    Enemies[9] := TEnemyUFO;
-    enemys[10] := TEnemyAttacker;
+    Enemies[10] := TEnemyAttacker;
-    enemys[11] := TEnemyMeteor;
+    Enemies[11] := TEnemyMeteor;
-    enemys[12] := TEnemyUFO;
+    Enemies[12] := TEnemyUFO;
-    enemys[13] := TEnemyAttacker;
+    Enemies[13] := TEnemyAttacker;
-    enemys[14] := TEnemyMeteor;
+    Enemies[14] := TEnemyMeteor;
-    enemys[15] := TEnemyUFO;
+    Enemies[15] := TEnemyUFO;
-    enemys[16] := TEnemyAttacker3;
+    Enemies[16] := TEnemyAttacker3;
-    enemys[17] := TEnemyAttacker;
+    Enemies[17] := TEnemyAttacker;
-    enemys[18] := TEnemyMeteor;
+    Enemies[18] := TEnemyMeteor;
-    enemys[19] := TEnemyUFO;
+    Enemies[19] := TEnemyUFO;
-    enemys[20] := TEnemyUFO2;
+    Enemies[20] := TEnemyUFO2;
-    enemys[21] := TEnemyAttacker;
+    Enemies[21] := TEnemyAttacker;
-    enemys[22] := TEnemyMeteor;
+    Enemies[22] := TEnemyMeteor;
-    enemys[23] := TEnemyUFO;
+    Enemies[23] := TEnemyUFO;
-    enemys[24] := TEnemyAttacker2;
+    Enemies[24] := TEnemyAttacker2;
-    enemys[25] := TEnemyMeteor;
+    Enemies[25] := TEnemyMeteor;
-    enemys[26] := TEnemyUFO;
+    Enemies[26] := TEnemyUFO;
-    enemys[27] := TEnemyAttacker;
+    Enemies[27] := TEnemyAttacker;
     randomize;
+    FRestEnemies := lev*ADDITIONAL_ENEMIES_PER_LEVEL+1;
+    SetLength(EnemyAdventTable, FRestEnemies);
-    for act := 1 to lev*75-1 do
+    for act := 0 to lev*ADDITIONAL_ENEMIES_PER_LEVEL-1 do
+    begin
+      e.spriteClass := Enemies[min(random(lev+2)+1, High(Enemies))];
+      if e.spriteClass = TEnemyAttacker2 then
-    begin
+      begin
-      inc(FRestEnemys);
-      EnemyAdventTable[act].spriteClass := enemys[random(lev+2)+1];
+        e.spriteClass := Enemies[min(random(lev+2)+1, High(Enemies))]; {O_o}
-      if EnemyAdventTable[act].spriteClass = TEnemyAttacker2 then EnemyAdventTable[act].spriteClass := enemys[random(lev+2)+1]; {O_o}
+      end;
-      EnemyAdventTable[act].x := act*30 + random(85-(lev+(random(lev))*2)){O_o};
+      e.x := act*30 + random(85-(lev+(random(lev))*2)){O_o};
-      EnemyAdventTable[act].y := random(dxdraw.surfaceheight);
+      e.y := random(dxdraw.surfaceheight);
-      if (EnemyAdventTable[act].spriteClass <> TEnemyMeteor) and (EnemyAdventTable[act].spriteClass <> TEnemyAttacker2) then EnemyAdventTable[act].lifes := random(lev)+1;
+      if e.spriteClass = TEnemyAttacker2 then
+      begin
-      if EnemyAdventTable[act].spriteClass = TEnemyAttacker2 then EnemyAdventTable[act].lifes := random(6)+1{O_o};
+        e.lifes := random(6)+1{O_o};
+      end
+      else
+      begin
+        e.lifes := random(lev)+1;
+      end;
+      EnemyAdventTable[act] := e;
     end;
-    EnemyAdventTable[lev*75].spriteClass := TEnemyBoss;
+    e.spriteClass := TEnemyBoss;
-    EnemyAdventTable[lev*75].x := lev*75*30{O_o} div lev;
+    e.x := lev*75*30{O_o} div lev;
-    EnemyAdventTable[lev*75].y := (dxdraw.surfaceheight div 2) - (MainForm.ImageList.Items.Find('Enemy-boss').height div 2);
+    e.y := (dxdraw.surfaceheight div 2) - (MainForm.ImageList.Items.Find('Enemy-boss').height div 2);
-    EnemyAdventTable[lev*75].lifes := lev*5;
+    e.lifes := lev*5;
-    inc(FRestEnemys);
+    EnemyAdventTable[lev*ADDITIONAL_ENEMIES_PER_LEVEL] := e;
   end
   else
   begin
-    enemys[1] := TEnemyAttacker;
+    Enemies[1] := TEnemyAttacker;
-    enemys[2] := TEnemyAttacker2;
+    Enemies[2] := TEnemyAttacker2;
-    enemys[3] := TEnemyAttacker3;
+    Enemies[3] := TEnemyAttacker3;
-    enemys[4] := TEnemyMeteor;
+    Enemies[4] := TEnemyMeteor;
-    enemys[5] := TEnemyUFO;
+    Enemies[5] := TEnemyUFO;
-    enemys[6] := TEnemyUFO2;
+    Enemies[6] := TEnemyUFO2;
-    enemys[7] := TEnemyBoss;
+    Enemies[7] := TEnemyBoss;
-    if fileexists(FDirectory+'Levels\Level '+inttostr(lev)+'.lev') then
+    if fileexists(GetLevelFileName(lev)) then
     begin
-      levact := 0;
-      assignfile(filex, FDirectory+'Levels\Level '+inttostr(lev)+'.lev');
+      assignfile(filex, GetLevelFileName(lev));
       reset(filex);
+      try
+        readln(filex, ergebniss);
+        Assert(ergebniss = '; SpaceMission '+FCompVersion);
+        readln(filex, ergebniss);
+        Assert(ergebniss = '; LEV-File');
+        readln(filex); // Länge der Karte
-      while not seekEoF(filex) do
+        while not seekEoF(filex) do
-      begin
+        begin
-        if levact = 0 then
-        begin
           readln(filex, ergebniss);
-          if ergebniss <> '; SpaceMission '+FCompVersion then
+          e.spriteClass := Enemies[strtoint(ergebniss)];
-          begin
-            showmessage(Format(LNG_LEVEL_INVALID, [lev]));
-            application.terminate;
-            exit;
-          end;
           readln(filex, ergebniss);
-          if ergebniss <> '; LEV-File' then
-          begin
-            showmessage(Format(LNG_LEVEL_INVALID, [lev]));
-            application.terminate;
+          e.x := strtoint(ergebniss);
-            exit;
-          end;
-          readln(filex);
-        end;
-        inc(levact);
-        readln(filex, ergebniss);
+          readln(filex, ergebniss);
-        if levact = 5 then levact := 1;
+          e.y := strtoint(ergebniss);
-        if levact = 1 then
-        begin
-          inc(pos[levact]);
-          inc(FRestEnemys);
+          readln(filex, ergebniss);
-          EnemyAdventTable[pos[levact]].spriteClass := enemys[strtoint(ergebniss)];
-        end;
-        if levact = 2 then
-        begin
-          inc(pos[levact]);
-          EnemyAdventTable[pos[levact]].x := strtoint(ergebniss);
+          e.lifes := strtoint(ergebniss);
-        end;
-        if levact = 3 then
-        begin
-          inc(pos[levact]);
+          inc(FRestEnemies);
-          EnemyAdventTable[pos[levact]].y := strtoint(ergebniss);
+          SetLength(EnemyAdventTable, FRestEnemies);
-        end;
-        if levact = 4 then
-        begin
-          inc(pos[levact]);
-          EnemyAdventTable[pos[levact]].lifes := strtoint(ergebniss);
+          EnemyAdventTable[FRestEnemies-1] := e;
         end;
+      except
+        showmessage(Format(LNG_LEVEL_INVALID, [lev]));
+        DeleteArray;
       end;
       closefile(filex);
     end;
   end;
+  Assert(FRestEnemies = Length(EnemyAdventTable));
 end;
 procedure TMainForm.SceneTitle;
 var
   Logo: TPictureCollectionItem;
   end;
   // Weiter mit Leertaste oder Enter
   if (isButton1 in DXInput.States) or (isButton2 in DXInput.States) then
   begin
     FLevel := 1;
-    if ((FMenuItem=1) and (fileexists(FDirectory+'Levels\Level '+inttostr(FLevel)+'.lev')=false)) or ((FMenuItem=2) and (FLevel > 20)) then
+    if ((FMenuItem=1) and not fileexists(GetLevelFileName(FLevel))) or ((FMenuItem=2) and (FLevel > 20)) then
     begin
       //PlaySound('Frage', False);
       exit;
     end;
     NewLevel(FLevel);
 procedure TMainForm.SceneMain;
 var
   Enemy: TSprite;
 begin
+  case FInterval of
-  if FInterval = giLeicht then SpriteEngine.Move(conleicht);
+    giMittel: SpriteEngine.Move(conleicht);
-  if FInterval = giMittel then SpriteEngine.Move(conmittel);
+    giLeicht: SpriteEngine.Move(conmittel);
-  if FInterval = giSchwer then SpriteEngine.Move(conschwer);
+    giSchwer: SpriteEngine.Move(conschwer);
-  if FInterval = giMaster then SpriteEngine.Move(conmaster);
+    giMaster: SpriteEngine.Move(conmaster);
+  end;
   SpriteEngine.Dead;
-  while (Low(EnemyAdventTable)<=FEnemyAdventPos) and
+  while (FEnemyAdventPos >= Low(EnemyAdventTable)) and
-    (FEnemyAdventPos<=High(EnemyAdventTable)) and
+    (FEnemyAdventPos <= High(EnemyAdventTable)) and
-    ((EnemyAdventTable[FEnemyAdventPos].x / 4)<=FFrame) and
+    ((EnemyAdventTable[FEnemyAdventPos].x / 4) <= FFrame) and
-    (FRestEnemys>0) do
+    (FRestEnemies > 0) do
-  begin
-    if EnemyAdventTable[FEnemyAdventPos].spriteClass <> TNothing then
-    begin
+  begin
+    Dec(FRestEnemies);
-      with EnemyAdventTable[FEnemyAdventPos] do
+    with EnemyAdventTable[FEnemyAdventPos] do
-      begin
+    begin
-        Enemy := spriteClass.Create(SpriteEngine.Engine);
+      Enemy := spriteClass.Create(SpriteEngine.Engine, lifes);
-        Enemy.x := dxdraw.surfacewidth;
+      Enemy.x := dxdraw.surfacewidth;
-        //Enemy.y := y;
+      //Enemy.y := y;
+      if y <> 0 then
-        if y <> 0 then Enemy.y := dxdraw.surfaceheight / (480{maximale Bandbreite im alten Format} / y)
+        Enemy.y := dxdraw.surfaceheight / (480{maximale Bandbreite im alten Format} / y)
-          else Enemy.y := 0;
+      else
-      end;
+        Enemy.y := 0;
     end;
     Inc(FEnemyAdventPos);
   end;
   Inc(FFrame);
   DXDraw.Surface.Fill(0);
             Font.Color := clFuchsia;
             Textout(450, 440, 'Einheiten: ' + IntToStr(RestlicheEinheiten));
           end;}
         if BossExists and (FBossLife>0) then
         begin
-          if (FRestEnemys>0) then
+          if (FRestEnemies>0) then
           begin
             Font.Color := clGreen;
             Textout(dxdraw.surfacewidth-191, dxdraw.surfaceheight-81, 'Boss: ' + IntToStr(FBossLife));
-            Textout(dxdraw.surfacewidth-191, dxdraw.surfaceheight-41, 'Einheiten: ' + IntToStr(FRestEnemys));
+            Textout(dxdraw.surfacewidth-191, dxdraw.surfaceheight-41, 'Einheiten: ' + IntToStr(FRestEnemies));
             Font.Color := clLime;
             Textout(dxdraw.surfacewidth-190, dxdraw.surfaceheight-80, 'Boss: ' + IntToStr(FBossLife));
-            Textout(dxdraw.surfacewidth-190, dxdraw.surfaceheight-40, 'Einheiten: ' + IntToStr(FRestEnemys));
+            Textout(dxdraw.surfacewidth-190, dxdraw.surfaceheight-40, 'Einheiten: ' + IntToStr(FRestEnemies));
           end;
-          if (FRestEnemys<1) then
+          if (FRestEnemies<1) then
           begin
             Font.Color := clGreen;
             Textout(dxdraw.surfacewidth-191, dxdraw.surfaceheight-41, 'Boss: ' + IntToStr(FBossLife));
             Font.Color := clLime;
             Textout(dxdraw.surfacewidth-190, dxdraw.surfaceheight-40, 'Boss: ' + IntToStr(FBossLife));
           end;
         end;
-        if (FRestEnemys>0) and not Bossexists then
+        if (FRestEnemies>0) and not Bossexists then
         begin
           Font.Color := clGreen;
-          Textout(dxdraw.surfacewidth-191, dxdraw.surfaceheight-41, 'Einheiten: ' + IntToStr(FRestEnemys));
+          Textout(dxdraw.surfacewidth-191, dxdraw.surfaceheight-41, 'Einheiten: ' + IntToStr(FRestEnemies));
           Font.Color := clLime;
-          Textout(dxdraw.surfacewidth-190, dxdraw.surfaceheight-40, 'Einheiten: ' + IntToStr(FRestEnemys));
+          Textout(dxdraw.surfacewidth-190, dxdraw.surfaceheight-40, 'Einheiten: ' + IntToStr(FRestEnemies));
         end;
         Release;
       end;
     end
     else
       DXDraw.Surface.Canvas.Textout(dxdraw.surfacewidth-251, dxdraw.surfaceheight-41, 'Mission gescheitert!');
       DXDraw.Surface.Canvas.Font.Color := clLime;
       DXDraw.Surface.Canvas.Textout(dxdraw.surfacewidth-250, dxdraw.surfaceheight-40, 'Mission gescheitert!');
       DXDraw.Surface.Canvas.Release;
     end;
-    if FRestEnemys<0 then FRestEnemys := 0; //Muss das sein?
-    if (Ec=0) and (FRestEnemys=0){ and (SpielerFliegtFort = false)}
+    if (EnemyCounter=0) and (FRestEnemies=0){ and (SpielerFliegtFort = false)}
     and ((BossExists and (FBossLife=0)) or not BossExists) then
     begin
       DXDraw.Surface.Canvas.Font.Color := clGreen;
       DXDraw.Surface.Canvas.Textout(dxdraw.surfacewidth-251, dxdraw.surfaceheight-41, 'Mission erfolgreich!');
       DXDraw.Surface.Canvas.Font.Color := clLime;
   if X < -Width then Dead;
 end;
 procedure TEnemyMeteor.HitEnemy(ADead: Boolean);
 begin
+  inherited HitEnemy(False);
   if ADead then Collisioned := True;
-  MainForm.PlaySound('Hit', False);
 end;
 {procedure TMainForm.StopMusic;
 begin
   PauseMusic(FMusic);
     MCISendString(pchar('play "'+FDirectory+'Musik\Scene.mid"'), nil, 255, 0);
   if Name = mtTitle then
     MCISendString(pchar('play "'+FDirectory+'Musik\Title.mid"'), nil, 255, 0);
 end;
-constructor TEnemyMeteor.Create(AParent: TSprite);
+constructor TEnemyMeteor.Create(AParent: TSprite; ALifes: integer);
 begin
-  inherited Create(AParent);
+  inherited Create(AParent, ALifes);
   Image := MainForm.ImageList.Items.Find('Enemy-Meteor');
   Width := Image.Width;
   Height := Image.Height;
   AnimCount := Image.PatternCount;
   AnimLooped := True;
 procedure TMainForm.NeustartClick(Sender: TObject);
 begin
   FLife := Lives;
   FLevel := 1; // ???
   FScore := 0;
-  ec := 0;
+  EnemyCounter := 0;
   StartScene(gsMain);
   PlayMusic(mtGame);
 end;
 procedure TMainForm.OptionBreitbildClick(Sender: TObject);
   writeoptions;
 end;
 procedure TMainForm.FormShow(Sender: TObject);
 begin
+  if Assigned(SplashForm) then
+  begin
-  SplashForm.Hide;
+    SplashForm.Hide;
-  SplashForm.Free;
+    FreeAndNil(SplashForm);
+  end;
   dxtimer.Enabled := true;
   dxtimer.ActiveOnly := true;
 end;
   DXTimer.Enabled := False;
 end;
 procedure TMainForm.FormDestroy(Sender: TObject);
 begin
-  imagelist.free;
+  imagelist.Free;
-  spriteengine.free;
+  spriteengine.Free;
   dxdraw.Free;
-  wavelist.free;
+  wavelist.Free;
-  dxsound.free;
+  dxsound.Free;
-  //dxinput.free;
+  //dxinput.Free;
   dxtimer.Free;
+  DeleteCriticalSection(TimerCS);
 end;
 end.

Subversion Repositories spacemission

spacemission/GamMain.pas – Rev 6 → 7