WINTERMUTE: Cleanup and rename functions in PlatformSDL.

4 files changed, 9 insertions, 9 deletions

diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index da64c19fe9..55cb3b876b 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -1925,7 +1925,7 @@ char *CAdGame::findSpeechFile(char *stringID) {
 //////////////////////////////////////////////////////////////////////////

 bool CAdGame::validMouse() {

 	POINT pos;

-	CBPlatform::GetCursorPos(&pos);

+	CBPlatform::getCursorPos(&pos);

 

 	return _renderer->pointInViewport(&pos);

 }

@@ -1953,7 +1953,7 @@ HRESULT CAdGame::onMouseLeftDown() {
 

 	if (_activeObject != NULL) Game->_capturedObject = Game->_activeObject;

 	_mouseLeftDown = true;

-	CBPlatform::SetCapture(_renderer->_window);

+	CBPlatform::setCapture(_renderer->_window);

 

 	return S_OK;

 }

@@ -1962,7 +1962,7 @@ HRESULT CAdGame::onMouseLeftDown() {
 HRESULT CAdGame::onMouseLeftUp() {

 	if (_activeObject) _activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT);

 

-	CBPlatform::ReleaseCapture();

+	CBPlatform::releaseCapture();

 	_capturedObject = NULL;

 	_mouseLeftDown = false;

 

diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp
index 8472ab122e..81a8f7db2b 100644
--- a/engines/wintermute/Ad/AdInventoryBox.cpp
+++ b/engines/wintermute/Ad/AdInventoryBox.cpp
@@ -46,7 +46,7 @@ IMPLEMENT_PERSISTENT(CAdInventoryBox, false)
 

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

 CAdInventoryBox::CAdInventoryBox(CBGame *inGame): CBObject(inGame) {

-	CBPlatform::SetRectEmpty(&_itemsArea);

+	CBPlatform::setRectEmpty(&_itemsArea);

 	_scrollOffset = 0;

 	_spacing = 0;

 	_itemWidth = _itemHeight = 50;

@@ -124,7 +124,7 @@ HRESULT CAdInventoryBox::display() {
 	// display window

 	RECT rect = _itemsArea;

 	if (_window) {

-		CBPlatform::OffsetRect(&rect, _window->_posX, _window->_posY);

+		CBPlatform::offsetRect(&rect, _window->_posX, _window->_posY);

 		_window->display();

 	}

 

diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index eb9912fb14..eea61a4268 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -57,7 +57,7 @@ CAdResponseBox::CAdResponseBox(CBGame *inGame): CBObject(inGame) {
 	_shieldWindow = new CUIWindow(Game);

 

 	_horizontal = false;

-	CBPlatform::SetRectEmpty(&_responseArea);

+	CBPlatform::setRectEmpty(&_responseArea);

 	_scrollOffset = 0;

 	_spacing = 0;

 

@@ -399,7 +399,7 @@ HRESULT CAdResponseBox::saveAsText(CBDynBuffer *buffer, int indent) {
 HRESULT CAdResponseBox::display() {

 	RECT rect = _responseArea;

 	if (_window) {

-		CBPlatform::OffsetRect(&rect, _window->_posX, _window->_posY);

+		CBPlatform::offsetRect(&rect, _window->_posX, _window->_posY);

 		//_window->display();

 	}

 

diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index 2e99b93e88..3f6d724ac4 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -485,14 +485,14 @@ HRESULT CAdScene::initLoop() {
 #ifdef _DEBUGxxxx

 	int nu_steps = 0;

 	uint32 start = Game->_currentTime;

-	while (!_pfReady && CBPlatform::GetTime() - start <= _pfMaxTime) {

+	while (!_pfReady && CBPlatform::getTime() - start <= _pfMaxTime) {

 		PathFinderStep();

 		nu_steps++;

 	}

 	if (nu_steps > 0) Game->LOG(0, "STAT: PathFinder iterations in one loop: %d (%s)  _pfMaxTime=%d", nu_steps, _pfReady ? "finished" : "not yet done", _pfMaxTime);

 #else

 	uint32 start = Game->_currentTime;

-	while (!_pfReady && CBPlatform::GetTime() - start <= _pfMaxTime) pathFinderStep();

+	while (!_pfReady && CBPlatform::getTime() - start <= _pfMaxTime) pathFinderStep();

 #endif

 

 	return S_OK;