X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=db455725d2ca1b4f83c662584a279953acad455f;hb=373f27c0de10cb90442f535cb5d330095bafbf54;hp=56199cee6f859fcdfb6409f085597374bc9715db;hpb=d197a2da28970b16c06f8fbbbca3a9c7080b7988;p=d2df-sdl.git diff --git a/src/game/g_player.pas b/src/game/g_player.pas index 56199ce..db45572 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -651,8 +651,11 @@ uses {$IFDEF ENABLE_HOLMES} g_holmes, {$ENDIF} + {$IFDEF ENABLE_MENU} + g_menu, + {$ENDIF} {$IFNDEF HEADLESS} - r_render, g_menu, + r_render, {$ENDIF} e_log, g_map, g_items, g_console, g_gfx, Math, g_options, g_triggers, g_game, g_grid, e_res, @@ -5944,16 +5947,16 @@ begin // animation anim := (FModel <> nil); utils.writeBool(st, anim); - if anim then FModel.AnimState.SaveState(st); + if anim then FModel.AnimState.SaveState(st, 0, False); // animation for mask (same as animation, compat with older saves) anim := (FModel <> nil); utils.writeBool(st, anim); - if anim then FModel.AnimState.SaveState(st); + if anim then FModel.AnimState.SaveState(st, 0, False); end; procedure TCorpse.LoadState (st: TStream); - var anim: Boolean; r, g, b: Byte; stub: TAnimationState; + var anim, blending: Boolean; r, g, b, alpha: Byte; stub: TAnimationState; begin assert(st <> nil); @@ -5977,7 +5980,7 @@ begin anim := utils.readBool(st); if anim then begin - stub.LoadState(st); + stub.LoadState(st, alpha, blending); FModel.AnimState.CurrentFrame := Min(stub.CurrentFrame, FModel.AnimState.Length); end else @@ -5987,7 +5990,7 @@ begin end; // animation for mask (same as animation, compat with older saves) anim := utils.readBool(st); - if anim then stub.LoadState(st); + if anim then stub.LoadState(st, alpha, blending); stub.Free; end;