rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-12 23:26:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

IOQ3 commit 2266

Browse source
This commit is contained in:
Richard Allen 2012-10-04 15:02:45 +00:00
parent 08d16d1b01
commit b88cd08ed9
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reaction/code/game/g_items.c
View file

@ -1339,8 +1339,8 @@ void G_RunItem(gentity_t * ent)
int contents; int contents;
int mask; int mask;
// if groundentity has been set to -1, it may have been pushed off an edge // if its groundentity has been set to none, it may have been pushed off an edge
if (ent->s.groundEntityNum == -1) { if (ent->s.groundEntityNum == ENTITYNUM_NONE) {
if (ent->s.pos.trType != TR_GRAVITY) { if (ent->s.pos.trType != TR_GRAVITY) {
ent->s.pos.trType = TR_GRAVITY; ent->s.pos.trType = TR_GRAVITY;
ent->s.pos.trTime = level.time; ent->s.pos.trTime = level.time;

4
reaction/code/game/g_mover.c
View file

@ -356,7 +356,7 @@ qboolean G_TryPushingEntity(gentity_t * check, gentity_t * pusher, vec3_t move,
} }
// may have pushed them off an edge // may have pushed them off an edge
if (check->s.groundEntityNum != pusher->s.number) { if (check->s.groundEntityNum != pusher->s.number) {
check->s.groundEntityNum = -1; check->s.groundEntityNum = ENTITYNUM_NONE;
} }
block = G_TestEntityPosition(check); block = G_TestEntityPosition(check);
@ -381,7 +381,7 @@ qboolean G_TryPushingEntity(gentity_t * check, gentity_t * pusher, vec3_t move,
VectorCopy((pushed_p - 1)->angles, check->s.apos.trBase); VectorCopy((pushed_p - 1)->angles, check->s.apos.trBase);
block = G_TestEntityPosition(check); block = G_TestEntityPosition(check);
if (!block) { if (!block) {
check->s.groundEntityNum = -1; check->s.groundEntityNum = ENTITYNUM_NONE;
pushed_p--; pushed_p--;
return qtrue; return qtrue;
} }

2
reaction/code/qcommon/q_shared.h
View file

@ -1309,7 +1309,7 @@ typedef struct entityState_s {
int otherEntityNum; // shotgun sources, etc int otherEntityNum; // shotgun sources, etc
int otherEntityNum2; int otherEntityNum2;
int groundEntityNum; // -1 = in air int groundEntityNum; // ENTITYNUM_NONE = in air
int constantLight; // r + (g<<8) + (b<<16) + (intensity<<24) int constantLight; // r + (g<<8) + (b<<16) + (intensity<<24)
int loopSound; // constantly loop this sound int loopSound; // constantly loop this sound