diff options
| author | oy <Tom_Adams@web.de> | 2011-12-04 14:34:27 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-12-04 14:39:47 +0100 |
| commit | 9a03989e84c8d2719801889738c6af68864aba10 (patch) | |
| tree | c63debba2e7d849d615f0d5db9f1f8f4a816838d /src/game/client | |
| parent | b2a825652d8588dfb7f1c793403ca05555b1d75f (diff) | |
| download | zcatch-9a03989e84c8d2719801889738c6af68864aba10.tar.gz zcatch-9a03989e84c8d2719801889738c6af68864aba10.zip | |
added "Make an option for each envelope: (a) synchronized (b) starting at join" by Choupom
Diffstat (limited to 'src/game/client')
| -rw-r--r-- | src/game/client/components/maplayers.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/game/client/components/maplayers.cpp b/src/game/client/components/maplayers.cpp index 48f11f26..a1e629a6 100644 --- a/src/game/client/components/maplayers.cpp +++ b/src/game/client/components/maplayers.cpp @@ -99,10 +99,15 @@ void CMapLayers::EnvelopeEval(float TimeOffset, int Env, float *pChannels, void } else { - if(pThis->m_pClient->m_Snap.m_pGameInfoObj) - Time = mix((pThis->Client()->PrevGameTick()-pThis->m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick) / (float)pThis->Client()->GameTickSpeed(), - (pThis->Client()->GameTick()-pThis->m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick) / (float)pThis->Client()->GameTickSpeed(), - pThis->Client()->IntraGameTick()); + if(pItem->m_Version < 2 || pItem->m_Synchronized) + { + if(pThis->m_pClient->m_Snap.m_pGameInfoObj) + Time = mix((pThis->Client()->PrevGameTick()-pThis->m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick) / (float)pThis->Client()->GameTickSpeed(), + (pThis->Client()->GameTick()-pThis->m_pClient->m_Snap.m_pGameInfoObj->m_RoundStartTick) / (float)pThis->Client()->GameTickSpeed(), + pThis->Client()->IntraGameTick()); + } + else + Time = pThis->Client()->LocalTime(); pThis->RenderTools()->RenderEvalEnvelope(pPoints+pItem->m_StartPoint, pItem->m_NumPoints, 4, Time+TimeOffset, pChannels); } } |