diff options
| author | /dev/humancontroller <devhc@example.com> | 2014-07-13 21:04:55 +0200 |
|---|---|---|
| committer | /dev/humancontroller <devhc@example.com> | 2017-03-09 13:51:17 +0100 |
| commit | 9439ae4c9e0d2258c77d9f1f661bbe030ed15c53 (patch) | |
| tree | 25cd01ca8e43f913a0f7ef2afa7ab0054aacc065 /src/game | |
| parent | 05cb487661989c52654c20f7dc4cc6caacc9e86a (diff) | |
use entityState_t::misc instead of entityState_t::generic1 in some rather important cases involving 1.1 clients
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/g_buildable.c | 6 | ||||
| -rw-r--r-- | src/game/g_weapon.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 09375552..0a99a937 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -1881,7 +1881,7 @@ void HReactor_Think( gentity_t *self ) continue; tent = G_TempEntity( enemy->s.pos.trBase, EV_TESLATRAIL ); - tent->s.generic1 = self->s.number; //src + tent->s.misc = self->s.number; //src tent->s.clientNum = enemy->s.number; //dest VectorCopy( self->s.pos.trBase, tent->s.origin2 ); fired = qtrue; @@ -2753,7 +2753,7 @@ void G_BuildableThink( gentity_t *ent, int msec ) ent->dcc = ( ent->buildableTeam != TEAM_HUMANS ) ? 0 : G_FindDCC( ent ); // Set health - ent->s.generic1 = MAX( ent->health, 0 ); + ent->s.misc = MAX( ent->health, 0 ); // Set flags ent->s.eFlags &= ~( EF_B_POWERED | EF_B_SPAWNED | EF_B_MARKED ); @@ -3737,7 +3737,7 @@ static gentity_t *G_Build( gentity_t *builder, buildable_t buildable, VectorScale( normal, -50.0f, built->s.pos.trDelta ); } - built->s.generic1 = MAX( built->health, 0 ); + built->s.misc = MAX( built->health, 0 ); if( BG_Buildable( buildable )->team == TEAM_ALIENS ) { diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index 08f2d1eb..985da844 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -720,7 +720,7 @@ void teslaFire( gentity_t *self ) // Send tesla zap trail tent = G_TempEntity( tr.endpos, EV_TESLATRAIL ); - tent->s.generic1 = self->s.number; // src + tent->s.misc = self->s.number; // src tent->s.clientNum = self->enemy->s.number; // dest } |