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

Revise r6253

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6265 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-06-24 21:17:26 +00:00
parent e4f0b74a4f
commit 047b94d242
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5549,7 +5549,6 @@ static void HandleSE31(int spriteNum, int setFloorZ, int spriteZ, int SEdir, int
// s: SE sprite // s: SE sprite
static void MaybeTrainKillPlayer(const spritetype *pSprite, int const setOPos) static void MaybeTrainKillPlayer(const spritetype *pSprite, int const setOPos)
{ {
if (ud.noclip) return;
for (bssize_t TRAVERSE_CONNECT(playerNum)) for (bssize_t TRAVERSE_CONNECT(playerNum))
{ {
DukePlayer_t *const pPlayer = g_player[playerNum].ps; DukePlayer_t *const pPlayer = g_player[playerNum].ps;
@ -5706,9 +5705,8 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
if (actor[j].t_data[0] == 0) break; if (actor[j].t_data[0] == 0) break;
if (actor[j].t_data[0] == 2) DELETE_SPRITE_AND_CONTINUE(spriteNum); if (actor[j].t_data[0] == 2) DELETE_SPRITE_AND_CONTINUE(spriteNum);
if (sprite[j].ang > 1024) l = (sprite[j].ang > 1024) ? -1 : 1;
l = -1;
else l = 1;
if (pData[3] == 0) if (pData[3] == 0)
pData[3] = ldist(pSprite,&sprite[j]); pData[3] = ldist(pSprite,&sprite[j]);
pSprite->xvel = pData[3]; pSprite->xvel = pData[3];
@ -5922,12 +5920,9 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
{ {
DukePlayer_t *const pPlayer = g_player[playerNum].ps; DukePlayer_t *const pPlayer = g_player[playerNum].ps;
// might happen when squished into void space
if (pPlayer->cursectnum < 0) if (pPlayer->cursectnum < 0)
{
// might happen when squished into void space
// initprintf("cursectnum < 0!\n");
break; break;
}
if (sector[pPlayer->cursectnum].lotag != ST_2_UNDERWATER) if (sector[pPlayer->cursectnum].lotag != ST_2_UNDERWATER)
{ {
@ -6095,8 +6090,6 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
if (pSprite->xvel) if (pSprite->xvel)
{ {
int32_t playerNum;
l = (pSprite->xvel*sintable[(pSprite->ang+512)&2047])>>14; l = (pSprite->xvel*sintable[(pSprite->ang+512)&2047])>>14;
x = (pSprite->xvel*sintable[pSprite->ang&2047])>>14; x = (pSprite->xvel*sintable[pSprite->ang&2047])>>14;
@ -6104,7 +6097,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
if (ud.noclip == 0) if (ud.noclip == 0)
MaybeTrainKillPlayer(pSprite, 0); MaybeTrainKillPlayer(pSprite, 0);
for (TRAVERSE_CONNECT(playerNum)) for (int TRAVERSE_CONNECT(playerNum))
{ {
DukePlayer_t *const pPlayer = g_player[playerNum].ps; DukePlayer_t *const pPlayer = g_player[playerNum].ps;
@ -6540,7 +6533,7 @@ ACTOR_STATIC void G_MoveEffectors(void) //STATNUM 3
for (SPRITES_OF(STAT_PLAYER, k)) for (SPRITES_OF(STAT_PLAYER, k))
{ {
if (sprite[k].owner >= 0 && clipinsidebox((vec2_t *)&sprite[k], j, pPlayer->clipdist << 1) == 1) if (sprite[k].owner >= 0 && clipinsidebox((vec2_t *)&sprite[k], j, pPlayer->clipdist + 40) == 1)
{ {
pData[5] = 8; // Delay pData[5] = 8; // Delay
goto next_sprite; goto next_sprite;