mirror of
https://github.com/yquake2/rogue.git
synced 2024-11-22 20:31:50 +00:00
Fix warnings, enable a clean Windows build
This commit is contained in:
parent
2482849546
commit
cb9736d97c
6 changed files with 0 additions and 33 deletions
|
@ -7,7 +7,6 @@ void UpdateChaseCam(edict_t *ent)
|
||||||
vec3_t forward, right;
|
vec3_t forward, right;
|
||||||
trace_t trace;
|
trace_t trace;
|
||||||
int i;
|
int i;
|
||||||
vec3_t oldgoal;
|
|
||||||
vec3_t angles;
|
vec3_t angles;
|
||||||
|
|
||||||
// is our chase target gone?
|
// is our chase target gone?
|
||||||
|
@ -25,8 +24,6 @@ void UpdateChaseCam(edict_t *ent)
|
||||||
targ = ent->client->chase_target;
|
targ = ent->client->chase_target;
|
||||||
|
|
||||||
VectorCopy(targ->s.origin, ownerv);
|
VectorCopy(targ->s.origin, ownerv);
|
||||||
VectorCopy(ent->s.origin, oldgoal);
|
|
||||||
|
|
||||||
ownerv[2] += targ->viewheight;
|
ownerv[2] += targ->viewheight;
|
||||||
|
|
||||||
VectorCopy(targ->client->v_angle, angles);
|
VectorCopy(targ->client->v_angle, angles);
|
||||||
|
|
12
src/g_func.c
12
src/g_func.c
|
@ -439,10 +439,7 @@ void plat_blocked (edict_t *self, edict_t *other)
|
||||||
if (other)
|
if (other)
|
||||||
{
|
{
|
||||||
/* Hack for entity without it's origin near the model */
|
/* Hack for entity without it's origin near the model */
|
||||||
vec3_t save;
|
|
||||||
VectorCopy(other->s.origin,save);
|
|
||||||
VectorMA (other->absmin, 0.5, other->size, other->s.origin);
|
VectorMA (other->absmin, 0.5, other->size, other->s.origin);
|
||||||
|
|
||||||
BecomeExplosion1(other);
|
BecomeExplosion1(other);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1741,10 +1738,7 @@ void door_blocked (edict_t *self, edict_t *other)
|
||||||
if (other)
|
if (other)
|
||||||
{
|
{
|
||||||
/* Hack for entitiy without their origin near the model */
|
/* Hack for entitiy without their origin near the model */
|
||||||
vec3_t save;
|
|
||||||
VectorCopy(other->s.origin,save);
|
|
||||||
VectorMA (other->absmin, 0.5, other->size, other->s.origin);
|
VectorMA (other->absmin, 0.5, other->size, other->s.origin);
|
||||||
|
|
||||||
BecomeExplosion1(other);
|
BecomeExplosion1(other);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2194,10 +2188,7 @@ void train_blocked (edict_t *self, edict_t *other)
|
||||||
if (other)
|
if (other)
|
||||||
{
|
{
|
||||||
/* Hack for entity without an origin near the model */
|
/* Hack for entity without an origin near the model */
|
||||||
vec3_t save;
|
|
||||||
VectorCopy(other->s.origin,save);
|
|
||||||
VectorMA (other->absmin, 0.5, other->size, other->s.origin);
|
VectorMA (other->absmin, 0.5, other->size, other->s.origin);
|
||||||
|
|
||||||
BecomeExplosion1(other);
|
BecomeExplosion1(other);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2728,10 +2719,7 @@ void door_secret_blocked (edict_t *self, edict_t *other)
|
||||||
if (other)
|
if (other)
|
||||||
{
|
{
|
||||||
/* Hack for entities without their origin near the model */
|
/* Hack for entities without their origin near the model */
|
||||||
vec3_t save;
|
|
||||||
VectorCopy(other->s.origin,save);
|
|
||||||
VectorMA (other->absmin, 0.5, other->size, other->s.origin);
|
VectorMA (other->absmin, 0.5, other->size, other->s.origin);
|
||||||
|
|
||||||
BecomeExplosion1(other);
|
BecomeExplosion1(other);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -512,7 +512,6 @@ qboolean SV_Push (edict_t *pusher, vec3_t move, vec3_t amove)
|
||||||
{
|
{
|
||||||
int i, e;
|
int i, e;
|
||||||
edict_t *check, *block;
|
edict_t *check, *block;
|
||||||
vec3_t mins, maxs;
|
|
||||||
pushed_t *p;
|
pushed_t *p;
|
||||||
vec3_t org, org2, move2, forward, right, up;
|
vec3_t org, org2, move2, forward, right, up;
|
||||||
vec3_t realmins, realmaxs;
|
vec3_t realmins, realmaxs;
|
||||||
|
@ -530,13 +529,6 @@ qboolean SV_Push (edict_t *pusher, vec3_t move, vec3_t amove)
|
||||||
move[i] = 0.125 * (int)temp;
|
move[i] = 0.125 * (int)temp;
|
||||||
}
|
}
|
||||||
|
|
||||||
// find the bounding box
|
|
||||||
for (i=0 ; i<3 ; i++)
|
|
||||||
{
|
|
||||||
mins[i] = pusher->absmin[i] + move[i];
|
|
||||||
maxs[i] = pusher->absmax[i] + move[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
// we need this for pushing things later
|
// we need this for pushing things later
|
||||||
VectorSubtract (vec3_origin, amove, org);
|
VectorSubtract (vec3_origin, amove, org);
|
||||||
AngleVectors (org, forward, right, up);
|
AngleVectors (org, forward, right, up);
|
||||||
|
|
|
@ -511,10 +511,6 @@ void jorg_firebullet (edict_t *self)
|
||||||
|
|
||||||
void jorg_attack(edict_t *self)
|
void jorg_attack(edict_t *self)
|
||||||
{
|
{
|
||||||
vec3_t vec;
|
|
||||||
|
|
||||||
VectorSubtract (self->enemy->s.origin, self->s.origin, vec);
|
|
||||||
|
|
||||||
if (random() <= 0.75)
|
if (random() <= 0.75)
|
||||||
{
|
{
|
||||||
gi.sound (self, CHAN_VOICE, sound_attack1, 1, ATTN_NORM,0);
|
gi.sound (self, CHAN_VOICE, sound_attack1, 1, ATTN_NORM,0);
|
||||||
|
|
|
@ -588,13 +588,9 @@ void makron_sight(edict_t *self, edict_t *other)
|
||||||
|
|
||||||
void makron_attack(edict_t *self)
|
void makron_attack(edict_t *self)
|
||||||
{
|
{
|
||||||
vec3_t vec;
|
|
||||||
float r;
|
float r;
|
||||||
|
|
||||||
r = random();
|
r = random();
|
||||||
|
|
||||||
VectorSubtract (self->enemy->s.origin, self->s.origin, vec);
|
|
||||||
|
|
||||||
if (r <= 0.3)
|
if (r <= 0.3)
|
||||||
self->monsterinfo.currentmove = &makron_move_attack3;
|
self->monsterinfo.currentmove = &makron_move_attack3;
|
||||||
else if (r <= 0.6)
|
else if (r <= 0.6)
|
||||||
|
|
|
@ -1844,7 +1844,6 @@ void weapon_etf_rifle_fire (edict_t *ent)
|
||||||
int damage;
|
int damage;
|
||||||
int kick = 3;
|
int kick = 3;
|
||||||
int i;
|
int i;
|
||||||
vec3_t angles;
|
|
||||||
vec3_t offset;
|
vec3_t offset;
|
||||||
|
|
||||||
if(deathmatch->value)
|
if(deathmatch->value)
|
||||||
|
@ -1881,7 +1880,6 @@ void weapon_etf_rifle_fire (edict_t *ent)
|
||||||
}
|
}
|
||||||
|
|
||||||
// get start / end positions
|
// get start / end positions
|
||||||
VectorAdd (ent->client->v_angle, ent->client->kick_angles, angles);
|
|
||||||
AngleVectors (ent->client->v_angle, forward, right, up);
|
AngleVectors (ent->client->v_angle, forward, right, up);
|
||||||
|
|
||||||
// FIXME - set correct frames for different offsets.
|
// FIXME - set correct frames for different offsets.
|
||||||
|
|
Loading…
Reference in a new issue