Change DWORD to int in *Texture*. (Maybe it should be unsigned, but

we don't use unsigned much anyway.)
This commit is contained in:
Glenn Maynard
2002-10-19 19:30:34 +00:00
parent d98b95d63c
commit 22b95f922f
6 changed files with 28 additions and 28 deletions
+8 -8
View File
@@ -35,8 +35,8 @@
RageBitmapTexture::RageBitmapTexture( RageBitmapTexture::RageBitmapTexture(
RageDisplay* pScreen, RageDisplay* pScreen,
const CString &sFilePath, const CString &sFilePath,
DWORD dwMaxSize, int dwMaxSize,
DWORD dwTextureColorDepth, int dwTextureColorDepth,
int iMipMaps, int iMipMaps,
int iAlphaBits, int iAlphaBits,
bool bDither, bool bDither,
@@ -62,8 +62,8 @@ RageBitmapTexture::~RageBitmapTexture()
} }
void RageBitmapTexture::Reload( void RageBitmapTexture::Reload(
DWORD dwMaxSize, int dwMaxSize,
DWORD dwTextureColorDepth, int dwTextureColorDepth,
int iMipMaps, int iMipMaps,
int iAlphaBits, int iAlphaBits,
bool bDither, bool bDither,
@@ -86,8 +86,8 @@ LPDIRECT3DTEXTURE8 RageBitmapTexture::GetD3DTexture()
void RageBitmapTexture::Create( void RageBitmapTexture::Create(
DWORD dwMaxSize, int dwMaxSize,
DWORD dwTextureColorDepth, int dwTextureColorDepth,
int iMipMaps, int iMipMaps,
int iAlphaBits, int iAlphaBits,
bool bDither, bool bDither,
@@ -155,9 +155,9 @@ void RageBitmapTexture::Create(
// find out what the min texture size is // find out what the min texture size is
dwMaxSize = min( dwMaxSize, DISPLAY->GetDeviceCaps().MaxTextureWidth ); dwMaxSize = min( dwMaxSize, int(DISPLAY->GetDeviceCaps().MaxTextureWidth) );
bStretch |= ddii.Width > dwMaxSize || ddii.Height > dwMaxSize; bStretch |= int(ddii.Width) > dwMaxSize || int(ddii.Height) > dwMaxSize;
// HACK: On a Voodoo3 and Win98, D3DXCreateTextureFromFileEx fail randomly on rare occasions. // HACK: On a Voodoo3 and Win98, D3DXCreateTextureFromFileEx fail randomly on rare occasions.
// So, we'll try the call 2x in a row in case the first one fails. // So, we'll try the call 2x in a row in case the first one fails.
+6 -6
View File
@@ -25,8 +25,8 @@ public:
RageBitmapTexture( RageBitmapTexture(
RageDisplay* pScreen, RageDisplay* pScreen,
const CString &sFilePath, const CString &sFilePath,
DWORD dwMaxSize = 2048, int dwMaxSize = 2048,
DWORD dwTextureColorDepth = 16, int dwTextureColorDepth = 16,
int iMipMaps = 4, int iMipMaps = 4,
int iAlphaBits = 4, int iAlphaBits = 4,
bool bDither = false, bool bDither = false,
@@ -35,8 +35,8 @@ public:
virtual ~RageBitmapTexture(); virtual ~RageBitmapTexture();
virtual void Reload( virtual void Reload(
DWORD dwMaxSize, int dwMaxSize,
DWORD dwTextureColorDepth, int dwTextureColorDepth,
int iMipMaps = 4, int iMipMaps = 4,
int iAlphaBits = 4, int iAlphaBits = 4,
bool bDither = false, bool bDither = false,
@@ -47,8 +47,8 @@ public:
protected: protected:
virtual void Create( virtual void Create(
DWORD dwMaxSize, int dwMaxSize,
DWORD dwTextureColorDepth, int dwTextureColorDepth,
int iMipMaps, int iMipMaps,
int iAlphaBits, int iAlphaBits,
bool bDither, bool bDither,
+4 -4
View File
@@ -294,8 +294,8 @@ HRESULT CTextureRenderer::DoRenderSample( IMediaSample * pSample )
RageMovieTexture::RageMovieTexture( RageMovieTexture::RageMovieTexture(
RageDisplay* pScreen, RageDisplay* pScreen,
const CString &sFilePath, const CString &sFilePath,
DWORD dwMaxSize, int dwMaxSize,
DWORD dwTextureColorDepth, int dwTextureColorDepth,
int iMipMaps, int iMipMaps,
int iAlphaBits, int iAlphaBits,
bool bDither, bool bDither,
@@ -337,8 +337,8 @@ RageMovieTexture::~RageMovieTexture()
} }
void RageMovieTexture::Reload( void RageMovieTexture::Reload(
DWORD dwMaxSize, int dwMaxSize,
DWORD dwTextureColorDepth, int dwTextureColorDepth,
int iMipMaps, int iMipMaps,
int iAlphaBits, int iAlphaBits,
bool bDither, bool bDither,
+4 -4
View File
@@ -27,8 +27,8 @@ public:
RageMovieTexture( RageMovieTexture(
RageDisplay* pScreen, RageDisplay* pScreen,
const CString &sFilePath, const CString &sFilePath,
DWORD dwMaxSize = 2048, int dwMaxSize = 2048,
DWORD dwTextureColorDepth = 16, int dwTextureColorDepth = 16,
int iMipMaps = 4, int iMipMaps = 4,
int iAlphaBits = 4, int iAlphaBits = 4,
bool bDither = false, bool bDither = false,
@@ -37,8 +37,8 @@ public:
virtual ~RageMovieTexture(); virtual ~RageMovieTexture();
virtual void Reload( virtual void Reload(
DWORD dwMaxSize, int dwMaxSize,
DWORD dwTextureColorDepth, int dwTextureColorDepth,
int iMipMaps = 4, int iMipMaps = 4,
int iAlphaBits = 4, int iAlphaBits = 4,
bool bDither = false, bool bDither = false,
+2 -2
View File
@@ -24,8 +24,8 @@
RageTexture::RageTexture( RageTexture::RageTexture(
RageDisplay* pScreen, RageDisplay* pScreen,
const CString &sFilePath, const CString &sFilePath,
DWORD dwMaxSize, int dwMaxSize,
DWORD dwTextureColorDepth, int dwTextureColorDepth,
int iMipMaps, int iMipMaps,
int iAlphaBits, int iAlphaBits,
bool bDither, bool bDither,
+4 -4
View File
@@ -40,8 +40,8 @@ public:
RageTexture( RageTexture(
RageDisplay* pScreen, RageDisplay* pScreen,
const CString &sFilePath, const CString &sFilePath,
DWORD dwMaxSize = 2048, int dwMaxSize = 2048,
DWORD dwTextureColorDepth = 16, int dwTextureColorDepth = 16,
int iMipMaps = 4, int iMipMaps = 4,
int iAlphaBits = 4, int iAlphaBits = 4,
bool bDither = false, bool bDither = false,
@@ -50,8 +50,8 @@ public:
virtual ~RageTexture() = 0; virtual ~RageTexture() = 0;
virtual void Reload( virtual void Reload(
DWORD dwMaxSize = 2048, int dwMaxSize = 2048,
DWORD dwTextureColorDepth = 16, int dwTextureColorDepth = 16,
int iMipMaps = 4, int iMipMaps = 4,
int iAlphaBits = 4, int iAlphaBits = 4,
bool bDither = false, bool bDither = false,