WINTERMUTE: Rename FuncName/VarName -> funcName/varName in BSprite

4 files changed, 9 insertions, 9 deletions

diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp
index 374317993b..d10d4c7c89 100644
--- a/engines/wintermute/UI/UIButton.cpp
+++ b/engines/wintermute/UI/UIButton.cpp
@@ -631,7 +631,7 @@ HRESULT CUIButton::display(int OffsetX, int OffsetY) {
 

 	if (back) back->display(OffsetX + _posX, OffsetY + _posY, _width, _height);

 	//if(image) image->Draw(ImageX +((_press||_oneTimePress)&&back?1:0), ImageY +((_press||_oneTimePress)&&back?1:0), NULL);

-	if (image) image->Draw(ImageX + ((_press || _oneTimePress) && back ? 1 : 0), ImageY + ((_press || _oneTimePress) && back ? 1 : 0), _pixelPerfect ? this : NULL);

+	if (image) image->draw(ImageX + ((_press || _oneTimePress) && back ? 1 : 0), ImageY + ((_press || _oneTimePress) && back ? 1 : 0), _pixelPerfect ? this : NULL);

 

 	if (font && _text) {

 		int text_offset = (_height - font->getTextHeight((byte *)_text, _width)) / 2;

@@ -641,11 +641,11 @@ HRESULT CUIButton::display(int OffsetX, int OffsetY) {
 	if (!_pixelPerfect || !_image) Game->_renderer->_rectList.Add(new CBActiveRect(Game, this, NULL, OffsetX + _posX, OffsetY + _posY, _width, _height, 100, 100, false));

 

 	// reset unused sprites

-	if (_image && _image != image) _image->Reset();

-	if (_imageDisable && _imageDisable != image) _imageDisable->Reset();

-	if (_imageFocus && _imageFocus != image) _imageFocus->Reset();

-	if (_imagePress && _imagePress != image) _imagePress->Reset();

-	if (_imageHover && _imageHover != image) _imageHover->Reset();

+	if (_image && _image != image) _image->reset();

+	if (_imageDisable && _imageDisable != image) _imageDisable->reset();

+	if (_imageFocus && _imageFocus != image) _imageFocus->reset();

+	if (_imagePress && _imagePress != image) _imagePress->reset();

+	if (_imageHover && _imageHover != image) _imageHover->reset();

 

 	_press = _hover && Game->_mouseLeftDown && Game->_capturedObject == this;

 

diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp
index 8594deb05c..5403081df0 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -552,7 +552,7 @@ HRESULT CUIEdit::display(int OffsetX, int OffsetY) {
 	Game->_textEncoding = TEXT_ANSI;

 

 	if (_back) _back->display(OffsetX + _posX, OffsetY + _posY, _width, _height);

-	if (_image) _image->Draw(OffsetX + _posX, OffsetY + _posY, NULL);

+	if (_image) _image->draw(OffsetX + _posX, OffsetY + _posY, NULL);

 

 	// prepare fonts

 	CBFont *font;

diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp
index f8e35c5ada..c52af0cf43 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -70,7 +70,7 @@ HRESULT CUIText::display(int OffsetX, int OffsetY) {
 	if (!font) font = Game->_systemFont;

 

 	if (_back) _back->display(OffsetX + _posX, OffsetY + _posY, _width, _height);

-	if (_image) _image->Draw(OffsetX + _posX, OffsetY + _posY, NULL);

+	if (_image) _image->draw(OffsetX + _posX, OffsetY + _posY, NULL);

 

 	if (font && _text) {

 		int text_offset;

diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp
index b244d13490..44d2bc5743 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -179,7 +179,7 @@ HRESULT CUIWindow::display(int OffsetX, int OffsetY) {
 

 	if (_alphaColor != 0) Game->_renderer->_forceAlphaColor = _alphaColor;

 	if (back) back->display(_posX + OffsetX, _posY + OffsetY, _width, _height);

-	if (image) image->Draw(_posX + OffsetX, _posY + OffsetY, _transparent ? NULL : this);

+	if (image) image->draw(_posX + OffsetX, _posY + OffsetY, _transparent ? NULL : this);

 

 	if (!CBPlatform::IsRectEmpty(&_titleRect) && font && _text) {

 		font->drawText((byte *)_text, _posX + OffsetX + _titleRect.left, _posY + OffsetY + _titleRect.top, _titleRect.right - _titleRect.left, _titleAlign, _titleRect.bottom - _titleRect.top);