qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-10 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

tidy up a messy part of the merge

Browse source
This commit is contained in:
Bill Currie 2000-03-12 08:13:35 +00:00
parent 2f47ba42f2
commit ba97294a41
1 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
common/view.c
View file

@ -938,13 +938,7 @@ void V_CalcRefdef (void)
float steptime; float steptime;
steptime = host_frametime; steptime = host_frametime;
#else
if (cl.onground && ent->origin[2] - oldz > 0)
{
float steptime;
#endif
#ifdef QUAKEWORLD
oldz += steptime * 80; oldz += steptime * 80;
if (oldz > cl.simorg[2]) if (oldz > cl.simorg[2])
oldz = cl.simorg[2]; oldz = cl.simorg[2];
@ -956,23 +950,29 @@ if (cl.onground && ent->origin[2] - oldz > 0)
else else
oldz = cl.simorg[2]; oldz = cl.simorg[2];
#else #else
steptime = cl.time - cl.oldtime; if (cl.onground && ent->origin[2] - oldz > 0)
if (steptime < 0) {
//FIXME I_Error ("steptime < 0"); float steptime;
steptime = 0;
oldz += steptime * 80; steptime = cl.time - cl.oldtime;
if (oldz > ent->origin[2]) if (steptime < 0)
oldz = ent->origin[2]; //FIXME I_Error ("steptime < 0");
if (ent->origin[2] - oldz > 12) steptime = 0;
oldz = ent->origin[2] - 12;
r_refdef.vieworg[2] += oldz - ent->origin[2]; oldz += steptime * 80;
view->origin[2] += oldz - ent->origin[2]; if (oldz > ent->origin[2])
oldz = ent->origin[2];
if (ent->origin[2] - oldz > 12)
oldz = ent->origin[2] - 12;
r_refdef.vieworg[2] += oldz - ent->origin[2];
view->origin[2] += oldz - ent->origin[2];
}
oldz = ent->origin[2];
if (cl_chasecam->value)
Chase_Update ();
#endif #endif
} }
#ifdef UQUAKE
oldz = ent->origin[2];
#endif
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
/* /*
@ -983,11 +983,8 @@ void DropPunchAngle (void)
cl.punchangle -= 10*host_frametime; cl.punchangle -= 10*host_frametime;
if (cl.punchangle < 0) if (cl.punchangle < 0)
cl.punchangle = 0; cl.punchangle = 0;
#else
if (cl_chasecam->value)
Chase_Update ();
#endif
} }
#endif
/* /*
V_RenderView V_RenderView