Changeset 25205

Timestamp:
Apr 7, 2021, 10:35:02 AM (3 years ago)
Author:
Stan
Message:

Fix initial animation sync.

UpdateAnimationID → PickAnimationID

Reviewed by: @wraitii

Differential Revision: ​https://code.wildfiregames.com/D3747

Location:
ps/trunk/source/graphics
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • ps/trunk/source/graphics/UnitAnimation.cpp

    r24629 r25205  
    9191void CUnitAnimation::ReloadAnimation()
    9292{
    93     UpdateAnimationID();
    9493    ReloadUnit(m_Model, m_Object);
    9594}
    … …  
    102101    m_AnimStates.clear();
    103102    m_AnimStatesAreStatic = true;
     103
    104104    AddModel(m_Model, m_Object);
    105105}
    … …  
    238238                // choose animations from the complete state
    239239                CStr oldID = m_AnimationID;
    240                 UpdateAnimationID();
     240                AnimationID();
    241241                anim = it->object->GetRandomAnimation(m_State, m_AnimationID);
    242242                if (oldID != m_AnimationID)
    … …  
    283283}
    284284
    285 void CUnitAnimation::UpdateAnimationID()
    286 {
    287     CStr& ID = m_Object->GetRandomAnimation(m_State)->m_ID;
    288     m_AnimationID = ID;
    289 }
     285void CUnitAnimation::PickAnimationID()
     286{
     287    m_AnimationID = m_Object->GetRandomAnimation(m_State)->m_ID;
     288}

  • ps/trunk/source/graphics/UnitAnimation.h

    r24352 r25205  
    1 /* Copyright (C) 2020 Wildfire Games.
     1/* Copyright (C) 202 Wildfire Games.
    22 * This file is part of 0 A.D.
    33 *
    … …  
    104104     * Picks a new animation ID from our current state
    105105     */
    106     void UpdateAnimationID();
     106    void AnimationID();
    107107
    108108    struct SModelAnimState
Note: See TracChangeset for help on using the changeset viewer.