WINTERMUTE: Rename FuncName->funcName in BFrame and BActiveRect

5 files changed, 14 insertions, 14 deletions

diff --git a/engines/wintermute/Base/BActiveRect.cpp b/engines/wintermute/Base/BActiveRect.cpp
index 5bb538b72f..46dd6ed51f 100644
--- a/engines/wintermute/Base/BActiveRect.cpp
+++ b/engines/wintermute/Base/BActiveRect.cpp
@@ -43,7 +43,7 @@ CBActiveRect::CBActiveRect(CBGame *inGame): CBBase(inGame) {
 	_zoomX = 100;

 	_zoomY = 100;

 	_offsetX = _offsetY = 0;

-	ClipRect();

+	clipRect();

 }

 

 

@@ -57,7 +57,7 @@ CBActiveRect::CBActiveRect(CBGame *inGame, CBObject *Owner, CBSubFrame *Frame, i
 	_precise = Precise;

 	_region = NULL;

 	_offsetX = _offsetY = 0;

-	ClipRect();

+	clipRect();

 }

 

 //////////////////////////////////////////////////////////////////////

@@ -70,7 +70,7 @@ CBActiveRect::CBActiveRect(CBGame *inGame, CBObject *Owner, CBRegion *Region, in
 	_zoomY = 100;

 	_precise = true;

 	_frame = NULL;

-	ClipRect();

+	clipRect();

 	_offsetX = OffsetX;

 	_offsetY = OffsetY;

 }

