aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-08 22:28:31 +0200
committerEinar Johan Trøan Sømåen2012-07-08 22:28:31 +0200
commitf028c3eaef427e076823d0d62636d03c815c2ff7 (patch)
treee80a350f4dc919fd8164fc4ff3b38b86ba5dac97
parent2faa444b31c89de217ebe1b292f238fa9a206f54 (diff)
downloadscummvm-rg350-f028c3eaef427e076823d0d62636d03c815c2ff7.tar.gz
scummvm-rg350-f028c3eaef427e076823d0d62636d03c815c2ff7.tar.bz2
scummvm-rg350-f028c3eaef427e076823d0d62636d03c815c2ff7.zip
WINTERMUTE: Rename VarName->varName in BSurface
-rw-r--r--engines/wintermute/Base/BSurface.cpp8
-rw-r--r--engines/wintermute/Base/BSurface.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/wintermute/Base/BSurface.cpp b/engines/wintermute/Base/BSurface.cpp
index 299218fd4b..8a325a4d7f 100644
--- a/engines/wintermute/Base/BSurface.cpp
+++ b/engines/wintermute/Base/BSurface.cpp
@@ -60,7 +60,7 @@ CBSurface::~CBSurface() {
//////////////////////////////////////////////////////////////////////
-HRESULT CBSurface::create(const char *filename, bool default_ck, byte ck_red, byte ck_green, byte ck_blue, int lifeTime, bool keepLoaded) {
+HRESULT CBSurface::create(const char *filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime, bool keepLoaded) {
return E_FAIL;
}
@@ -155,9 +155,9 @@ void CBSurface::setFilename(const char *filename) {
}
//////////////////////////////////////////////////////////////////////////
-void CBSurface::setSize(int Width, int Height) {
- _width = Width;
- _height = Height;
+void CBSurface::setSize(int width, int height) {
+ _width = width;
+ _height = height;
}
} // end of namespace WinterMute
diff --git a/engines/wintermute/Base/BSurface.h b/engines/wintermute/Base/BSurface.h
index 2bfba077ce..9962b095c3 100644
--- a/engines/wintermute/Base/BSurface.h
+++ b/engines/wintermute/Base/BSurface.h
@@ -61,7 +61,7 @@ public:
virtual HRESULT displayZoom(int x, int y, RECT rect, float ZoomX, float ZoomY, uint32 alpha = 0xFFFFFFFF, bool transparent = false, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) = 0;
virtual HRESULT displayTransform(int x, int y, int hotX, int hotY, RECT rect, float zoomX, float zoomY, uint32 alpha, float rotate, TSpriteBlendMode blendMode = BLEND_NORMAL, bool mirrorX = false, bool mirrorY = false) = 0;
virtual HRESULT restore();
- virtual HRESULT create(const char *filename, bool default_ck, byte ck_red, byte ck_green, byte ck_blue, int LifeTime = -1, bool KeepLoaded = false) = 0;
+ virtual HRESULT create(const char *filename, bool defaultCK, byte ckRed, byte ckGreen, byte ckBlue, int lifeTime = -1, bool keepLoaded = false) = 0;
virtual HRESULT create(int Width, int Height);
virtual HRESULT putSurface(const Graphics::Surface &surface, bool hasAlpha = false) {
return E_FAIL;