zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 00:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix up conveyor belts. This fixes breakage of the movement in general, as well as corrects the general behavior of the effect so that a player on a moving surface is moved at a constant rate, regardless of whether the player crouches, is shrunk, etc. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4741 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2014-11-22 12:28:12 +00:00
parent 2068d993a7
commit 3e7f96c32d
2 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
polymer/eduke32/source/actors.c
View file

@ -7276,17 +7276,18 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
} }
} }
p = myconnectindex; for (TRAVERSE_CONNECT(p))
g_player[p].ps->fric.x = g_player[p].ps->fric.y = 0;
if (g_player[p].ps->cursectnum == s->sectnum && g_player[p].ps->on_ground)
{ {
if (klabs(g_player[p].ps->pos.z-g_player[p].ps->truefz) < PHEIGHT+(9<<8)) if (g_player[p].ps->cursectnum == s->sectnum && g_player[p].ps->on_ground)
{ {
g_player[p].ps->fric.x += x<<3; if (klabs(g_player[p].ps->pos.z-g_player[p].ps->truefz) < PHEIGHT+(9<<8))
g_player[p].ps->fric.y += l<<3; {
g_player[p].ps->fric.x += x<<3;
g_player[p].ps->fric.y += l<<3;
}
} }
}
}
sc->floorxpanning += SP>>7; sc->floorxpanning += SP>>7;
break; break;
@ -7382,18 +7383,15 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
} }
} }
p = myconnectindex;
g_player[p].ps->fric.x = g_player[p].ps->fric.y = 0;
if (sprite[g_player[p].ps->i].sectnum == s->sectnum && g_player[p].ps->on_ground)
{
g_player[p].ps->fric.x += l<<5;
g_player[p].ps->fric.y += x<<5;
}
for (TRAVERSE_CONNECT(p)) for (TRAVERSE_CONNECT(p))
{
if (sprite[g_player[p].ps->i].sectnum == s->sectnum && g_player[p].ps->on_ground) if (sprite[g_player[p].ps->i].sectnum == s->sectnum && g_player[p].ps->on_ground)
{
g_player[p].ps->fric.x += l<<5;
g_player[p].ps->fric.y += x<<5;
g_player[p].ps->pos.z += s->zvel; g_player[p].ps->pos.z += s->zvel;
}
}
A_MoveSector(i); A_MoveSector(i);
setsprite(i,(vec3_t *)s); setsprite(i,(vec3_t *)s);

17
polymer/eduke32/source/player.c
View file

@ -2819,9 +2819,9 @@ void P_GetInput(int32_t snum)
} }
loc.fvel = loc.fvel =
mulscale9(in.fvel, sintable[(p->ang + 2560) & 2047]) + (mulscale9(in.svel, sintable[(p->ang + 2048) & 2047]) + p->fric.x); mulscale9(in.fvel, sintable[(p->ang + 2560) & 2047]) + (mulscale9(in.svel, sintable[(p->ang + 2048) & 2047]));
loc.svel = loc.svel =
mulscale9(in.fvel, sintable[(p->ang + 2048) & 2047]) + (mulscale9(in.svel, sintable[(p->ang + 1536) & 2047]) + p->fric.y); mulscale9(in.fvel, sintable[(p->ang + 2048) & 2047]) + (mulscale9(in.svel, sintable[(p->ang + 1536) & 2047]));
loc.avel = in.avel; loc.avel = in.avel;
loc.horz = in.horz; loc.horz = in.horz;
@ -4917,8 +4917,8 @@ void P_ProcessInput(int32_t snum)
if (p->jetpack_on == 0 && p->inv_amount[GET_STEROIDS] > 0 && p->inv_amount[GET_STEROIDS] < 400) if (p->jetpack_on == 0 && p->inv_amount[GET_STEROIDS] > 0 && p->inv_amount[GET_STEROIDS] < 400)
doubvel <<= 1; doubvel <<= 1;
p->vel.x += ((g_player[snum].sync->fvel*doubvel)<<6); p->vel.x += (((g_player[snum].sync->fvel) * doubvel) << 6);
p->vel.y += ((g_player[snum].sync->svel*doubvel)<<6); p->vel.y += (((g_player[snum].sync->svel) * doubvel) << 6);
j = 0; j = 0;
@ -4927,8 +4927,8 @@ void P_ProcessInput(int32_t snum)
else if (p->on_ground && (TEST_SYNC_KEY(sb_snum, SK_CROUCH) || (*kb > 10 && PWEAPON(snum, p->curr_weapon, WorksLike) == KNEE_WEAPON))) else if (p->on_ground && (TEST_SYNC_KEY(sb_snum, SK_CROUCH) || (*kb > 10 && PWEAPON(snum, p->curr_weapon, WorksLike) == KNEE_WEAPON)))
j = 0x2000; j = 0x2000;
p->vel.x = mulscale16(p->vel.x,p->runspeed-j); p->vel.x = mulscale16(p->vel.x, p->runspeed - j);
p->vel.y = mulscale16(p->vel.y,p->runspeed-j); p->vel.y = mulscale16(p->vel.y, p->runspeed - j);
if (klabs(p->vel.x) < 2048 && klabs(p->vel.y) < 2048) if (klabs(p->vel.x) < 2048 && klabs(p->vel.y) < 2048)
p->vel.x = p->vel.y = 0; p->vel.x = p->vel.y = 0;
@ -4975,8 +4975,11 @@ HORIZONLY:
} }
} }
#endif #endif
if ((j = clipmove((vec3_t *)p,&p->cursectnum, p->vel.x,p->vel.y,164L,(4L<<8),i,CLIPMASK0))) if ((j = clipmove((vec3_t *)p, &p->cursectnum, p->vel.x + (p->fric.x << 9), p->vel.y + (p->fric.y << 9), 164L,
(4L << 8), i, CLIPMASK0)))
P_CheckTouchDamage(p, j); P_CheckTouchDamage(p, j);
p->fric.x = p->fric.y = 0;
} }
// This makes the player view lower when shrunk. NOTE that it can get the // This makes the player view lower when shrunk. NOTE that it can get the