zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up Lunatic stuff in VM_AlterAng()/VM_Move()/VM_UpdateAnim()/A_Execute()

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7633 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-05-19 03:53:11 +00:00 committed by Christoph Oelckers
parent e2f43a59a7
commit 3577d8a032
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
source/duke3d/src/gameexec.cpp
View file

@ -500,7 +500,6 @@ GAMEEXEC_STATIC void VM_AlterAng(int32_t const moveFlags)
int const elapsedTics = (AC_COUNT(vm.pData))&31; int const elapsedTics = (AC_COUNT(vm.pData))&31;
#if !defined LUNATIC #if !defined LUNATIC
const intptr_t *moveptr;
if (EDUKE32_PREDICT_FALSE((unsigned)AC_MOVE_ID(vm.pData) >= (unsigned)g_scriptSize-1)) if (EDUKE32_PREDICT_FALSE((unsigned)AC_MOVE_ID(vm.pData) >= (unsigned)g_scriptSize-1))
{ {
@ -509,17 +508,18 @@ GAMEEXEC_STATIC void VM_AlterAng(int32_t const moveFlags)
return; return;
} }
moveptr = apScript + AC_MOVE_ID(vm.pData); auto const moveptr = apScript + AC_MOVE_ID(vm.pData);
auto &hvel = moveptr[0];
vm.pSprite->xvel += (moveptr[0] - vm.pSprite->xvel)/5; auto &vvel = moveptr[1];
if (vm.pSprite->zvel < 648)
vm.pSprite->zvel += ((moveptr[1]<<4) - vm.pSprite->zvel)/5;
#else #else
vm.pSprite->xvel += (vm.pActor->mv.hvel - vm.pSprite->xvel)/5; auto &hvel = vm.pActor->mv.hvel;
if (vm.pSprite->zvel < 648) auto &vvel = vm.pActor->mv.vvel;
vm.pSprite->zvel += ((vm.pActor->mv.vvel<<4) - vm.pSprite->zvel)/5;
#endif #endif
vm.pSprite->xvel += (hvel - vm.pSprite->xvel)/5;
if (vm.pSprite->zvel < 648)
vm.pSprite->zvel += ((vvel<<4) - vm.pSprite->zvel)/5;
if (A_CheckEnemySprite(vm.pSprite) && vm.pSprite->extra <= 0) // hack if (A_CheckEnemySprite(vm.pSprite) && vm.pSprite->extra <= 0) // hack
return; return;
@ -691,17 +691,18 @@ dead:
} }
auto const moveptr = apScript + AC_MOVE_ID(vm.pData); auto const moveptr = apScript + AC_MOVE_ID(vm.pData);
auto &hvel = moveptr[0];
auto &vvel = moveptr[1];
#else
auto &hvel = vm.pActor->mv.hvel;
auto &vvel = vm.pActor->mv.vvel;
#endif
if (movflags & geth) if (movflags & geth)
vm.pSprite->xvel += ((moveptr[0]) - vm.pSprite->xvel) >> 1; vm.pSprite->xvel += (hvel - vm.pSprite->xvel) >> 1;
if (movflags & getv) if (movflags & getv)
vm.pSprite->zvel += ((moveptr[1] << 4) - vm.pSprite->zvel) >> 1; vm.pSprite->zvel += (16 * vvel - vm.pSprite->zvel) >> 1;
#else
if (movflags & geth)
vm.pSprite->xvel += (vm.pActor->mv.hvel - vm.pSprite->xvel) >> 1;
if (movflags & getv)
vm.pSprite->zvel += (16 * vm.pActor->mv.vvel - vm.pSprite->zvel) >> 1;
#endif
if (movflags&dodgebullet && !deadflag) if (movflags&dodgebullet && !deadflag)
A_Dodge(vm.pSprite); A_Dodge(vm.pSprite);
@ -6498,9 +6499,7 @@ void VM_UpdateAnim(int spriteNum, int32_t *pData)
auto const actionptr = (actionofs != 0 && actionofs + (ACTION_PARAM_COUNT-1) < (unsigned) g_scriptSize) ? &apScript[actionofs] : NULL; auto const actionptr = (actionofs != 0 && actionofs + (ACTION_PARAM_COUNT-1) < (unsigned) g_scriptSize) ? &apScript[actionofs] : NULL;
if (actionptr != NULL) if (actionptr != NULL)
#endif
{ {
#if !defined LUNATIC
int const action_frames = actionptr[ACTION_NUMFRAMES]; int const action_frames = actionptr[ACTION_NUMFRAMES];
int const action_incval = actionptr[ACTION_INCVAL]; int const action_incval = actionptr[ACTION_INCVAL];
int const action_delay = actionptr[ACTION_DELAY]; int const action_delay = actionptr[ACTION_DELAY];
@ -6557,15 +6556,15 @@ void A_Execute(int spriteNum, int playerNum, int playerDist)
} }
VM_UpdateAnim(vm.spriteNum, vm.pData); VM_UpdateAnim(vm.spriteNum, vm.pData);
double t = timerGetHiTicks();
#ifdef LUNATIC
int const picnum = vm.pSprite->picnum; int const picnum = vm.pSprite->picnum;
double t = timerGetHiTicks();
#ifdef LUNATIC
int32_t killit=0;
if (L_IsInitialized(&g_ElState) && El_HaveActor(picnum)) if (L_IsInitialized(&g_ElState) && El_HaveActor(picnum))
killit = (El_CallActor(&g_ElState, picnum, spriteNum, playerNum, playerDist)==1); killit = (El_CallActor(&g_ElState, picnum, spriteNum, playerNum, playerDist)==1);
#else #else
int const picnum = vm.pSprite->picnum;
insptr = 4 + (g_tile[vm.pSprite->picnum].execPtr); insptr = 4 + (g_tile[vm.pSprite->picnum].execPtr);
VM_Execute(true); VM_Execute(true);
insptr = NULL; insptr = NULL;