diff --git a/source/build/src/build.cpp b/source/build/src/build.cpp index ae74f35cc..d8aaea74d 100644 --- a/source/build/src/build.cpp +++ b/source/build/src/build.cpp @@ -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); diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp index ccd840faf..2e12ffe97 100644 --- a/source/build/src/polymost.cpp +++ b/source/build/src/polymost.cpp @@ -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) { diff --git a/source/duke3d/src/astub.cpp b/source/duke3d/src/astub.cpp index 8df3851a1..87e8aa9e6 100644 --- a/source/duke3d/src/astub.cpp +++ b/source/duke3d/src/astub.cpp @@ -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;