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

Rework SE26 movement to function more like SE14 than SE24

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6910 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-06-09 20:36:24 +00:00
parent 66dadaaa71
commit 9c313158e8
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
source/duke3d/src/actors.cpp
View file

@ -7464,30 +7464,49 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
for (SPRITES_OF_SECT_SAFE(pSprite->sectnum, j, nextj)) for (SPRITES_OF_SECT_SAFE(pSprite->sectnum, j, nextj))
{ {
if (sprite[j].statnum != STAT_EFFECTOR && sprite[j].statnum != STAT_PLAYER) if (sprite[j].statnum != STAT_EFFECTOR && sprite[j].statnum != STAT_PLAYER && sprite[j].statnum != STAT_PROJECTILE)
{ {
actor[j].bpos.x = sprite[j].x; actor[j].bpos.x = sprite[j].x;
actor[j].bpos.y = sprite[j].y; actor[j].bpos.y = sprite[j].y;
sprite[j].x += l; sprite[j].x += l;
sprite[j].y += x; sprite[j].y += x;
sprite[j].z += pSprite->zvel; sprite[j].z += pSprite->zvel;
setsprite(j,(vec3_t *)&sprite[j]);
setsprite(j, (vec3_t *)&sprite[j]);
} }
} }
for (TRAVERSE_CONNECT(p)) for (TRAVERSE_CONNECT(p))
{ {
DukePlayer_t *const ps = g_player[p].ps; DukePlayer_t *const pPlayer = g_player[p].ps;
if (sprite[ps->i].sectnum == pSprite->sectnum && ps->on_ground) if (pSprite->sectnum == sprite[pPlayer->i].sectnum && pPlayer->on_ground)
{ {
ps->fric.x += l<<5; pPlayer->pos.x += l;
ps->fric.y += x<<5; pPlayer->pos.y += x;
ps->pos.z += pSprite->zvel; pPlayer->pos.z += pSprite->zvel;
updatesector(pPlayer->pos.x, pPlayer->pos.y, &pPlayer->cursectnum);
changespritesect(pPlayer->i, pPlayer->cursectnum);
pPlayer->bobpos.x += l;
pPlayer->bobpos.y += x;
if (g_netServer || numplayers > 1)
{
pPlayer->opos.x = pPlayer->pos.x;
pPlayer->opos.y = pPlayer->pos.y;
}
if (sprite[pPlayer->i].extra <= 0)
{
sprite[pPlayer->i].x = pPlayer->pos.x;
sprite[pPlayer->i].y = pPlayer->pos.y;
}
} }
} }
A_MoveSector(spriteNum); A_MoveSector(spriteNum);
setsprite(spriteNum,(vec3_t *)pSprite); setsprite(spriteNum,(vec3_t *)pSprite);