X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmsg.pas;h=6d4f5c1d3cb188e4a737738e00bfb1bdca804677;hb=dcd27af126da1388ac89979cf34b657cd240c262;hp=a2e2bc944d5ec6651f93b41a55b749e431255a5d;hpb=c8d05082e92b7c2c5b722e2b205e96a15a32eec2;p=d2df-sdl.git diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas index a2e2bc9..6d4f5c1 100644 --- a/src/game/g_netmsg.pas +++ b/src/game/g_netmsg.pas @@ -284,7 +284,7 @@ function IsValidFilePath(const S: String): Boolean; implementation uses - Math, ENet, e_input, e_log, g_base, g_basic, r_animations, r_gfx, + Math, ENet, e_input, e_log, g_base, g_basic, r_gfx, g_textures, g_gfx, g_sound, g_console, g_options, g_game, g_player, g_map, g_panel, g_items, g_weapons, g_phys, g_gui, g_language, g_monsters, g_netmaster, utils, wadreader, MAPDEF; @@ -766,7 +766,7 @@ begin if (g_Force_Model_Get() <> 0) then TmpModel := g_Forced_Model_GetName(); - if TmpModel <> Pl.Model.Name then + if TmpModel <> Pl.Model.GetName() then Pl.SetModel(TmpModel); if (TmpWeapSwitch <> Pl.WeapSwitchMode) then @@ -1406,7 +1406,7 @@ begin NetOut.Write(PID); NetOut.Write(Pl.Name); if Mdl = '' then - NetOut.Write(Pl.Model.Name) + NetOut.Write(Pl.Model.GetName()) else NetOut.Write(Mdl); NetOut.Write(Pl.FColor.R); @@ -2697,7 +2697,7 @@ begin if (g_Force_Model_Get() <> 0) then TmpModel := g_Forced_Model_GetName(); - if TmpModel <> Pl.Model.Name then + if TmpModel <> Pl.Model.GetName() then Pl.SetModel(TmpModel); end;