@@ -85,7 +85,7 @@ CBActiveRect::~CBActiveRect() {
 

 

 //////////////////////////////////////////////////////////////////////////

-void CBActiveRect::ClipRect() {

+void CBActiveRect::clipRect() {

 	RECT rc;

 	bool CustomViewport;

 	Game->GetCurrentViewportRect(&rc, &CustomViewport);

diff --git a/engines/wintermute/Base/BActiveRect.h b/engines/wintermute/Base/BActiveRect.h
index fe99f76ea1..1577c2d9b2 100644
--- a/engines/wintermute/Base/BActiveRect.h
+++ b/engines/wintermute/Base/BActiveRect.h
@@ -37,7 +37,7 @@ class CBSubFrame;
 class CBObject;

 class CBActiveRect: CBBase {

 public:

-	void ClipRect();

+	void clipRect();

 	bool _precise;

 	float _zoomX;

 	float _zoomY;

diff --git a/engines/wintermute/Base/BFrame.cpp b/engines/wintermute/Base/BFrame.cpp
index b7526d4da9..5dd5627e58 100644
--- a/engines/wintermute/Base/BFrame.cpp
+++ b/engines/wintermute/Base/BFrame.cpp
@@ -76,7 +76,7 @@ CBFrame::~CBFrame() {
 

 

 //////////////////////////////////////////////////////////////////////

-HRESULT CBFrame::Draw(int X, int Y, CBObject *Register, float ZoomX, float ZoomY, bool Precise, uint32 Alpha, bool AllFrames, float Rotate, TSpriteBlendMode BlendMode) {

+HRESULT CBFrame::draw(int X, int Y, CBObject *Register, float ZoomX, float ZoomY, bool Precise, uint32 Alpha, bool AllFrames, float Rotate, TSpriteBlendMode BlendMode) {

 	HRESULT res;

 

 	for (int i = 0; i < _subframes.GetSize(); i++) {

@@ -88,7 +88,7 @@ HRESULT CBFrame::Draw(int X, int Y, CBObject *Register, float ZoomX, float ZoomY
 

 

 //////////////////////////////////////////////////////////////////////////

-HRESULT CBFrame::OneTimeDisplay(CBObject *Owner, bool Muted) {

+HRESULT CBFrame::oneTimeDisplay(CBObject *Owner, bool Muted) {

 	if (_sound && !Muted) {

 		if (Owner) Owner->updateOneSound(_sound);

 		_sound->play();

@@ -326,7 +326,7 @@ HRESULT CBFrame::loadBuffer(byte  *Buffer, int LifeTime, bool KeepLoaded) {
 

 

 //////////////////////////////////////////////////////////////////////////

-bool CBFrame::GetBoundingRect(LPRECT Rect, int X, int Y, float ScaleX, float ScaleY) {

+bool CBFrame::getBoundingRect(LPRECT Rect, int X, int Y, float ScaleX, float ScaleY) {

 	if (!Rect) return false;

 	CBPlatform::SetRectEmpty(Rect);

 

diff --git a/engines/wintermute/Base/BFrame.h b/engines/wintermute/Base/BFrame.h
index a9030b8848..df33303d6d 100644
--- a/engines/wintermute/Base/BFrame.h
+++ b/engines/wintermute/Base/BFrame.h
@@ -42,17 +42,17 @@ class CBFrame: public CBScriptable {
 public:

 	bool _killSound;

 	bool _keyframe;

-	HRESULT OneTimeDisplay(CBObject *Owner, bool Muted = false);

+	HRESULT oneTimeDisplay(CBObject *Owner, bool Muted = false);

 	DECLARE_PERSISTENT(CBFrame, CBScriptable)

 	CBSound *_sound;

 	bool _editorExpanded;

-	bool GetBoundingRect(LPRECT Rect, int X, int Y, float ScaleX = 100, float ScaleY = 100);

+	bool getBoundingRect(LPRECT Rect, int X, int Y, float ScaleX = 100, float ScaleY = 100);

 	HRESULT saveAsText(CBDynBuffer *Buffer, int Indent);

 	int _moveY;

 	int _moveX;

 	uint32 _delay;

 	CBArray<CBSubFrame *, CBSubFrame *> _subframes;

-	HRESULT Draw(int X, int Y, CBObject *Register = NULL, float ZoomX = 100, float ZoomY = 100, bool Precise = true, uint32 Alpha = 0xFFFFFFFF, bool AllFrames = false, float Rotate = 0.0f, TSpriteBlendMode BlendMode = BLEND_NORMAL);

+	HRESULT draw(int X, int Y, CBObject *Register = NULL, float ZoomX = 100, float ZoomY = 100, bool Precise = true, uint32 Alpha = 0xFFFFFFFF, bool AllFrames = false, float Rotate = 0.0f, TSpriteBlendMode BlendMode = BLEND_NORMAL);

 	HRESULT loadBuffer(byte  *Buffer, int LifeTime, bool KeepLoaded);

 

 	CBFrame(CBGame *inGame);

diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp
index e31cb80d7c..8683fbb496 100644
--- a/engines/wintermute/Base/BSprite.cpp
+++ b/engines/wintermute/Base/BSprite.cpp
@@ -392,11 +392,11 @@ HRESULT CBSprite::display(int X, int Y, CBObject *Register, float ZoomX, float Z
 			KillAllSounds();

 		}

 		applyEvent("FrameChanged");

-		_frames[_currentFrame]->OneTimeDisplay(_owner, Game->_editorMode && _editorMuted);

+		_frames[_currentFrame]->oneTimeDisplay(_owner, Game->_editorMode && _editorMuted);

 	}

 

 	// draw frame

-	return _frames[_currentFrame]->Draw(X - Game->_offsetX, Y - Game->_offsetY, Register, ZoomX, ZoomY, _precise, Alpha, _editorAllFrames, Rotate, BlendMode);

+	return _frames[_currentFrame]->draw(X - Game->_offsetX, Y - Game->_offsetY, Register, ZoomX, ZoomY, _precise, Alpha, _editorAllFrames, Rotate, BlendMode);

 }

 

 

@@ -421,7 +421,7 @@ bool CBSprite::GetBoundingRect(LPRECT Rect, int X, int Y, float ScaleX, float Sc
 		RECT frame;

 		RECT temp;

 		CBPlatform::CopyRect(&temp, Rect);

-		_frames[i]->GetBoundingRect(&frame, X, Y, ScaleX, ScaleY);

+		_frames[i]->getBoundingRect(&frame, X, Y, ScaleX, ScaleY);

 		CBPlatform::UnionRect(Rect, &temp, &frame);

 	}

 	return true;