teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-31 05:00:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Polymost: adjust parenthesis to cease compiler warnings

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6663 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
pogokeen 2018-02-16 06:38:51 +00:00
parent 1f133cd049
commit 7b2ac67e9d
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/build/src/polymost.cpp
View file

@ -5213,8 +5213,8 @@ void polymost2_drawsprite(int32_t snum)
//handle sprite flipping
horzScale *= -2.f*((globalorientation & CSTAT_SPRITE_XFLIP) != 0) + 1.f;
vertScale *= -2.f*((globalorientation & CSTAT_SPRITE_ALIGNMENT) != CSTAT_SPRITE_ALIGNMENT_FLOOR &
(globalorientation & CSTAT_SPRITE_YFLIP) != 0) + 1.f;
vertScale *= -2.f*(((globalorientation & CSTAT_SPRITE_ALIGNMENT) != CSTAT_SPRITE_ALIGNMENT_FLOOR) &
((globalorientation & CSTAT_SPRITE_YFLIP) != 0)) + 1.f;
//POGOTODO: replace this with simply using off.x and a different float for z offsets
// switching that over should fix floor sprite offsets so that they flip properly when yflip/xflip is applied
@ -5338,8 +5338,8 @@ void polymost2_drawsprite(int32_t snum)
}
off.x *= ((float) ((globalorientation & CSTAT_SPRITE_XFLIP) != 0))*-2.f + 1.f;
off.y *= ((float) ((globalorientation & CSTAT_SPRITE_ALIGNMENT) != CSTAT_SPRITE_ALIGNMENT_FACING &
(globalorientation & (CSTAT_SPRITE_YFLIP)) != 0))*-2.f + 1.f;
off.y *= ((float) (((globalorientation & CSTAT_SPRITE_ALIGNMENT) != CSTAT_SPRITE_ALIGNMENT_FACING) &
((globalorientation & CSTAT_SPRITE_YFLIP) != 0)))*-2.f + 1.f;
if ((globalorientation & CSTAT_SPRITE_ALIGNMENT)==CSTAT_SPRITE_ALIGNMENT_FLOOR)
{
@ -5422,7 +5422,9 @@ void polymost2_drawsprite(int32_t snum)
method,
texScale,
texOffset,
((globalorientation & CSTAT_SPRITE_ONE_SIDED) != 0)*3 & ((globalorientation & CSTAT_SPRITE_XFLIP) != 0 ^ (globalorientation & CSTAT_SPRITE_YFLIP) != 0)+1);
((globalorientation & CSTAT_SPRITE_ONE_SIDED) != 0)*3 &
((((globalorientation & CSTAT_SPRITE_XFLIP) != 0) ^
((globalorientation & CSTAT_SPRITE_YFLIP) != 0))+1));
drawpoly_srepeat = 0;
drawpoly_trepeat = 0;