vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

func_conveyor: Fix spawning, respawning and use of SetAngles because they weren't updating before.

Browse source
This commit is contained in:
Marco Cawthorne 2020-06-09 01:36:20 +02:00
parent e24dc3467d
commit 3b7431cba1
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gs-entbase/server/func_conveyor.cpp
View file

@ -25,13 +25,14 @@ STUB!
#define SF_CONVEYOR_VISUAL 1 #define SF_CONVEYOR_VISUAL 1
#define SF_CONVEYOR_NOTSOLID 2 #define SF_CONVEYOR_NOTSOLID 2
class func_conveyor:func_wall class func_conveyor:CBaseTrigger
{ {
float m_flSpeed; float m_flSpeed;
vector m_vecMoveDir; vector m_vecMoveDir;
void(void) func_conveyor; void(void) func_conveyor;
virtual void(void) Respawn;
virtual void(void) Trigger; virtual void(void) Trigger;
virtual void(void) touch; virtual void(void) touch;
virtual void(void) SetMovementDirection; virtual void(void) SetMovementDirection;
@ -47,8 +48,6 @@ void func_conveyor::SetMovementDirection(void)
makevectors(angles); makevectors(angles);
m_vecMoveDir = v_forward; m_vecMoveDir = v_forward;
} }
angles = [0,0,0];
} }
void func_conveyor::touch(void) void func_conveyor::touch(void)
@ -62,10 +61,16 @@ void func_conveyor::Trigger(void)
m_flSpeed = -m_flSpeed; m_flSpeed = -m_flSpeed;
} }
void func_conveyor::func_conveyor(void) void func_conveyor::Respawn(void)
{ {
func_wall::func_wall(); m_vecMoveDir = [0,0,0];
angles = m_oldAngle;
SetMovementDirection(); SetMovementDirection();
SetSolid(SOLID_BSP);
SetMovetype(MOVETYPE_PUSH);
SetModel(m_oldModel);
SetOrigin(m_oldOrigin);
/* TODO: Apply some effect flag the engine handles? */ /* TODO: Apply some effect flag the engine handles? */
if (!(spawnflags & SF_CONVEYOR_VISUAL)) { if (!(spawnflags & SF_CONVEYOR_VISUAL)) {
@ -78,4 +83,11 @@ void func_conveyor::func_conveyor(void)
if (m_flSpeed == 0) if (m_flSpeed == 0)
m_flSpeed = 100; m_flSpeed = 100;
SetAngles([0,0,0]);
}
void func_conveyor::func_conveyor(void)
{
CBaseTrigger::CBaseTrigger();
} }