zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

In the C code, rename sprite[].filler to 'blend'.

Browse source 
Also, fix a missed .filler -> g_ambiencePlaying[] rewrite in the editor.
In C-CON, 'detail' is kept as alias to C-side (former) .filler / now .blend,
but that name is *deprecated*.

git-svn-id: https://svn.eduke32.com/eduke32@4305 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-02-08 14:37:55 +00:00
parent b1b0da2852
commit ad8d6795e2
7 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -392,7 +392,7 @@ typedef struct
Tracker(Sprite, uint16_t) cstat; Tracker(Sprite, uint16_t) cstat;
Tracker(Sprite, int16_t) picnum; Tracker(Sprite, int16_t) picnum;
Tracker(Sprite, int8_t) shade; Tracker(Sprite, int8_t) shade;
Tracker(Sprite, uint8_t) pal, clipdist, filler; Tracker(Sprite, uint8_t) pal, clipdist, blend;
Tracker(Sprite, uint8_t) xrepeat, yrepeat; Tracker(Sprite, uint8_t) xrepeat, yrepeat;
Tracker(Sprite, int8_t) xoffset, yoffset; Tracker(Sprite, int8_t) xoffset, yoffset;
Tracker(Sprite, int16_t) sectnum, statnum; Tracker(Sprite, int16_t) sectnum, statnum;

2
polymer/eduke32/build/src/engine.c
View file

