teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Give sprite cstat bit 2048 (NOSHADE, Mapster32 key [N]) a macro name.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4350 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-02-22 19:38:51 +00:00
parent 7a7fb71169
commit 6f34193bb6
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/build/include/build.h
View file

@ -379,7 +379,9 @@ enum {
// bit 8: 1 = Blocking sprite (use with hitscan / cliptype 1) "H" // bit 8: 1 = Blocking sprite (use with hitscan / cliptype 1) "H"
// bit 9: 1 = Transluscence reversing, 0 = normal "T" // bit 9: 1 = Transluscence reversing, 0 = normal "T"
// bit 10: reserved (in use by a renderer hack, see CSTAT_SPRITE_MDHACK) // bit 10: reserved (in use by a renderer hack, see CSTAT_SPRITE_MDHACK)
// bit 11: 1 = determine shade based only on its own shade member (see CON's spritenoshade command) // bit 11: 1 = determine shade based only on its own shade member (see CON's spritenoshade command), i.e.
// don't take over shade from parallaxed ceiling/nonparallaxed floor
// (NOTE: implemented on the game side)
// bit 12: reserved // bit 12: reserved
// bit 13: 1 = does not cast shadow // bit 13: 1 = does not cast shadow
// bit 14: 1 = invisible but casts shadow // bit 14: 1 = invisible but casts shadow

7
polymer/eduke32/source/astub.c
View file

@ -6294,8 +6294,9 @@ static void Keys3d(void)
{ {
if (AIMING_AT_SPRITE) if (AIMING_AT_SPRITE)
{ {
sprite[searchwall].cstat ^= 2048; sprite[searchwall].cstat ^= CSTAT_SPRITE_NOSHADE;
message("Sprite %d spritenoshade bit: %s", searchwall, ONOFF(sprite[searchwall].cstat&2048)); message("Sprite %d spritenoshade bit: %s", searchwall,
ONOFF(sprite[searchwall].cstat&CSTAT_SPRITE_NOSHADE));
} }
} }
@ -10981,7 +10982,7 @@ void ExtAnalyzeSprites(int32_t ourx, int32_t oury, int32_t oura, int32_t smoothr
tspr->pal = fpal; tspr->pal = fpal;
// 2nd and 3rd rule minus "actor condition" // 2nd and 3rd rule minus "actor condition"
if (!wallaligned && (tspr->cstat&2048)==0) if (!wallaligned && (tspr->cstat&CSTAT_SPRITE_NOSHADE)==0)
{ {
if (sector[tspr->sectnum].ceilingstat&1) if (sector[tspr->sectnum].ceilingstat&1)
sh = sector[tspr->sectnum].ceilingshade; sh = sector[tspr->sectnum].ceilingshade;

2
polymer/eduke32/source/game.c
View file

@ -7234,7 +7234,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
continue; continue;
} }
if (A_CheckSpriteFlags(t->owner,SPRITE_NOSHADE) || (t->cstat&2048)) if (A_CheckSpriteFlags(t->owner, SPRITE_NOSHADE) || (t->cstat&CSTAT_SPRITE_NOSHADE))
l = sprite[t->owner].shade; l = sprite[t->owner].shade;
else else
{ {

5
polymer/eduke32/source/macros.h
View file

@ -155,7 +155,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// bit 8: 1 = Blocking sprite (use with hitscan) "H" // bit 8: 1 = Blocking sprite (use with hitscan) "H"
// bit 9: reserved // bit 9: reserved
// bit 10: reserved // bit 10: reserved
// bit 11: reserved // bit 11: 1 = determine shade based only on its own shade member (see CON's spritenoshade command), i.e.
// don't take over shade from parallaxed ceiling/nonparallaxed floor
// (NOTE: implemented on the game side)
// bit 12: reserved // bit 12: reserved
// bit 13: reserved // bit 13: reserved
// bit 14: reserved // bit 14: reserved
@ -172,6 +174,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define CSTAT_SPRITE_YCENTER BIT(7) #define CSTAT_SPRITE_YCENTER BIT(7)
#define CSTAT_SPRITE_BLOCK_HITSCAN BIT(8) #define CSTAT_SPRITE_BLOCK_HITSCAN BIT(8)
#define CSTAT_SPRITE_TRANS_FLIP BIT(9) #define CSTAT_SPRITE_TRANS_FLIP BIT(9)
#define CSTAT_SPRITE_NOSHADE BIT(11)
#define CSTAT_SPRITE_INVISIBLE BIT(15) #define CSTAT_SPRITE_INVISIBLE BIT(15)