X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=981082d949b8aa4b5766dc98757319001b108dda;hp=e3d9b7bb2bed0c13288230a0e9be989c17656068;hb=69e1b76a873303efc92f819619ffff7b3c19c171;hpb=458ad9bc8def2f7fb7f3be7c6bd7d78f84c73045 diff --git a/src/game/g_game.pas b/src/game/g_game.pas index e3d9b7b..981082d 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -386,7 +386,7 @@ uses e_input, e_log, g_console, g_items, g_map, g_panel, g_playermodel, g_gfx, g_options, Math, g_triggers, g_monsters, e_sound, CONFIG, - g_language, g_net, g_main, + g_language, g_net, g_main, g_phys, ENet, e_msg, g_netmsg, g_netmaster, sfs, wadreader, g_system; @@ -3630,6 +3630,7 @@ end; procedure DrawPlayer(p: TPlayer); var px, py, a, b, c, d, i, fX, fY: Integer; + camObj: TObj; //R: TRect; begin if (p = nil) or (p.FDummy) then @@ -3647,9 +3648,10 @@ begin glPushMatrix(); - p.Obj.lerp(gLerpFactor, fX, fY); + camObj := p.getCameraObj(); + camObj.lerp(gLerpFactor, fX, fY); px := fX + PLAYER_RECT_CX; - py := fY + PLAYER_RECT_CY+nlerp(p.SlopeOld, p.Obj.slopeUpLeft, gLerpFactor); + py := fY + PLAYER_RECT_CY+nlerp(p.SlopeOld, camObj.slopeUpLeft, gLerpFactor); if (g_dbg_scale = 1.0) and (not g_dbg_ignore_bounds) then begin