X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fgame%2Fg_monsters.pas;h=04e19241b541fb591877fa8e7f4089cf233ddeb6;hb=fb2545cc618f2ffe256ab3bc0173b063382c8887;hp=5fb769dbdab703eb9daff973c5877a6ea556025b;hpb=3cde28288f16b317ae049cc692aa95536f297d2d;p=d2df-sdl.git

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index 5fb769d..04e1924 100644
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
 {$INCLUDE ../shared/a_modes.inc}
+{.$DEFINE D2F_DEBUG_MONS_MOVE}
 unit g_monsters;
 
 interface
@@ -172,7 +173,7 @@ procedure g_Mons_InitTree (x, y, w, h: Integer);
 procedure g_Monsters_LoadData ();
 procedure g_Monsters_FreeData ();
 procedure g_Monsters_Init ();
-procedure g_Monsters_Free ();
+procedure g_Monsters_Free (clearGrid: Boolean=true);
 function g_Monsters_Create (MonsterType: Byte; X, Y: Integer; Direction: TDirection;
   AdjCoord: Boolean = False; ForcedUID: Integer = -1): TMonster;
 procedure g_Monsters_Update ();
@@ -234,7 +235,7 @@ type
   TMonsterGrid = specialize TBodyGridBase<TMonster>;
 
 var
-  monsGrid: TMonsterGrid = nil;
+  monsGrid: TMonsterGrid = nil; // DO NOT USE! public for debugging only!
 
 
 var
@@ -304,7 +305,8 @@ end;
 //WARNING! call this after monster position was changed, or coldet will not work right!
 procedure TMonster.positionChanged ();
 var
