zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

M32script: remove sprite members 'detail' and 'filler', add 'blend', make r/w.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4306 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-02-08 14:37:56 +00:00
parent ad8d6795e2
commit 0637c2b6a8
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -485,7 +485,7 @@ const memberlabel_t SpriteLabels[]=
{ "shade", SPRITE_SHADE, 0, 0, 0 }, { "shade", SPRITE_SHADE, 0, 0, 0 },
{ "pal", SPRITE_PAL, 0, 0, 0 }, { "pal", SPRITE_PAL, 0, 0, 0 },
{ "clipdist", SPRITE_CLIPDIST, 0, 0, 0 }, { "clipdist", SPRITE_CLIPDIST, 0, 0, 0 },
{ "detail", SPRITE_DETAIL, 1, 0, 0 }, // aka filler, not used { "blend", SPRITE_BLEND, 0, 0, 0 },
{ "xrepeat", SPRITE_XREPEAT, 0, 0, 0 }, { "xrepeat", SPRITE_XREPEAT, 0, 0, 0 },
{ "yrepeat", SPRITE_YREPEAT, 0, 0, 0 }, { "yrepeat", SPRITE_YREPEAT, 0, 0, 0 },
{ "xoffset", SPRITE_XOFFSET, 0, 0, 0 }, { "xoffset", SPRITE_XOFFSET, 0, 0, 0 },
@ -500,8 +500,6 @@ const memberlabel_t SpriteLabels[]=
{ "lotag", SPRITE_LOTAG, 0, 0, 0 }, { "lotag", SPRITE_LOTAG, 0, 0, 0 },
{ "hitag", SPRITE_HITAG, 0, 0, 0 }, { "hitag", SPRITE_HITAG, 0, 0, 0 },
{ "extra", SPRITE_EXTRA, 0, 0, 0 }, { "extra", SPRITE_EXTRA, 0, 0, 0 },
// aliases
{ "filler", SPRITE_DETAIL, 1, 0, 0 },
{ "", -1, 0, 0, 0 } // END OF LIST { "", -1, 0, 0, 0 } // END OF LIST
}; };
@ -591,7 +589,6 @@ static void C_InitHashes()
hash_init(&h_sector); hash_init(&h_sector);
for (i=0; SectorLabels[i].lId >=0; i++) for (i=0; SectorLabels[i].lId >=0; i++)
hash_add(&h_sector,SectorLabels[i].name,i, 0); hash_add(&h_sector,SectorLabels[i].name,i, 0);
// hash_add(&h_sector,"filler", SECTOR_ALIGNTO, 0);
hash_init(&h_wall); hash_init(&h_wall);
for (i=0; WallLabels[i].lId >=0; i++) for (i=0; WallLabels[i].lId >=0; i++)
@ -600,7 +597,6 @@ static void C_InitHashes()
hash_init(&h_sprite); hash_init(&h_sprite);
for (i=0; SpriteLabels[i].lId >=0; i++) for (i=0; SpriteLabels[i].lId >=0; i++)
hash_add(&h_sprite,SpriteLabels[i].name,i, 0); hash_add(&h_sprite,SpriteLabels[i].name,i, 0);
// hash_add(&h_sprite,"filler", SPRITE_DETAIL, 0);
hash_init(&h_light); hash_init(&h_light);
for (i=0; LightLabels[i].lId >=0; i++) for (i=0; LightLabels[i].lId >=0; i++)

2
polymer/eduke32/source/m32def.h
View file

@ -225,7 +225,7 @@ enum SpriteLabel_t
SPRITE_SHADE, // 5 SPRITE_SHADE, // 5
SPRITE_PAL, SPRITE_PAL,
SPRITE_CLIPDIST, SPRITE_CLIPDIST,
SPRITE_DETAIL, SPRITE_BLEND,
SPRITE_XREPEAT, SPRITE_XREPEAT,
SPRITE_YREPEAT, // 10 SPRITE_YREPEAT, // 10
SPRITE_XOFFSET, SPRITE_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].blend=lValue; break; case SPRITE_BLEND: 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].blend; break; case SPRITE_BLEND: 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->blend=lValue; break; case SPRITE_BLEND: 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->blend; break; case SPRITE_BLEND: 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;