X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmsg.pas;h=936141adbc58ee1d33acae7c7708b42ef064dcfe;hb=b4a2614636a9cc12ce9766ec1e2bf04cd5bec0ea;hp=7499fc260112bda3621a18db0fcb416f737d0a21;hpb=c81b3c085bea0e6ea549c54bfd9ad5b344c86b01;p=d2df-sdl.git

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 7499fc2..936141a 100644
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -634,7 +634,7 @@ procedure MH_SEND_Everything(CreatePlayers: Boolean = False; ID: Integer = NET_E
     MH_SEND_ItemSpawn(True, it.myid, ID);
   end;
 
-  function sendMonSpawn (monidx: Integer; mon: TMonster): Boolean;
+  function sendMonSpawn (mon: TMonster): Boolean;
   begin
     result := false; // don't stop
     MH_SEND_MonsterSpawn(mon.UID, ID);
@@ -1190,7 +1190,7 @@ procedure MH_SEND_ItemSpawn(Quiet: Boolean; IID: Word; ID: Integer = NET_EVERYON
 var
   it: PItem;
 begin
-  it := g_ItemByIdx(IID);
+  it := g_Items_ByIdx(IID);
 
   NetOut.Write(Byte(NET_MSG_ISPAWN));
   NetOut.Write(IID);
@@ -1321,7 +1321,7 @@ procedure MH_SEND_MonsterSpawn(UID: Word; ID: Integer = NET_EVERYONE);
 var
   M: TMonster;
 begin
-  M := g_Monsters_Get(UID);
+  M := g_Monsters_ByUID(UID);
   if M = nil then
     Exit;
 
@@ -1352,7 +1352,7 @@ procedure MH_SEND_MonsterPos(UID: Word; ID: Integer = NET_EVERYONE);
 var
   M: TMonster;
 begin
-  M := g_Monsters_Get(UID);
+  M := g_Monsters_ByUID(UID);
   if M = nil then Exit;
 
   NetOut.Write(Byte(NET_MSG_MPOS));
@@ -1374,7 +1374,7 @@ procedure MH_SEND_MonsterState(UID: Word; ForcedAnim: Byte = 255; ID: Integer =
 var
   M: TMonster;
 begin
-  M := g_Monsters_Get(UID);
+  M := g_Monsters_ByUID(UID);
   if M = nil then Exit;
 
   NetOut.Write(Byte(NET_MSG_MSTATE));
@@ -1413,7 +1413,7 @@ procedure MH_SEND_MonsterDelete(UID: Word; ID: Integer = NET_EVERYONE);
 var
   M: TMonster;
 begin
-  M := g_Monsters_Get(UID);
+  M := g_Monsters_ByUID(UID);
   if M = nil then Exit;
 
   NetOut.Write(Byte(NET_MSG_MDEL));
@@ -2366,7 +2366,7 @@ begin
 
   g_Items_Create(X, Y, T, Fall, False, False, ID);
 
-  it := g_ItemByIdx(ID);
+  it := g_Items_ByIdx(ID);
   it.Obj.Vel.X := VX;
   it.Obj.Vel.Y := VY;
 
@@ -2391,9 +2391,9 @@ begin
   ID := M.ReadWord();
   Quiet := M.ReadByte() <> 0;
 
-  if not g_ItemValidId(ID) then exit;
+  if not g_Items_ValidId(ID) then exit;
 
-  if not Quiet then g_Item_EmitPickupSound(ID);
+  if not Quiet then g_Items_EmitPickupSound(ID);
 
   g_Items_Remove(ID);
 end;
@@ -2566,7 +2566,7 @@ var
   Mon: TMonster;
 begin
   ID := M.ReadWord();
-  Mon := g_Monsters_Get(ID);
+  Mon := g_Monsters_ByUID(ID);
   if Mon <> nil then
     Exit;
 
@@ -2587,7 +2587,7 @@ begin
   MDir := M.ReadByte();
 
   g_Monsters_Create(MType, X, Y, TDirection(MDir), False, ID);
-  Mon := g_Monsters_Get(ID);
+  Mon := g_Monsters_ByUID(ID);
   if Mon = nil then
     Exit;
 
@@ -2618,7 +2618,7 @@ var
   ID: Word;
 begin
   ID := M.ReadWord();
-  Mon := g_Monsters_Get(ID);
+  Mon := g_Monsters_ByUID(ID);
   if Mon = nil then
     Exit;
 
@@ -2641,7 +2641,7 @@ var
   AnimRevert: Boolean;
 begin
   ID := M.ReadWord();
-  Mon := g_Monsters_Get(ID);
+  Mon := g_Monsters_ByUID(ID);
   if Mon = nil then Exit;
 
   MState := M.ReadByte();
@@ -2685,7 +2685,7 @@ var
 begin
   ID := M.ReadWord();
 
-  Mon := g_Monsters_Get(ID);
+  Mon := g_Monsters_ByUID(ID);
   if Mon = nil then Exit;
 
   X := M.ReadLongInt();
@@ -2702,7 +2702,7 @@ var
   Mon: TMonster;
 begin
   ID := M.ReadWord();
-  Mon := g_Monsters_Get(ID);
+  Mon := g_Monsters_ByUID(ID);
   if Mon = nil then Exit;
   Mon.SetState(5);
   Mon.MonsterRemoved := True;