Subversion Repositories eduke32

Compare Revisions

Ignore whitespace Rev 8641 → Rev 8726

/source/duke3d/src/player.cpp
1542,7 → 1542,7
 
if (playerNum >= 0)
{
if (GetAutoAimAng(spriteNum, playerNum, projecTile, ZOFFSET6, 0, &startPos, 768, &Zvel, &shootAng) < 0)
if (NAM_WW2GI || GetAutoAimAng(spriteNum, playerNum, projecTile, ZOFFSET6, 0, &startPos, 768, &Zvel, &shootAng) < 0)
Zvel = fix16_to_int(F16(100) - pPlayer->q16horiz - pPlayer->q16horizoff) * 98;
}
else if (pSprite->statnum != STAT_EFFECTOR)
4266,13 → 4266,18
else if ((*weaponFrame) > PWEAPON(playerNum, pPlayer->curr_weapon, TotalTime))
{
(*weaponFrame) = 0;
pPlayer->weapon_pos = WEAPON_POS_RAISE;
if (PIPEBOMB_CONTROL(playerNum) == PIPEBOMB_REMOTE)
{
pPlayer->weapon_pos = WEAPON_POS_RAISE;
pPlayer->curr_weapon = HANDREMOTE_WEAPON;
pPlayer->last_weapon = -1;
}
else P_CheckWeapon(pPlayer);
else
{
if (!NAM_WW2GI)
pPlayer->weapon_pos = WEAPON_POS_RAISE;
P_CheckWeapon(pPlayer);
}
}
}
else if (PWEAPON(playerNum, pPlayer->curr_weapon, WorksLike) == HANDREMOTE_WEAPON)