@ -5681,7 +5681,7 @@ static void drawsprite_classic(int32_t snum)
if (palookup[globalpal] == NULL) globalpal = 0; // JBF: fixes null-pointer crash if (palookup[globalpal] == NULL) globalpal = 0; // JBF: fixes null-pointer crash
globalshade = tspr->shade; globalshade = tspr->shade;
setup_blend(tspr->filler); setup_blend(tspr->blend);
if (cstat&2) if (cstat&2)
{ {

2
polymer/eduke32/build/src/engine_oldmap.h
View file

@ -243,7 +243,7 @@ static void convertv6sprv7(struct spritetypev6 *from, spritetype *to)
to->shade = from->shade; to->shade = from->shade;
to->pal = from->pal; to->pal = from->pal;
to->clipdist = from->clipdist; to->clipdist = from->clipdist;
to->filler = 0; to->blend = 0;
to->xrepeat = from->xrepeat; to->xrepeat = from->xrepeat;
to->yrepeat = from->yrepeat; to->yrepeat = from->yrepeat;
to->xoffset = from->xoffset; to->xoffset = from->xoffset;

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

@ -2505,7 +2505,7 @@ static void SoundDisplay(void)
int32_t AmbienceToggle = 1; int32_t AmbienceToggle = 1;
int32_t ParentalLock = 0; int32_t ParentalLock = 0;
static uint8_t g_ambiencePlaying[MAXSPRITES>>3]; uint8_t g_ambiencePlaying[MAXSPRITES>>3];
#define testbit(bitarray, i) (bitarray[(i)>>3] & (1<<((i)&7))) #define testbit(bitarray, i) (bitarray[(i)>>3] & (1<<((i)&7)))
#define setbit(bitarray, i) bitarray[(i)>>3] |= (1<<((i)&7)) #define setbit(bitarray, i) bitarray[(i)>>3] |= (1<<((i)&7))

10
polymer/eduke32/source/gamestructures.c
View file

@ -2488,7 +2488,7 @@ static void __fastcall VM_SetSprite(int32_t lVar1, int32_t lLabelID, int32_t lVa
return; return;
case ACTOR_DETAIL: case ACTOR_DETAIL:
sprite[iActor].filler=lVar1; sprite[iActor].blend=lVar1;
return; return;
case ACTOR_XREPEAT: case ACTOR_XREPEAT:
@ -2738,7 +2738,7 @@ static void __fastcall VM_GetSprite(int32_t lVar1, int32_t lLabelID, int32_t lVa
return; return;
case ACTOR_DETAIL: case ACTOR_DETAIL:
Gv_SetVarX(lVar2, sprite[iActor].filler); Gv_SetVarX(lVar2, sprite[iActor].blend);
return; return;
case ACTOR_XREPEAT: case ACTOR_XREPEAT:
@ -3038,10 +3038,10 @@ static void __fastcall VM_AccessTsprite(int32_t iSet, int32_t lVar1, int32_t lLa
case ACTOR_DETAIL: case ACTOR_DETAIL:
if (iSet) if (iSet)
{ {
spriteext[iActor].tspr->filler=lValue; spriteext[iActor].tspr->blend=lValue;
return; return;
} }
Gv_SetVarX(lVar2, spriteext[iActor].tspr->filler); Gv_SetVarX(lVar2, spriteext[iActor].tspr->blend);
return; return;
case ACTOR_XREPEAT: case ACTOR_XREPEAT:
@ -3502,7 +3502,7 @@ static int32_t __fastcall VM_AccessSpriteX(int32_t iActor, int32_t lLabelID, int
case ACTOR_SHADE: return sprite[iActor].shade; case ACTOR_SHADE: return sprite[iActor].shade;
case ACTOR_PAL: return sprite[iActor].pal; case ACTOR_PAL: return sprite[iActor].pal;
case ACTOR_CLIPDIST: return sprite[iActor].clipdist; case ACTOR_CLIPDIST: return sprite[iActor].clipdist;
case ACTOR_DETAIL: return sprite[iActor].filler; case ACTOR_DETAIL: return sprite[iActor].blend;
case ACTOR_XREPEAT: return sprite[iActor].xrepeat; case ACTOR_XREPEAT: return sprite[iActor].xrepeat;
case ACTOR_YREPEAT: return sprite[iActor].yrepeat; case ACTOR_YREPEAT: return sprite[iActor].yrepeat;
case ACTOR_XOFFSET: return sprite[iActor].xoffset; case ACTOR_XOFFSET: return sprite[iActor].xoffset;

8
polymer/eduke32/source/m32structures.c
View file

@ -316,7 +316,7 @@ static int32_t __fastcall VM_AccessSprite(int32_t how, int32_t lVar1, int32_t lL
case SPRITE_SHADE: sprite[i].shade=lValue; break; case SPRITE_SHADE: sprite[i].shade=lValue; break;
case SPRITE_PAL: sprite[i].pal=lValue; break; case SPRITE_PAL: sprite[i].pal=lValue; break;
case SPRITE_CLIPDIST: sprite[i].clipdist=lValue; break; case SPRITE_CLIPDIST: sprite[i].clipdist=lValue; break;
case SPRITE_DETAIL: sprite[i].filler=lValue; break; case SPRITE_DETAIL: sprite[i].blend=lValue; break;
case SPRITE_XREPEAT: sprite[i].xrepeat=lValue; break; case SPRITE_XREPEAT: sprite[i].xrepeat=lValue; break;
case SPRITE_YREPEAT: sprite[i].yrepeat=lValue; break; case SPRITE_YREPEAT: sprite[i].yrepeat=lValue; break;
case SPRITE_XOFFSET: sprite[i].xoffset=lValue; break; case SPRITE_XOFFSET: sprite[i].xoffset=lValue; break;
@ -351,7 +351,7 @@ static int32_t __fastcall VM_AccessSprite(int32_t how, int32_t lVar1, int32_t lL
case SPRITE_SHADE: lValue=sprite[i].shade; break; case SPRITE_SHADE: lValue=sprite[i].shade; break;
case SPRITE_PAL: lValue=sprite[i].pal; break; case SPRITE_PAL: lValue=sprite[i].pal; break;
case SPRITE_CLIPDIST: lValue=sprite[i].clipdist; break; case SPRITE_CLIPDIST: lValue=sprite[i].clipdist; break;
case SPRITE_DETAIL: lValue=sprite[i].filler; break; case SPRITE_DETAIL: lValue=sprite[i].blend; break;
case SPRITE_XREPEAT: lValue=sprite[i].xrepeat; break; case SPRITE_XREPEAT: lValue=sprite[i].xrepeat; break;
case SPRITE_YREPEAT: lValue=sprite[i].yrepeat; break; case SPRITE_YREPEAT: lValue=sprite[i].yrepeat; break;
case SPRITE_XOFFSET: lValue=sprite[i].xoffset; break; case SPRITE_XOFFSET: lValue=sprite[i].xoffset; break;
@ -464,7 +464,7 @@ static int32_t __fastcall VM_AccessTsprite(int32_t how, int32_t lVar1, int32_t l
case SPRITE_SHADE: datspr->shade=lValue; break; case SPRITE_SHADE: datspr->shade=lValue; break;
case SPRITE_PAL: datspr->pal=lValue; break; case SPRITE_PAL: datspr->pal=lValue; break;
case SPRITE_CLIPDIST: datspr->clipdist=lValue; break; case SPRITE_CLIPDIST: datspr->clipdist=lValue; break;
case SPRITE_DETAIL: datspr->filler=lValue; break; case SPRITE_DETAIL: datspr->blend=lValue; break;
case SPRITE_XREPEAT: datspr->xrepeat=lValue; break; case SPRITE_XREPEAT: datspr->xrepeat=lValue; break;
case SPRITE_YREPEAT: datspr->yrepeat=lValue; break; case SPRITE_YREPEAT: datspr->yrepeat=lValue; break;
case SPRITE_XOFFSET: datspr->xoffset=lValue; break; case SPRITE_XOFFSET: datspr->xoffset=lValue; break;
@ -520,7 +520,7 @@ static int32_t __fastcall VM_AccessTsprite(int32_t how, int32_t lVar1, int32_t l
case SPRITE_SHADE: lValue=datspr->shade; break; case SPRITE_SHADE: lValue=datspr->shade; break;
case SPRITE_PAL: lValue=datspr->pal; break; case SPRITE_PAL: lValue=datspr->pal; break;
case SPRITE_CLIPDIST: lValue=datspr->clipdist; break; case SPRITE_CLIPDIST: lValue=datspr->clipdist; break;
case SPRITE_DETAIL: lValue=datspr->filler; break; case SPRITE_DETAIL: lValue=datspr->blend; break;
case SPRITE_XREPEAT: lValue=datspr->xrepeat; break; case SPRITE_XREPEAT: lValue=datspr->xrepeat; break;
case SPRITE_YREPEAT: lValue=datspr->yrepeat; break; case SPRITE_YREPEAT: lValue=datspr->yrepeat; break;
case SPRITE_XOFFSET: lValue=datspr->xoffset; break; case SPRITE_XOFFSET: lValue=datspr->xoffset; break;

6
polymer/eduke32/source/sounds_mapster32.c
View file

@ -459,8 +459,10 @@ void S_Callback(uint32_t num)
if (sprite[i].picnum == MUSICANDSFX && sector[sprite[i].sectnum].lotag < 3 && sprite[i].lotag < 999) if (sprite[i].picnum == MUSICANDSFX && sector[sprite[i].sectnum].lotag < 3 && sprite[i].lotag < 999)
{ {
// ActorExtra[i].temp_data[0] = 0; extern uint8_t g_ambiencePlaying[MAXSPRITES>>3];
sprite[i].filler &= (~1);
g_ambiencePlaying[i>>3] &= ~(1<<(i&7));
if (j < k-1) if (j < k-1)
{ {
g_sounds[num].SoundOwner[j].voice = g_sounds[num].SoundOwner[k-1].voice; g_sounds[num].SoundOwner[j].voice = g_sounds[num].SoundOwner[k-1].voice;