diff options
| author | Steven Fuller <relnev@icculus.org> | 2001-10-28 01:55:11 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:36 +0200 |
| commit | 7ef81cbc6e162f1fcced6b294f6a4cf880152aa4 (patch) | |
| tree | 62dfa167d79a31b1c54b1fc27d1d8bab2b4c76d3 /src/win95 | |
| parent | ea23e5a1bbfa4109c3eae664b70268cb45ca48cc (diff) | |
More work on menus.
Diffstat (limited to 'src/win95')
| -rw-r--r-- | src/win95/awtexld.cpp | 14 | ||||
| -rw-r--r-- | src/win95/awtexld.h | 2 | ||||
| -rw-r--r-- | src/win95/io.c | 57 |
3 files changed, 18 insertions, 55 deletions
diff --git a/src/win95/awtexld.cpp b/src/win95/awtexld.cpp index eb2a34d..3394374 100644 --- a/src/win95/awtexld.cpp +++ b/src/win95/awtexld.cpp @@ -2149,6 +2149,20 @@ DDSurface * AwCreateSurface(char const * _argFormatS, ...) using namespace AwTl; + /* Just convert the texture to 32bpp */ + pixelFormat.palettizedB = 0; + + pixelFormat.alphaB = 1; + pixelFormat.validB = 1; + pixelFormat.bitsPerPixel = 32; + pixelFormat.redLeftShift = 0; + pixelFormat.greenLeftShift = 8; + pixelFormat.blueLeftShift = 16; + pixelFormat.redRightShift = 0; + pixelFormat.greenRightShift = 0; + pixelFormat.blueRightShift = 0; + pixelFormat.dwRGBAlphaBitMask = 0xFF000000; + va_list ap; va_start(ap,_argFormatS); CreateTextureParms parms; diff --git a/src/win95/awtexld.h b/src/win95/awtexld.h index 9e5eb3f..51266e0 100644 --- a/src/win95/awtexld.h +++ b/src/win95/awtexld.h @@ -103,11 +103,13 @@ struct AwCreateGraphicRegion { unsigned left, top, right, bottom; /* rectangle to cut from the original image */ unsigned width, height; /* width and height of the resulting surface or texture */ +#if 0 union /* DDSurface or D3DTexture pointer depending on the context used */ { DDSurface * pSurface; /* Direct Draw Surface object pointer */ D3DTexture * pTexture; /* Direct 3D Texture object pointer */ }; +#endif }; /* typedef to save typing 'struct' when not using C++ */ diff --git a/src/win95/io.c b/src/win95/io.c index bd63c83..a021f34 100644 --- a/src/win95/io.c +++ b/src/win95/io.c @@ -443,61 +443,10 @@ int NearestColour(int rs, int gs, int bs, unsigned char *palette) } - - - - - - - - /*************************************************************************/ /*************************************************************************/ - - - -/* - - PC Video Mode Array Functions - -*/ - - -#define m320diag (378 + 6) - - - - - -/* - - PC Video Mode Function Arrays - -*/ - -void (*SetVideoMode[]) (void) = { - -0 - -}; - - - - - - - - - - - - - - - - /* Initialise System and System Variables @@ -1797,12 +1746,10 @@ int ChangeDisplayModes(HINSTANCE hInst, int nCmd, obviously... FIXME!!! */ - /* test only!!! */ - #if 0 - chdir("d:\3dc"); - #endif +/* SetVideoMode[VideoMode](); +*/ /* Lose all the textures and reload the |