WebSVN – jumper – Diff – /trunk/Main.pas

     procedure RemoveStone(x, y: integer; count_points: boolean);
     procedure DoJump(SourceTag, DestTag: integer);
     function MayJump(SourceTag, DestTag: integer): boolean; overload;
     procedure StoneDragOver(Sender, Source: TObject; X, Y: Integer; State: TDragState; var Accept: Boolean);
     procedure StoneDragDrop(Sender, Source: TObject; X, Y: Integer);
-    function DrawField(x, y: integer; t: TFieldProperties; indent: integer): TField;
+    procedure DrawField(x, y: integer; var f: TField);
     function DrawStone(fieldtype: TFieldType; panel: TPanel): TImage;
     function DrawStoneBox(x, y, tag, halftabs: integer; isGoal: boolean): TPanel;
-    procedure BuildPlayground(LevelArray: TLevelArray);
     procedure LoadPictureForType(FieldType: TFieldType; Picture: TPicture);
     function GoalStatus: TGoalStatus;
   end;
 var
 begin
   for x := Low(Matrix.Fields) to High(Matrix.Fields) do
   begin
     for y := Low(Matrix.Fields[x]) to High(Matrix.Fields[x]) do
     begin
-      if Assigned(Matrix.Fields[x][y].Stone) then
+      if Assigned(Matrix.Fields[x,y].Stone) then
       begin
-        LoadPictureForType(Matrix.Fields[x][y].FieldType, Matrix.Fields[x][y].Stone.Picture);
+        LoadPictureForType(Matrix.Fields[x,y].FieldType, Matrix.Fields[x,y].Stone.Picture);
-        StoneDraggingAllow(Matrix.Fields[x][y].Stone, Matrix.FieldState(Matrix.Fields[x][y].FieldType) <> fsAvailable);
+        StoneDraggingAllow(Matrix.Fields[x,y].Stone, Matrix.FieldState(Matrix.Fields[x,y].FieldType) <> fsAvailable);
       end;
     end;
   end;
 end;
               goalYesNo);
 end;
 procedure TMainForm.DoJump(SourceTag, DestTag: integer);
 resourcestring
-  LNG_JUMP_LOG = '%d [%d, %d] -> %d [%d, %d];';
+  LNG_JUMP_LOG = '[%d, %d] -> [%d, %d];';
 var
   d, s: TCoord;
   old_fieldtype: TFieldType;
   res: Integer;
 begin
   if not MayJump(SourceTag, DestTag) then exit;
   s := PlaygroundMatrix.IndexToCoord(SourceTag);
   d := PlaygroundMatrix.IndexToCoord(DestTag);
-  JumpHistory.Add(Format(LNG_JUMP_LOG, [SourceTag+1, s.x+1, s.y+1, DestTag+1, d.x+1, d.y+1]));
+  JumpHistory.Add(Format(LNG_JUMP_LOG, [s.x+1, s.y+1, d.x+1, d.y+1]));
   {$REGION 'Stein entfernen und Punkte vergeben'}
   if Level.GameMode = gmDiagonal then
   begin
-    if (s.X-2 = d.X) and (s.Y-2 = d.Y) and (PlayGroundMatrix.FieldState(s.X-1, s.Y-1) = fsStone) then RemoveStone(s.X-1, s.Y-1, true);
+    if (s.X-2 = d.X) and (s.Y-2 = d.Y) and (PlayGroundMatrix.FieldState(s.X-1, s.Y-1) = fsOccupied) then RemoveStone(s.X-1, s.Y-1, true);
-    if (s.X-2 = d.X) and (s.Y+2 = d.Y) and (PlayGroundMatrix.FieldState(s.X-1, s.Y+1) = fsStone) then RemoveStone(s.X-1, s.Y+1, true);
+    if (s.X-2 = d.X) and (s.Y+2 = d.Y) and (PlayGroundMatrix.FieldState(s.X-1, s.Y+1) = fsOccupied) then RemoveStone(s.X-1, s.Y+1, true);
-    if (s.X+2 = d.X) and (s.Y-2 = d.Y) and (PlayGroundMatrix.FieldState(s.X+1, s.Y-1) = fsStone) then RemoveStone(s.X+1, s.Y-1, true);
+    if (s.X+2 = d.X) and (s.Y-2 = d.Y) and (PlayGroundMatrix.FieldState(s.X+1, s.Y-1) = fsOccupied) then RemoveStone(s.X+1, s.Y-1, true);
-    if (s.X+2 = d.X) and (s.Y+2 = d.Y) and (PlayGroundMatrix.FieldState(s.X+1, s.Y+1) = fsStone) then RemoveStone(s.X+1, s.Y+1, true);
+    if (s.X+2 = d.X) and (s.Y+2 = d.Y) and (PlayGroundMatrix.FieldState(s.X+1, s.Y+1) = fsOccupied) then RemoveStone(s.X+1, s.Y+1, true);
   end;
-  if (s.X+2 = d.X) and (s.Y = d.Y) and (PlayGroundMatrix.FieldState(s.X+1, s.Y  ) = fsStone) then RemoveStone(s.X+1, s.Y, true);
+  if (s.X+2 = d.X) and (s.Y = d.Y) and (PlayGroundMatrix.FieldState(s.X+1, s.Y  ) = fsOccupied) then RemoveStone(s.X+1, s.Y, true);
-  if (s.X-2 = d.X) and (s.Y = d.Y) and (PlayGroundMatrix.FieldState(s.X-1, s.Y  ) = fsStone) then RemoveStone(s.X-1, s.Y, true);
+  if (s.X-2 = d.X) and (s.Y = d.Y) and (PlayGroundMatrix.FieldState(s.X-1, s.Y  ) = fsOccupied) then RemoveStone(s.X-1, s.Y, true);
-  if (s.X = d.X) and (s.Y+2 = d.Y) and (PlayGroundMatrix.FieldState(s.X  , s.Y+1) = fsStone) then RemoveStone(s.X, s.Y+1, true);
+  if (s.X = d.X) and (s.Y+2 = d.Y) and (PlayGroundMatrix.FieldState(s.X  , s.Y+1) = fsOccupied) then RemoveStone(s.X, s.Y+1, true);
-  if (s.X = d.X) and (s.Y-2 = d.Y) and (PlayGroundMatrix.FieldState(s.X  , s.Y-1) = fsStone) then RemoveStone(s.X, s.Y-1, true);
+  if (s.X = d.X) and (s.Y-2 = d.Y) and (PlayGroundMatrix.FieldState(s.X  , s.Y-1) = fsOccupied) then RemoveStone(s.X, s.Y-1, true);
   {$ENDREGION}
   // Den Timer erst nach dem ersten Zug starten
   // oder nach einer Pause neustarten
   MPauseTime.Checked := false;
   s, d: TCoord;
 begin
   s := PlayGroundMatrix.IndexToCoord(SourceTag);
   d := PlayGroundMatrix.IndexToCoord(DestTag);
-  result := PlaygroundMatrix.CanJump(s.X, s.Y, d.X, d.Y, Level.GameMode = gmDiagonal);
+  result := PlaygroundMatrix.CanJump(s, d, Level.GameMode = gmDiagonal);
 end;
 procedure TMainForm.StoneDragDrop(Sender, Source: TObject; X, Y: Integer);
 begin
   DoJump(TComponent(Source).Tag, TComponent(Sender).Tag);
   Y: Integer; State: TDragState; var Accept: Boolean);
 begin
   Accept := MayJump(TComponent(Source).Tag, TComponent(Sender).Tag);
 end;
-function TMainForm.DrawField(x, y: integer; t: TFieldProperties; indent: integer): TField;
+procedure TMainForm.DrawField(x, y: integer; var f: TField);
 var
-  newField: TField;
   index: integer;
 begin
-  ZeroMemory(@result, SizeOf(result));
-  if t.Typ = ftFullSpace then exit;
+  if f.FieldType = ftFullSpace then exit;
   index := PlaygroundMatrix.CoordToIndex(x, y);
+  f.Panel := DrawStoneBox(x, y, index, f.indent, f.Goal);
-  newField.FieldType := t.Typ;
+  f.Stone := DrawStone(f.FieldType, f.Panel);
+end;
-  newField.Goal := t.Goal;
+procedure TMainForm.TimerTimer(Sender: TObject);
+begin
-  newField.Panel := DrawStoneBox(x, y, index, indent, t.Goal);
+  if MPauseTime.Checked then exit;
-  newField.Stone := DrawStone(t.Typ, newField.Panel);
+  if mainform.Focused then Inc(CountedSeconds);
+  RefreshTime;
+end;
-  result := newField;
+function TMainForm.LevelTime: String;
+begin
+  result := FormatDateTime('hh:nn:ss', CountedSeconds / SecsPerDay)
 end;
