diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 7499fc260112bda3621a18db0fcb416f737d0a21..936141adbc58ee1d33acae7c7708b42ef064dcfe 100644 (file)
--- 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);
var
M: TMonster;
begin
- M := g_Monsters_Get(UID);
+ M := g_Monsters_ByUID(UID);
if M = nil then
Exit;
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));
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));
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;
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;
Mon: TMonster;
begin
ID := M.ReadWord();
- Mon := g_Monsters_Get(ID);
+ Mon := g_Monsters_ByUID(ID);
if Mon <> nil then
Exit;
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;
ID: Word;
begin
ID := M.ReadWord();
- Mon := g_Monsters_Get(ID);
+ Mon := g_Monsters_ByUID(ID);
if Mon = nil then
Exit;
AnimRevert: Boolean;
begin
ID := M.ReadWord();
- Mon := g_Monsters_Get(ID);
+ Mon := g_Monsters_ByUID(ID);
if Mon = nil then Exit;
MState := M.ReadByte();
begin
ID := M.ReadWord();
- Mon := g_Monsters_Get(ID);
+ Mon := g_Monsters_ByUID(ID);
if Mon = nil then Exit;
X := M.ReadLongInt();
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;