diff options
author | Einar Johan Trøan Sømåen | 2012-07-09 03:27:21 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-07-09 03:27:21 +0200 |
commit | 1eea9ad1a3ae577195363abe475cfbbee33d153b (patch) | |
tree | 3df20e3a1443f12a39167f047bb49d4d8e57521b /engines/wintermute/Base/BSurface.cpp | |
parent | 932bd45da5600c0a3f8b36d407fde38f60039432 (diff) | |
download | scummvm-rg350-1eea9ad1a3ae577195363abe475cfbbee33d153b.tar.gz scummvm-rg350-1eea9ad1a3ae577195363abe475cfbbee33d153b.tar.bz2 scummvm-rg350-1eea9ad1a3ae577195363abe475cfbbee33d153b.zip |
WINTERMUTE: Remove most of the wintype-definitions.
Diffstat (limited to 'engines/wintermute/Base/BSurface.cpp')
-rw-r--r-- | engines/wintermute/Base/BSurface.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/engines/wintermute/Base/BSurface.cpp b/engines/wintermute/Base/BSurface.cpp index 8a325a4d7f..0cf5292afb 100644 --- a/engines/wintermute/Base/BSurface.cpp +++ b/engines/wintermute/Base/BSurface.cpp @@ -60,14 +60,14 @@ CBSurface::~CBSurface() { //////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::create(const char *filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) {
- return E_FAIL;
+ERRORCODE CBSurface::create(const char *filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) {
+ return STATUS_FAILED;
}
//////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::restore() {
- return E_FAIL;
+ERRORCODE CBSurface::restore() {
+ return STATUS_FAILED;
}
//////////////////////////////////////////////////////////////////////
@@ -76,41 +76,41 @@ bool CBSurface::isTransparentAt(int x, int y) { }
//////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::displayHalfTrans(int x, int y, RECT rect) {
- return E_FAIL;
+ERRORCODE CBSurface::displayHalfTrans(int x, int y, RECT rect) {
+ return STATUS_FAILED;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::displayTransform(int x, int y, int hotX, int hotY, RECT rect, float zoomX, float zoomY, uint32 alpha, float rotate, TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) {
+ERRORCODE CBSurface::displayTransform(int x, int y, int hotX, int hotY, RECT rect, float zoomX, float zoomY, uint32 alpha, float rotate, TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY) {
return displayTransZoom(x, y, rect, zoomX, zoomY, alpha, blendMode, mirrorX, mirrorY);
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::create(int Width, int Height) {
- return E_FAIL;
+ERRORCODE CBSurface::create(int Width, int Height) {
+ return STATUS_FAILED;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::startPixelOp() {
- return E_FAIL;
+ERRORCODE CBSurface::startPixelOp() {
+ return STATUS_FAILED;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::endPixelOp() {
- return E_FAIL;
+ERRORCODE CBSurface::endPixelOp() {
+ return STATUS_FAILED;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::getPixel(int x, int y, byte *r, byte *g, byte *b, byte *a) {
- return E_FAIL;
+ERRORCODE CBSurface::getPixel(int x, int y, byte *r, byte *g, byte *b, byte *a) {
+ return STATUS_FAILED;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::putPixel(int x, int y, byte r, byte g, byte b, int a) {
- return E_FAIL;
+ERRORCODE CBSurface::putPixel(int x, int y, byte r, byte g, byte b, int a) {
+ return STATUS_FAILED;
}
@@ -127,20 +127,20 @@ bool CBSurface::isTransparentAtLite(int x, int y) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::invalidate() {
- return E_FAIL;
+ERRORCODE CBSurface::invalidate() {
+ return STATUS_FAILED;
}
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::prepareToDraw() {
+ERRORCODE CBSurface::prepareToDraw() {
_lastUsedTime = Game->_liveTimer;
if (!_valid) {
//Game->LOG(0, "Reviving: %s", _filename);
return create(_filename, _cKDefault, _cKRed, _cKGreen, _cKBlue, _lifeTime, _keepLoaded);
- } else return S_OK;
+ } else return STATUS_OK;
}
|