OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Merged the GC branch back into the trunk, so now it can receive more

Browse source 
testing from the people who download SVN trunk builds.

SVN r795 (trunk)
This commit is contained in:
Randy Heit 2008-03-12 02:56:11 +00:00
commit f2660dc336
88 changed files with 2541 additions and 1523 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/g_shared/a_movingcamera.cpp
View file

@ -61,7 +61,7 @@ public:
void Serialize (FArchive &arc);
AInterpolationPoint *Next;
TObjPtr<AInterpolationPoint> Next;
};
IMPLEMENT_POINTY_CLASS (AInterpolationPoint)
@ -181,7 +181,7 @@ protected:
void Serialize (FArchive &arc);
bool bActive, bJustStepped;
AInterpolationPoint *PrevNode, *CurrNode;
TObjPtr<AInterpolationPoint> PrevNode, CurrNode;
float Time; // Runs from 0.0 to 1.0 between CurrNode and CurrNode->Next
int HoldTime;
};
@ -289,8 +289,8 @@ void APathFollower::Activate (AActor *activator)
{
if (!bActive)
{
CurrNode = static_cast<AInterpolationPoint *>(target);
PrevNode = static_cast<AInterpolationPoint *>(lastenemy);
CurrNode = barrier_cast<AInterpolationPoint *>(target);
PrevNode = barrier_cast<AInterpolationPoint *>(lastenemy);
if (CurrNode != NULL)
{
@ -638,7 +638,7 @@ public:
protected:
bool Interpolate ();
AActor *Activator;
TObjPtr<AActor> Activator;
};
IMPLEMENT_POINTY_CLASS (AMovingCamera)