-  x, y: Integer;
+  x, y, w, h: Integer;
+  nx, ny, nw, nh: Integer;
 begin
   {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
   //e_WriteLog(Format('monster #%d(%u): pos=(%d,%d); rpos=(%d,%d)', [mArrIdx, UID, FObj.X, FObj.Y, FObj.Rect.X, FObj.Rect.Y]), MSG_NOTIFY);
@@ -314,25 +316,35 @@ begin
     mProxyId := monsGrid.insertBody(self, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, FObj.Rect.Width, FObj.Rect.Height);
     {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
     monsGrid.getBodyXY(mProxyId, x, y);
-    e_WriteLog(Format('monster #%d(%u): inserted into the grid; mProxyid=%d; x=%d; y=%d', [mArrIdx, UID, mProxyId, x, y]), MSG_NOTIFY);
+    e_WriteLog(Format('monster #%d:(%u): inserted into the grid; mProxyid=%d; gx=%d; gy=%d', [mArrIdx, UID, mProxyId, x-monsGrid.gridX0, y-monsGrid.gridY0]), MSG_NOTIFY);
     {$ENDIF}
   end
   else
   begin
-    monsGrid.getBodyXY(mProxyId, x, y);
-    if (FObj.X+FObj.Rect.X = x) and (FObj.Y+FObj.Rect.Y = y) then exit; // nothing to do
-    {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}e_WriteLog(Format('monster #%d(%u): updating tree; mProxyid=%d; x=%d; y=%d', [mArrIdx, UID, mProxyId, x, y]), MSG_NOTIFY);{$ENDIF}
-
-    {$IF TRUE}
-    monsGrid.moveBody(mProxyId, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y);
-    {$ELSE}
-    monsGrid.removeBody(mProxyId);
-    mProxyId := monsGrid.insertBody(self, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, FObj.Rect.Width, FObj.Rect.Height);
-    {$ENDIF}
+    monsGrid.getBodyDims(mProxyId, x, y, w, h);
+    getMapBox(nx, ny, nw, nh);
 
+    if (w <> nw) or (h <> nh) then
+    begin
+      {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
+      e_WriteLog(Format('monster #%d:(%u): resized; mProxyid=%d; gx=%d; gy=%d', [mArrIdx, UID, mProxyId, x-monsGrid.gridX0, y-monsGrid.gridY0]), MSG_NOTIFY);
+      {$ENDIF}
+      monsGrid.moveResizeBody(mProxyId, nx, ny, nw, nh);
+    end
+    else if (x <> nx) or (y <> ny) then
+    begin
+      {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
+      e_WriteLog(Format('monster #%d:(%u): updating grid; mProxyid=%d; gx=%d; gy=%d', [mArrIdx, UID, mProxyId, x-monsGrid.gridX0, y-monsGrid.gridY0]), MSG_NOTIFY);
+      {$ENDIF}
+      monsGrid.moveBody(mProxyId, nx, ny);
+    end
+    else
+    begin
+      exit; // nothing to do
+    end;
     {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
     monsGrid.getBodyXY(mProxyId, x, y);
-    e_WriteLog(Format('monster #%d(%u): updated tree; mProxyid=%d; x=%d; y=%d', [mArrIdx, UID, mProxyId, x, y]), MSG_NOTIFY);
+    e_WriteLog(Format('monster #%d:(%u): updated grid; mProxyid=%d; gx=%d; gy=%d', [mArrIdx, UID, mProxyId, x-monsGrid.gridX0, y-monsGrid.gridY0]), MSG_NOTIFY);
     {$ENDIF}
   end;
 end;
@@ -1179,12 +1191,16 @@ begin
   soulcount := 0;
 end;
 
-procedure g_Monsters_Free();
+procedure g_Monsters_Free (clearGrid: Boolean=true);
 var
   a: Integer;
 begin
-  monsGrid.Free();
-  monsGrid := nil;
+  e_LogWritefln('Cleared monster data (clearGrid=%s)', [clearGrid]);
+  if (clearGrid) then
+  begin
+    monsGrid.Free();
+    monsGrid := nil;
+  end;
   for a := 0 to High(gMonsters) do gMonsters[a].Free();
   gMonsters := nil;
   clearUidMap();
@@ -1197,6 +1213,8 @@ procedure g_Mons_InitTree (x, y, w, h: Integer);
 begin
   monsGrid.Free();
   monsGrid := TMonsterGrid.Create(x, y, w, h);
+  //clearUidMap(); // why not?
+  e_LogWritefln('%s', ['Recreated monster tree']);
 end;
 
 
@@ -1405,7 +1423,7 @@ var
 begin
   if Mem = nil then exit;
 
-  g_Monsters_Free();
+  g_Monsters_Free(false);
 
   // Çàãðóæàåì èíôîðìàöèþ öåëåóêàçàòåëÿ
   Mem.ReadInt(pt_x);
@@ -1929,6 +1947,7 @@ begin
       begin
         FObj.Rect.Y := FObj.Rect.Y + FObj.Rect.Height-12;
         FObj.Rect.Height := 12;
+        positionChanged();
       end;
 
     // Óðîí áûë ñèëüíûì => ñëàáûå - â êàøó:
@@ -1996,7 +2015,7 @@ begin
     begin
       monsGrid.removeBody(mProxyId);
       {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
-      e_WriteLog(Format('monster #%d(%u): removed from tree; mProxyid=%d', [mArrIdx, UID, mProxyId]), MSG_NOTIFY);
+      e_WriteLog(Format('monster #%d:(%u): removed from grid; mProxyid=%d', [mArrIdx, UID, mProxyId]), MSG_NOTIFY);
       {$ENDIF}
     end;
     mProxyId := -1;
@@ -4332,6 +4351,10 @@ begin
   end;
 end;
 
+procedure monsPostLoad ();
+begin
+end;
+
 procedure TMonster.LoadState(var Mem: TBinMemoryReader);
 var
   i: Integer;
@@ -4348,8 +4371,13 @@ begin
   begin
     raise EBinSizeError.Create('TMonster.LoadState: Wrong Monster Signature');
   end;
+  if (uidMap[FUID] <> nil) and (uidMap[FUID] <> self) then raise Exception.Create('internal error in monster loader (0)');
+  uidMap[FUID] := nil;
 // UID ìîíñòðà:
   Mem.ReadWord(FUID);
+  //if (arrIdx = -1) then raise Exception.Create('internal error in monster loader');
+  if (uidMap[FUID] <> nil) then raise Exception.Create('internal error in monster loader (1)');
+  uidMap[FUID] := self;
 // Íàïðàâëåíèå:
   Mem.ReadByte(b);
   if b = 1 then
@@ -4652,4 +4680,6 @@ begin
 end;
 
 
+begin
+  g_SetPostLoadHook(monsPostLoad);
 end.