rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-02 14:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Possible fix for bug 4142

Browse source
This commit is contained in:
Andrei Drexler 2010-06-04 15:33:02 +00:00
parent d6f824e95a
commit ed51037fc9
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reaction/code/game/g_main.c
View file

@ -450,6 +450,7 @@
int trap_RealTime(qtime_t * qtime); int trap_RealTime(qtime_t * qtime);
gentity_t *getEntByName(char *name); gentity_t *getEntByName(char *name);
void AddIP(char *str); void AddIP(char *str);
void G_RunAttachedEnt(gentity_t *ent);
void G_SetGlobalRefSystem(int newRefSys); void G_SetGlobalRefSystem(int newRefSys);
level_locals_t level; level_locals_t level;
@ -1230,7 +1231,6 @@ void G_InitMoveParents( void )
ent->s.time2 = ent->moveParent_ent - g_entities; ent->s.time2 = ent->moveParent_ent - g_entities;
if (ent->r.linked) if (ent->r.linked)
trap_RQ3LinkEntity(ent, __LINE__, __FILE__); trap_RQ3LinkEntity(ent, __LINE__, __FILE__);
break; break;
} }
} }
@ -1286,6 +1286,8 @@ void G_SetMoveParentOrder( void )
for (i=0; i<level.num_attachedEnts; i++) for (i=0; i<level.num_attachedEnts; i++)
{ {
gentity_t *ent = g_parentOrder[i];
Com_sprintf(p, 4, "%03i", g_parentOrder[i]-g_entities); Com_sprintf(p, 4, "%03i", g_parentOrder[i]-g_entities);
p += 3; p += 3;
//SetIntBytes(((g_parentOrder[i] - g_entities) << 1) | 1, p, 2); //SetIntBytes(((g_parentOrder[i] - g_entities) << 1) | 1, p, 2);
@ -2816,6 +2818,11 @@ void G_RunAttachedEnt(gentity_t *ent)
{ {
G_EvaluateTrajectoryEx(ent, level.time, ent->r.currentOrigin, ent->r.currentAngles); G_EvaluateTrajectoryEx(ent, level.time, ent->r.currentOrigin, ent->r.currentAngles);
VectorCopy(ent->r.currentOrigin, ent->s.origin); VectorCopy(ent->r.currentOrigin, ent->s.origin);
if (ent->moveParent_ent)
{
ent->r.svFlags |= SVF_PORTAL;
VectorCopy(ent->moveParent_ent->r.currentOrigin, ent->s.origin2);
}
if (ent->r.linked) if (ent->r.linked)
trap_RQ3LinkEntity(ent, __LINE__, __FILE__); trap_RQ3LinkEntity(ent, __LINE__, __FILE__);
} }