summaryrefslogtreecommitdiff
path: root/src/game/g_combat.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2005-11-27 00:00:16 +0000
committerTim Angus <tim@ngus.net>2005-11-27 00:00:16 +0000
commit046697c4b9369c02e730f1e16617e09876619864 (patch)
tree738d39079d13eb84b4d932f2a032e61cae570dbd /src/game/g_combat.c
parent3460e8bf9381c61e1bef98b78d320a8bd52b7f5f (diff)
* Fixed death by poison MOD s/antitox/medkit/
* Fixed Marauders momentarily disappearing when wall jumping * Fixed a potential crash bug involving the use of generic1 * Fixed being able to build multiple coincident repeaters if there is no reactor * Fixed incorrect message when invoking "buy ammo" with an energy weapon and no reactor present * Fixed invoking "reload" during a weapon reload causing an unnecessary reload * Fixed aliens having the wrong blood colour when shot with a las gun * Fixed hovel causing invisible builders
Diffstat (limited to 'src/game/g_combat.c')
-rw-r--r--src/game/g_combat.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 732e50f2..e869c046 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -51,7 +51,6 @@ LookAtKiller
void LookAtKiller( gentity_t *self, gentity_t *inflictor, gentity_t *attacker )
{
vec3_t dir;
- vec3_t angles;
if ( attacker && attacker != self )
VectorSubtract( attacker->s.pos.trBase, self->s.pos.trBase, dir );
@@ -59,15 +58,11 @@ void LookAtKiller( gentity_t *self, gentity_t *inflictor, gentity_t *attacker )
VectorSubtract( inflictor->s.pos.trBase, self->s.pos.trBase, dir );
else
{
- self->client->ps.generic1 = self->s.angles[ YAW ];
+ self->client->ps.stats[ STAT_VIEWLOCK ] = self->s.angles[ YAW ];
return;
}
- self->client->ps.generic1 = vectoyaw( dir );
-
- angles[ YAW ] = vectoyaw( dir );
- angles[ PITCH ] = 0;
- angles[ ROLL ] = 0;
+ self->client->ps.stats[ STAT_VIEWLOCK ] = vectoyaw( dir );
}
// these are just for logging, the client prints its own messages