-procedure TMainForm.BuildPlayground(LevelArray: TLevelArray);
+procedure TMainForm.NewGame(Filename: string);
+resourcestring
+  LNG_LVL_INVALID_NO_JUMP = 'Warning! The level is not playable. There are no jumps possible.';
 var
   y, x: integer;
   max_x, max_y: integer;
   p: TPanel;
-  newField: TField;
 begin
-  PlayGround.Visible := false;
+  DestroyLevel;
+  MPauseTime.Checked := true;
+  MPauseTime.Enabled := true;
+  Timer.Enabled := true;
+  MRestartGame.Enabled := true;
+  LevelFile := Filename;
+  Level := TLevel.Create(LevelFile);
-  // Attention: PlaygroundMatrix is indexed [x,y] while LevelArray is indexed [y,x]
+  Level.FillPlaygroundMatrix(PlaygroundMatrix, true);
-  // TODO: PlaygroundMatrix and LevelArray are redundant. Can't we just replace one with the other?
+  if Length(PlaygroundMatrix.Fields) = 0 then Exit;
-  PlaygroundMatrix.InitFieldArray(Length(LevelArray[0].Fields), Length(LevelArray));
+  PlayGround.Visible := false;
   max_x := 0;
   max_y := 0;
-  for y := Low(LevelArray) to High(LevelArray) do
+  for x := Low(PlaygroundMatrix.Fields) to High(PlaygroundMatrix.Fields) do
   begin
-    for x := Low(LevelArray[y].Fields) to High(LevelArray[y].Fields) do
+    for y := Low(PlaygroundMatrix.Fields[x]) to High(PlaygroundMatrix.Fields[x]) do
     begin
-      if TPlayGroundMatrix.FieldState(LevelArray[y].Fields[x].Typ) = fsStone then
+      if TPlayGroundMatrix.FieldState(PlaygroundMatrix.Fields[x,y].FieldType) = fsOccupied then
         Inc(LevelTotalStones);
-      newField := DrawField(x, y, LevelArray[y].Fields[x], LevelArray[y].Indent);
+      DrawField(x, y, PlaygroundMatrix.Fields[x,y]);
-      PlaygroundMatrix.Fields[x, y] := newField;
+      p := PlaygroundMatrix.Fields[x,y].Panel;
-      p := newField.Panel;
       if Assigned(p) then
       begin
         max_x := Max(max_x, p.Left + p.Width);
         max_y := Max(max_y, p.Top  + p.Height);
       end;
-  Statistics.Panels.Items[1].Width := Round(ClientWidth*MET_PERCENT_PNL_STONES);
+  Statistics.Panels.Items[1].Width := Round(ClientWidth * MET_PERCENT_PNL_STONES);
   SetLength(PrevPlaygroundMatrixes,1);
   PrevPlaygroundMatrixes[0] := PlayGroundMatrix.CloneMatrix;
   MUndo.Enabled := false;
-end;
-procedure TMainForm.TimerTimer(Sender: TObject);
-begin
-  if MPauseTime.Checked then exit;
-  if mainform.Focused then Inc(CountedSeconds);
-  RefreshTime;
-end;
-function TMainForm.LevelTime: String;
-begin
-  result := FormatDateTime('hh:nn:ss', CountedSeconds / SecsPerDay)
-end;
-procedure TMainForm.NewGame(Filename: string);
-resourcestring
-  LNG_LVL_INVALID_NO_JUMP = 'Warning! The level is not playable. There are no jumps possible.';
-var
-  LevelArray: TLevelArray;
-begin
-  DestroyLevel;
-  MPauseTime.Checked := true;
-  MPauseTime.Enabled := true;
-  Timer.Enabled := true;
-  MRestartGame.Enabled := true;
-  LevelFile := Filename;
-  Level := TLevel.Create(LevelFile);
-  LevelArray := Level.LevelStringToLevelArray(true);
-  if Length(LevelArray) = 0 then Exit;
-  BuildPlayground(LevelArray);
   if not PlayGroundMatrix.CanJump(Level.GameMode = gmDiagonal) then
   begin
     MessageDlg(LNG_LVL_INVALID_NO_JUMP, mtError, [mbOk], 0);
   end;
   RefreshTime;

Subversion Repositories jumper

jumper/trunk/Main.pas – Rev 23 → 24