fixed grid updates; another station now working (kinda)

[d2df-sdl.git] / src / game / g_monsters.pas

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index ea7222f3194fb0006e04a62ade5769fbd8f07e3e..5d529e2593fbfc01b3c8762197ef35b9eac7d575 100644 (file)
--- 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
@@ -79,15 +80,8 @@ type
     FFirePainTime: Integer;
     FFireAttacker: Word;
     vilefire: TAnimation;
-
-  {$IF DEFINED(D2F_DEBUG)}
-  public
-  {$ENDIF}
-    proxyId: Integer; // node in dyntree or -1
-    arrIdx: Integer; // in gMonsters
-  {$IF DEFINED(D2F_DEBUG)}
-  private
-  {$ENDIF}
+    mProxyId: Integer; // node in dyntree or -1
+    mArrIdx: Integer; // in gMonsters
 
     FDieTriggers: Array of Integer;
     FSpawnTrigger: Integer;
@@ -167,6 +161,9 @@ type
     property GameDirection: TDirection read FDirection write FDirection;
 
     property StartID: Integer read FStartID;
+
+    property proxyId: Integer read mProxyId;
+    property arrIdx: Integer read mArrIdx;
   end;
 
 
@@ -200,6 +197,8 @@ function g_Mons_ByIdx (uid: Integer): TMonster; inline;
 // can return null
 function g_Mons_ByIdx_NC (uid: Integer): TMonster; inline;
 
+function g_Mons_TotalCount (): Integer; inline;
+
 function g_Mons_IsAnyAliveAt (x, y: Integer; width, height: Integer): Boolean;
 
 function g_Mons_ForEach (cb: TEachMonsterCB): Boolean;
@@ -306,35 +305,46 @@ 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)', [arrIdx, UID, FObj.X, FObj.Y, FObj.Rect.X, FObj.Rect.Y]), MSG_NOTIFY);
+  //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);
   {$ENDIF}
-  if (proxyId = -1) then
+  if (mProxyId = -1) then
   begin
-    proxyId := monsGrid.insertBody(self, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y, FObj.Rect.Width, FObj.Rect.Height);
+    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(proxyId, x, y);
-    e_WriteLog(Format('monster #%d(%u): inserted into the grid; proxyid=%d; x=%d; y=%d', [arrIdx, UID, proxyId, x, y]), MSG_NOTIFY);
+    monsGrid.getBodyXY(mProxyId, x, y);
+    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(proxyId, 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; proxyid=%d; x=%d; y=%d', [arrIdx, UID, proxyId, x, y]), MSG_NOTIFY);{$ENDIF}
-
-    {$IF TRUE}
-    monsGrid.moveBody(proxyId, FObj.X+FObj.Rect.X, FObj.Y+FObj.Rect.Y);
-    {$ELSE}
-    monsGrid.removeBody(proxyId);
-    proxyId := 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(proxyId, x, y);
-    e_WriteLog(Format('monster #%d(%u): updated tree; proxyid=%d; x=%d; y=%d', [arrIdx, UID, proxyId, x, y]), MSG_NOTIFY);
+    monsGrid.getBodyXY(mProxyId, x, y);
+    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;
@@ -696,7 +706,7 @@ begin
   if gmon_debug_use_sqaccel then
   begin
     mon := monsGrid.forEachInAABB(o.X+o.Rect.X, o.Y+o.Rect.Y, o.Rect.Width, o.Rect.Height, monsCollCheck);
-    if (mon <> nil) then result := mon.arrIdx;
+    if (mon <> nil) then result := mon.mArrIdx;
   end
   else
   begin
@@ -1224,8 +1234,8 @@ begin
 
   mon := TMonster.Create(MonsterType, find_id, ForcedUID);
   gMonsters[find_id] := mon;
-  mon.arrIdx := find_id;
-  mon.proxyId := -1;
+  mon.mArrIdx := find_id;
+  mon.mProxyId := -1;
 
   uidMap[mon.FUID] := mon;
 
@@ -1716,8 +1726,8 @@ begin
   FFirePainTime := 0;
   FFireAttacker := 0;
 
-  proxyId := -1;
-  arrIdx := -1;
+  mProxyId := -1;
+  mArrIdx := -1;
   trapCheckFrameId := 0;
 
   if FMonsterType in [MONSTER_ROBO, MONSTER_BARREL] then
@@ -1931,6 +1941,7 @@ begin
       begin
         FObj.Rect.Y := FObj.Rect.Y + FObj.Rect.Height-12;
         FObj.Rect.Height := 12;
+        positionChanged();
       end;
 
     // Óðîí áûë ñèëüíûì => ñëàáûå - â êàøó:
@@ -1992,20 +2003,20 @@ begin
 
   vilefire.Free();
 
-  if (proxyId <> -1) then
+  if (mProxyId <> -1) then
   begin
     if (monsGrid <> nil) then
     begin
-      monsGrid.removeBody(proxyId);
+      monsGrid.removeBody(mProxyId);
       {$IF DEFINED(D2F_DEBUG_MONS_MOVE)}
-      e_WriteLog(Format('monster #%d(%u): removed from tree; proxyid=%d', [arrIdx, UID, proxyId]), MSG_NOTIFY);
+      e_WriteLog(Format('monster #%d:(%u): removed from tree; mProxyid=%d', [mArrIdx, UID, mProxyId]), MSG_NOTIFY);
       {$ENDIF}
     end;
-    proxyId := -1;
+    mProxyId := -1;
   end;
 
-  if (arrIdx <> -1) and (arrIdx < Length(gMonsters)) then gMonsters[arrIdx] := nil;
-  arrIdx := -1;
+  if (mArrIdx <> -1) and (mArrIdx < Length(gMonsters)) then gMonsters[mArrIdx] := nil;
+  mArrIdx := -1;
 
   uidMap[FUID] := nil;
 
@@ -4489,7 +4500,6 @@ begin
   if (result = nil) then raise Exception.Create('g_Mons_ByIdx: invalid monster id');
 end;
 
-
 // can return null
 function g_Mons_ByIdx_NC (uid: Integer): TMonster; inline;
 begin
@@ -4497,6 +4507,11 @@ begin
   result := gMonsters[uid];
 end;
 
+function g_Mons_TotalCount (): Integer; inline;
+begin
+  result := Length(gMonsters);
+end;
+
 
 function g_Mons_ForEach (cb: TEachMonsterCB): Boolean;
 var