zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better support for working with blend in the editor 

git-svn-id: https://svn.eduke32.com/eduke32@6175 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-06-10 08:19:47 +00:00
parent d0211379e0
commit feb8b43892
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/build/src/build.cpp
View File

@ -1077,6 +1077,7 @@ static void handle_sprite_in_clipboard(int32_t i)
sprite[i].picnum = j;
}
sprite[i].shade = tempshade;
sprite[i].blend = tempblend;
sprite[i].pal = temppal;
sprite[i].xrepeat = max(tempxrepeat, 1);
sprite[i].yrepeat = max(tempyrepeat, 1);

2
source/build/src/polymost.cpp
View File

@ -116,7 +116,7 @@ int32_t r_downsizevar = -1;
static float fogresult, fogresult2;
coltypef fogcol, fogtable[MAXPALOOKUPS];
static float float_trans(uint32_t maskprops, uint8_t blend)
static inline float float_trans(uint32_t maskprops, uint8_t blend)
{
switch (maskprops)
{

14
source/duke3d/src/astub.cpp
View File

@ -5723,6 +5723,18 @@ static void Keys3d(void)
}
}
if (keystatus[KEYSC_QUOTE] && PRESSED_KEYSC(B)) // ' B
{
if (AIMING_AT_SPRITE)
{
int8_t oblend = sprite[searchwall].blend;
Bsprintf(tempbuf, "%s blend: ", Typestr[searchstat]);
getnumberptr256(tempbuf, &sprite[searchwall].blend, sizeof(int8_t), 255, 0, NULL);
if (sprite[searchwall].blend != oblend)
asksave = 1;
}
}
if (PRESSED_KEYSC(F2)) // F2
{
if (eitherCTRL || eitherSHIFT)
@ -6582,6 +6594,8 @@ static void Keys3d(void)
if (somethingintab == SEARCH_CEILING || somethingintab == SEARCH_FLOOR)
k=1, sector[searchsector].visibility = tempvis;
}
else if (AIMING_AT_SPRITE)
sprite[searchwall].blend = tempblend;
message("Pasted shade+pal%s", k?"+visibility":"");
asksave = 1;