Skip to content

GitLab

Commit b372ce6d authored by NY00123's avatar NY00123
Browse files

Duke3d: Revert 22d85479. 

There are maps which depend on projectiles getting reflected
by walls with the picnum of MIRROR.
parent 8ed89a1e
Hide whitespace changes
Inline Side-by-side
source/duke3d/src/actors.cpp
View file @ b372ce6d
......@@ -3280,7 +3280,8 @@ ACTOR_STATIC void Proj_MoveCustom(int const spriteNum)
case 32768:
otherSprite &= (MAXWALLS - 1);
if (pProj->workslike & PROJECTILE_BOUNCESOFFMIRRORS && wall[otherSprite].overpicnum == MIRROR)
if (pProj->workslike & PROJECTILE_BOUNCESOFFMIRRORS
&& (wall[otherSprite].overpicnum == MIRROR || wall[otherSprite].picnum == MIRROR))
{
Proj_BounceOffWall(pSprite, otherSprite);
pSprite->owner = spriteNum;
......@@ -3298,7 +3299,7 @@ ACTOR_STATIC void Proj_MoveCustom(int const spriteNum)
if (pProj->workslike & PROJECTILE_BOUNCESOFFWALLS && pSprite->yvel > 0)
{
if (wall[otherSprite].overpicnum != MIRROR)
if (wall[otherSprite].overpicnum != MIRROR && wall[otherSprite].picnum != MIRROR)
pSprite->yvel--;
Proj_BounceOffWall(pSprite, otherSprite);
......@@ -3571,7 +3572,8 @@ ACTOR_STATIC void G_MoveWeapons(void)
moveSprite &= (MAXWALLS - 1);
if (pSprite->picnum != RPG && pSprite->picnum != FREEZEBLAST && pSprite->picnum != SPIT
&& (!WORLDTOUR || pSprite->picnum != FIREBALL) && wall[moveSprite].overpicnum == MIRROR)
&& (!WORLDTOUR || pSprite->picnum != FIREBALL)
&& (wall[moveSprite].overpicnum == MIRROR || wall[moveSprite].picnum == MIRROR))
{
Proj_BounceOffWall(pSprite, moveSprite);
pSprite->owner = spriteNum;
......@@ -3584,7 +3586,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
if (pSprite->picnum == FREEZEBLAST)
{
if (wall[moveSprite].overpicnum != MIRROR)
if (wall[moveSprite].overpicnum != MIRROR && wall[moveSprite].picnum != MIRROR)
{
pSprite->extra >>= 1;
pSprite->yvel--;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment