diff options
| author | Steven Fuller <relnev@icculus.org> | 2001-08-12 01:26:18 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:36 +0200 |
| commit | ae2906ca8302cd41f05582232799b35e0b05414d (patch) | |
| tree | dab13d79c60a42b1b7a8efb96ca2af190dbcbdb2 /src/win95/awiffld.cpp | |
| parent | 56982d4e9b5b1fe64c78ebe007811c37d212f06a (diff) | |
Fixed particle blending.
Diffstat (limited to 'src/win95/awiffld.cpp')
| -rw-r--r-- | src/win95/awiffld.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/win95/awiffld.cpp b/src/win95/awiffld.cpp index e281079..1076937 100644 --- a/src/win95/awiffld.cpp +++ b/src/win95/awiffld.cpp @@ -52,7 +52,7 @@ class AwIffConvTransp if (*pCol == iTranspCol) return rawTranspCol; unsigned rv = AwIffConvNonTransp::DoConv(pCol,pPalette db_code1(DB_COMMA nPaletteSize)); if (rv != rawTranspCol) return rv; - + // make the colour non-transparent (nb: only an occasional case) // OK, Here's the plan: @@ -100,15 +100,7 @@ class AwIffConvTransp : (1<<pixelFormat.blueRightShift )*3/2 - (pPalette[*pCol].b & (1<<pixelFormat.blueRightShift )-1)); // Pick lowest value and do the business - Colour colAdj = pPalette[*pCol]; - - #if defined(_MSC_VER) && _MSC_VER >= 1100 - // VC5.0 gives inane warnings when += type operators - // are used on types smaller than int (even with - // explicit casting!) - #pragma warning(disable:4244) - #endif if ( nBlueDiffUp <= nBlueDiffDown @@ -155,12 +147,6 @@ class AwIffConvTransp { colAdj.g -= static_cast<unsigned char>(1<<pixelFormat.greenRightShift); } - #if defined(_MSC_VER) && _MSC_VER == 1100 - // VC5.0 gives inane warnings when += type operators - // are used on types smaller than int (even with - // explicit casting!) - #pragma warning(default:4244) - #endif return Colour::ConvNonTransp::DoConv(&colAdj); } |