diff options
| author | Tim Angus <tim@ngus.net> | 2001-02-05 15:41:46 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2001-02-05 15:41:46 +0000 |
| commit | 31f1bb33ab5d7d3e6ebbc7eee88452e6efc8b011 (patch) | |
| tree | accd3ab7b8ab53d5e02d99f074edeb651381fdca /src/game | |
| parent | 96d1e6700762377bbfe54f30422ee0f532bea275 (diff) | |
Small event interface bugfix.
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_misc.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 762f38f5..63eed9c8 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -1778,7 +1778,7 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean if ( ps->externalEvent ) { s->event = ps->externalEvent; s->eventParm = ps->externalEventParm; - } else { + } else if ( ps->entityEventSequence < ps->eventSequence ) { int seq; if ( ps->entityEventSequence < ps->eventSequence - MAX_PS_EVENTS) { @@ -1787,9 +1787,7 @@ void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean seq = (ps->entityEventSequence-1) & (MAX_PS_EVENTS-1); s->event = ps->events[ seq ] | ( ( ps->entityEventSequence & 3 ) << 8 ); s->eventParm = ps->eventParms[ seq ]; - if ( ps->entityEventSequence < ps->eventSequence ) { - ps->entityEventSequence++; - } + ps->entityEventSequence++; } s->weapon = ps->weapon; @@ -1877,7 +1875,7 @@ void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s if ( ps->externalEvent ) { s->event = ps->externalEvent; s->eventParm = ps->externalEventParm; - } else { + } else if ( ps->entityEventSequence < ps->eventSequence ) { int seq; if ( ps->entityEventSequence < ps->eventSequence - MAX_PS_EVENTS) { @@ -1886,9 +1884,7 @@ void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s seq = (ps->entityEventSequence-1) & (MAX_PS_EVENTS-1); s->event = ps->events[ seq ] | ( ( ps->entityEventSequence & 3 ) << 8 ); s->eventParm = ps->eventParms[ seq ]; - if ( ps->entityEventSequence < ps->eventSequence ) { - ps->entityEventSequence++; - } + ps->entityEventSequence++; } s->weapon = ps->weapon; |