Merge branch 'master' into gonesolong
Conflicts: src/CMakeLists.txt src/b_think.cpp src/g_doom/a_doomweaps.cpp src/g_hexen/a_clericstaff.cpp src/g_hexen/a_fighterplayer.cpp src/namedef.h src/p_enemy.cpp src/p_local.h src/p_mobj.cpp src/p_teleport.cpp src/sc_man_tokens.h src/thingdef/thingdef_codeptr.cpp src/thingdef/thingdef_function.cpp src/thingdef/thingdef_parse.cpp wadsrc/static/actors/actor.txt wadsrc/static/actors/constants.txt wadsrc/static/actors/shared/inventory.txt - Added register reuse to VMFunctionBuilder for FxPick's code emitter. - Note to self: Need to reimplement IsPointerEqual and CheckClass, which were added to thingdef_function.cpp over the past year, as this file no longer exists in this branch.
This commit is contained in:
commit
b5e4153c78
182 changed files with 23025 additions and 8730 deletions
|
|
@ -729,6 +729,42 @@ void R_ClearPastViewer (AActor *actor)
|
|||
}
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// R_RebuildViewInterpolation
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
void R_RebuildViewInterpolation(player_t *player)
|
||||
{
|
||||
if (player == NULL || player->camera == NULL)
|
||||
return;
|
||||
|
||||
if (!NoInterpolateView)
|
||||
return;
|
||||
NoInterpolateView = false;
|
||||
|
||||
InterpolationViewer *iview = FindPastViewer(player->camera);
|
||||
|
||||
iview->oviewx = iview->nviewx;
|
||||
iview->oviewy = iview->nviewy;
|
||||
iview->oviewz = iview->nviewz;
|
||||
iview->oviewpitch = iview->nviewpitch;
|
||||
iview->oviewangle = iview->nviewangle;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// R_GetViewInterpolationStatus
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
bool R_GetViewInterpolationStatus()
|
||||
{
|
||||
return NoInterpolateView;
|
||||
}
|
||||
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// R_SetupFrame
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue