From 9dadcb80240ed2e8df118d92940a954f0e7e669e Mon Sep 17 00:00:00 2001
From: Steven Fuller <relnev@icculus.org>
Date: Sat, 11 Aug 2001 03:36:48 +0000
Subject: Threw in texture loading/drawing.

Blending modes (color/texture) are problematic and texture coordinates
aren't yet perfect.
---
 src/win95/awtexld.hpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/win95/awtexld.hpp')

diff --git a/src/win95/awtexld.hpp b/src/win95/awtexld.hpp
index e39ef39..34e287f 100644
--- a/src/win95/awtexld.hpp
+++ b/src/win95/awtexld.hpp
@@ -32,12 +32,14 @@ namespace AwTl {
 		unsigned blueLeftShift;
 		unsigned blueRightShift;
 		
+		unsigned dwRGBAlphaBitMask;
 //		DDPIXELFORMAT ddpf;
 	};
 
 	// DO SOMTHING ABOUT THIS
 	extern PixelFormat pixelFormat;
-
+	extern PixelFormat pfSurfaceFormat;
+	
 	class CreateTextureParms;
 	
 	/********************/
@@ -57,9 +59,7 @@ namespace AwTl {
 						 static_cast<unsigned>(_colP->r)>>pixelFormat.redRightShift<<pixelFormat.redLeftShift
 						|static_cast<unsigned>(_colP->g)>>pixelFormat.greenRightShift<<pixelFormat.greenLeftShift
 						|static_cast<unsigned>(_colP->b)>>pixelFormat.blueRightShift<<pixelFormat.blueLeftShift
-/* TODO */
-/*|pixelFormat.ddpf.dwRGBAlphaBitMask*/
-					;
+						|pixelFormat.dwRGBAlphaBitMask;
 				}
 				static inline unsigned DoConv(BYTE const * _colP, Colour const * _paletteP db_code1(DB_COMMA unsigned _paletteSize))
 				{
@@ -224,6 +224,7 @@ namespace AwTl {
 					*_dstRowP.byteP++ = u.b[1];
 					*_dstRowP.byteP = u.b[2];
 				}
+				break;
 			}
 			case 32:
 			{
-- 
cgit v1.3