field namefix: `FLive` -> `FAlive`; `live` -> `alive`

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

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 53ab6a501b063c2cae51a19a9edcf326df2840a4..21046a048064e930129811bc684715206448f37c 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -1073,7 +1073,7 @@ begin
 
   with P do
   begin
-    NetOut.Write(Byte(Live));
+    NetOut.Write(Byte(alive));
     NetOut.Write(Byte(GodMode));
     NetOut.Write(Health);
     NetOut.Write(Armor);
@@ -2140,7 +2140,7 @@ begin
 
   with Pl do
   begin
-    Live := (M.ReadByte() <> 0);
+    alive := (M.ReadByte() <> 0);
     GodMode := (M.ReadByte() <> 0);
     Health := M.ReadLongInt();
     Armor := M.ReadLongInt();
@@ -2306,7 +2306,7 @@ begin
   SHID := M.ReadLongInt();
 
   with Pl do
-    if Live then NetFire(Weap, X, Y, AX, AY, SHID);
+    if alive then NetFire(Weap, X, Y, AX, AY, SHID);
 end;
 
 procedure MC_RECV_PlayerSettings(var M: TMsg);
@@ -2604,10 +2604,6 @@ begin
 
   with Mon do
   begin
-    GameX := X;
-    GameY := Y;
-    GameVelX := VX;
-    GameVelY := VY;
 
     MonsterAnim := MAnim;
     MonsterTargetUID := MTarg;
@@ -2619,7 +2615,10 @@ begin
 
     SetState(MState);
 
-    positionChanged(); // this updates spatial accelerators
+    setPosition(X, Y); // this will call positionChanged();
+    GameVelX := VX;
+    GameVelY := VY;
+    //positionChanged(); // this updates spatial accelerators
   end;
 end;
 
@@ -2627,6 +2626,7 @@ procedure MC_RECV_MonsterPos(var M: TMsg);
 var
   Mon: TMonster;
   ID: Word;
+  X, Y: Integer;
 begin
   ID := M.ReadWord();
   Mon := g_Monsters_ByUID(ID);
@@ -2635,12 +2635,13 @@ begin
 
   with Mon do
   begin
-    GameX := M.ReadLongInt();
-    GameY := M.ReadLongInt();
+    X := M.ReadLongInt();
+    Y := M.ReadLongInt();
+    Mon.setPosition(X, Y); // this will call `positionChanged()`
     GameVelX := M.ReadLongInt();
     GameVelY := M.ReadLongInt();
     GameDirection := TDirection(M.ReadByte());
-    positionChanged(); // this updates spatial accelerators
+    //positionChanged(); // this updates spatial accelerators
   end;
 end;