reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2025-01-28 22:48:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

CFuncTrain::Restart #55 (func_train) the target were not reset to a the starting point.

Browse Source
This commit is contained in:
s1lentq 2016-08-24 20:18:24 +07:00
parent fc33d7b363
commit 1e89c4fa60
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
regamedll/dlls/plats.cpp
View File

@ -639,7 +639,7 @@ void CFuncTrain::__MAKE_VHOOK(Use)(CBaseEntity *pActivator, CBaseEntity *pCaller
void CFuncTrain::Wait() void CFuncTrain::Wait()
{ {
if (m_pevCurrentTarget != NULL) if (m_pevCurrentTarget)
{ {
// Fire the pass target if there is one // Fire the pass target if there is one
if (m_pevCurrentTarget->message) if (m_pevCurrentTarget->message)
@ -721,7 +721,7 @@ void CFuncTrain::Next()
pev->target = pTarg->pev->target; pev->target = pTarg->pev->target;
m_flWait = pTarg->GetDelay(); m_flWait = pTarg->GetDelay();
if (m_pevCurrentTarget != NULL && m_pevCurrentTarget->speed != 0) if (m_pevCurrentTarget && m_pevCurrentTarget->speed != 0)
{ {
// don't copy speed from target if it is 0 (uninitialized) // don't copy speed from target if it is 0 (uninitialized)
pev->speed = m_pevCurrentTarget->speed; pev->speed = m_pevCurrentTarget->speed;
@ -777,7 +777,9 @@ void CFuncTrain::__MAKE_VHOOK(Activate)()
// keep track of this since path corners change our target for us. // keep track of this since path corners change our target for us.
m_pevCurrentTarget = pevTarg; m_pevCurrentTarget = pevTarg;
#ifdef REGAMEDLL_FIXES
m_pevFirstTarget = m_pevCurrentTarget;
#endif
UTIL_SetOrigin(pev, pevTarg->origin - (pev->mins + pev->maxs) * 0.5f); UTIL_SetOrigin(pev, pevTarg->origin - (pev->mins + pev->maxs) * 0.5f);
if (FStringNull(pev->targetname)) if (FStringNull(pev->targetname))
@ -812,7 +814,12 @@ void CFuncTrain::__MAKE_VHOOK(Spawn)()
ALERT(at_console, "FuncTrain with no target"); ALERT(at_console, "FuncTrain with no target");
} }
#ifndef REGAMEDLL_FIXES
// NOTE: useless, m_pevCurrentTarget always is NULL
m_pevFirstTarget = m_pevCurrentTarget; m_pevFirstTarget = m_pevCurrentTarget;
#endif
// TODO: brush-entity is always zero origin, use (mins+max)*0.5f
m_vStartPosition = pev->origin; m_vStartPosition = pev->origin;
if (pev->dmg == 0) if (pev->dmg == 0)
@ -844,14 +851,36 @@ void CFuncTrain::__MAKE_VHOOK(Restart)()
pev->dmg = 2; pev->dmg = 2;
pev->movetype = MOVETYPE_PUSH; pev->movetype = MOVETYPE_PUSH;
m_pevCurrentTarget = m_pevFirstTarget;
#ifdef REGAMEDLL_FIXES
// restore of first target
pev->target = m_pevFirstTarget->targetname;
#endif
m_pevCurrentTarget = m_pevFirstTarget;
UTIL_SetOrigin(pev, m_vStartPosition); UTIL_SetOrigin(pev, m_vStartPosition);
m_activated = FALSE; m_activated = FALSE;
if (m_volume == 0.0f) if (m_volume == 0.0f)
m_volume = 0.85f; m_volume = 0.85f;
#ifdef REGAMEDLL_FIXES
pev->nextthink = 0;
pev->velocity = g_vecZero;
if (pev->noiseMovement)
{
STOP_SOUND(edict(), CHAN_STATIC, (char *)STRING(pev->noiseMovement));
}
if (pev->noiseStopMoving)
{
EMIT_SOUND(ENT(pev), CHAN_VOICE, (char *)STRING(pev->noiseStopMoving), m_volume, ATTN_NORM);
}
Activate();
#endif
} }
void CFuncTrain::__MAKE_VHOOK(Precache)() void CFuncTrain::__MAKE_VHOOK(Precache)()