OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'pause' of https://github.com/Edward850/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2015-02-07 13:03:33 +01:00
commit 6801d0faec
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/g_shared/a_movingcamera.cpp
View file

@ -301,14 +301,14 @@ void APathFollower::Tick ()
bJustStepped = false;
if (CurrNode->args[2])
{
HoldTime = gametic + CurrNode->args[2] * TICRATE / 8;
HoldTime = level.time + CurrNode->args[2] * TICRATE / 8;
x = CurrNode->x;
y = CurrNode->y;
z = CurrNode->z;
}
}
if (HoldTime > gametic)
if (HoldTime > level.time)
return;
// Splines must have a previous node.