WINTERMUTE: Remove unused code from platform_osystem.h

20 files changed, 63 insertions, 165 deletions

diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 42a453d533..977115ad76 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -59,6 +59,7 @@
 #include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/video/video_player.h"

 #include "engines/wintermute/video/video_theora_player.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 38fbd6f95d..a800ae71b2 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -398,7 +398,7 @@ bool AdResponseBox::saveAsText(BaseDynamicBuffer *buffer, int indent) {
 bool AdResponseBox::display() {

 	Rect32 rect = _responseArea;

 	if (_window) {

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

+		rect.offsetRect(_window->_posX, _window->_posY);

 		//_window->display();

 	}

 

diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index e76e61af79..a802039550 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -52,7 +52,6 @@
 #include "engines/wintermute/base/base_scriptable.h"

 #include "engines/wintermute/base/base_sprite.h"

 #include "engines/wintermute/base/base_viewport.h"

-#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/script_stack.h"

 #include "engines/wintermute/base/scriptables/script_value.h"

 #include "engines/wintermute/base/scriptables/script.h"

@@ -485,14 +484,14 @@ bool AdScene::initLoop() {
 #ifdef _DEBUGxxxx

 	int nu_steps = 0;

 	uint32 start = _gameRef->_currentTime;

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

+	while (!_pfReady && g_system->getMillis() - start <= _pfMaxTime) {

 		PathFinderStep();

 		nu_steps++;

 	}

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

 #else

 	uint32 start = _gameRef->_currentTime;

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

+	while (!_pfReady && g_system->getMillis() - start <= _pfMaxTime) pathFinderStep();

 #endif

 

 	return STATUS_OK;

diff --git a/engines/wintermute/base/base_active_rect.cpp b/engines/wintermute/base/base_active_rect.cpp
index 493b35bf12..598324e10b 100644
--- a/engines/wintermute/base/base_active_rect.cpp
+++ b/engines/wintermute/base/base_active_rect.cpp
@@ -65,7 +65,7 @@ BaseActiveRect::BaseActiveRect(BaseGame *inGame, BaseObject *owner, BaseRegion *
 	_owner = owner;

 	_region = region;

 	BasePlatform::copyRect(&_rect, &region->_rect);

-	BasePlatform::offsetRect(&_rect, -offsetX, -offsetY);

+	_rect.offsetRect(-offsetX, -offsetY);

 	_zoomX = 100;

 	_zoomY = 100;

 	_precise = true;

diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp
index 4dcdf82347..c5f170bb43 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -29,7 +29,6 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/base/base_fader.h"

 #include "engines/wintermute/base/base_game.h"

-#include "engines/wintermute/platform_osystem.h"

 #include "common/util.h"

 

 namespace WinterMute {

@@ -67,7 +66,7 @@ bool BaseFader::update() {
 

 	uint32 time;

 

-	if (_system) time = BasePlatform::getTime() - _startTime;

+	if (_system) time = g_system->getMillis() - _startTime;

 	else time = _gameRef->_timer - _startTime;

 

 	if (time >= _duration) _currentAlpha = _targetAlpha;

@@ -115,7 +114,7 @@ bool BaseFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) {
 	_duration = duration;

 	_system = system;

 

-	if (_system) _startTime = BasePlatform::getTime();

+	if (_system) _startTime = g_system->getMillis();

 	else _startTime = _gameRef->_timer;

 

 	return STATUS_OK;

@@ -138,7 +137,7 @@ bool BaseFader::fadeOut(uint32 targetColor, uint32 duration, bool system) {
 	_duration = duration;

 	_system = system;

 

-	if (_system) _startTime = BasePlatform::getTime();

+	if (_system) _startTime = g_system->getMillis();

 	else _startTime = _gameRef->_timer;

 

 

diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 57f59a144c..1eb27ad0c4 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -372,9 +372,11 @@ bool BaseFileManager::registerPackage(Common::SeekableReadStream *package, const
 			// some old version of ProjectMan writes invalid directory entries

 			// so at least prevent strupr from corrupting memory

 			name[nameLength - 1] = '\0';

-

-

-			BasePlatform::strupr(name);

+			

+			Common::String upcName = name;

+			upcName.toUppercase();

+			delete[] name;

+			name = NULL;

 

 			offset = package->readUint32LE();

 			offset += absoluteOffset;

@@ -386,7 +388,7 @@ bool BaseFileManager::registerPackage(Common::SeekableReadStream *package, const
 				timeDate1 = package->readUint32LE();

 				timeDate2 = package->readUint32LE();

 			}

-			_filesIter = _files.find(name);

+			_filesIter = _files.find(upcName.c_str());

 			if (_filesIter == _files.end()) {

 				BaseFileEntry *file = new BaseFileEntry();

 				file->_package = pkg;

@@ -395,7 +397,7 @@ bool BaseFileManager::registerPackage(Common::SeekableReadStream *package, const
 				file->_compressedLength = compLength;

 				file->_flags = flags;

 

-				_files[name] = file;

+				_files[upcName.c_str()] = file;

 			} else {

 				// current package has lower CD number or higher priority, than the registered

 				if (pkg->_cd < _filesIter->_value->_package->_cd || pkg->_priority > _filesIter->_value->_package->_priority) {

@@ -406,7 +408,6 @@ bool BaseFileManager::registerPackage(Common::SeekableReadStream *package, const
 					_filesIter->_value->_flags = flags;

 				}

 			}

-			delete [] name;

 		}

 	}

 

@@ -441,16 +442,13 @@ Common::File *BaseFileManager::openPackage(const Common::String &name) {
 

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

 BaseFileEntry *BaseFileManager::getPackageEntry(const Common::String &filename) {

-	char *upc_name = new char[strlen(filename.c_str()) + 1];

-	strcpy(upc_name, filename.c_str());

-	BasePlatform::strupr(upc_name);

+	Common::String upc_name = filename;

+	upc_name.toUppercase();

 

 	BaseFileEntry *ret = NULL;

-	_filesIter = _files.find(upc_name);

+	_filesIter = _files.find(upc_name.c_str());

 	if (_filesIter != _files.end()) ret = _filesIter->_value;

 

-	delete [] upc_name;

-

 	return ret;

 }

 

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index d3da177a92..e72deb4be2 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -62,6 +62,7 @@
 #include "engines/wintermute/video/video_theora_player.h"

 #include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/wintermute.h"

+#include "engines/wintermute/platform_osystem.h"

 #include "common/savefile.h"

 #include "common/textconsole.h"

 #include "common/util.h"

@@ -589,7 +590,7 @@ void BaseGame::setEngineLogCallback(ENGINE_LOG_CALLBACK callback, void *data) {
 bool BaseGame::initLoop() {

 	_viewportSP = -1;

 

-	_currentTime = BasePlatform::getTime();

+	_currentTime = g_system->getMillis();

 

 	getDebugMgr()->onGameTick();

 	_renderer->initLoop();

@@ -2183,7 +2184,7 @@ ScValue *BaseGame::scGetProperty(const char *name) {
 	// WindowsTime (RO)

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

 	else if (strcmp(name, "WindowsTime") == 0) {

-		_scValue->setInt((int)BasePlatform::getTime());

+		_scValue->setInt((int)g_system->getMillis());

 		return _scValue;

 	}

 

@@ -4405,9 +4406,9 @@ void BaseGame::getMousePos(Point32 *pos) {
 bool BaseGame::miniUpdate() {

 	if (!_miniUpdateEnabled) return STATUS_OK;

 

-	if (BasePlatform::getTime() - _lastMiniUpdate > 200) {

+	if (g_system->getMillis() - _lastMiniUpdate > 200) {

 		if (_soundMgr) _soundMgr->initLoop();

-		_lastMiniUpdate = BasePlatform::getTime();

+		_lastMiniUpdate = g_system->getMillis();

 	}

 	return STATUS_OK;

 }

@@ -4440,8 +4441,8 @@ bool BaseGame::isDoubleClick(int buttonIndex) {
 	int moveY = abs(pos.y - _lastClick[buttonIndex].posY);

 

 

-	if (_lastClick[buttonIndex].time == 0 || BasePlatform::getTime() - _lastClick[buttonIndex].time > maxDoubleCLickTime || moveX > maxMoveX || moveY > maxMoveY) {

-		_lastClick[buttonIndex].time = BasePlatform::getTime();

+	if (_lastClick[buttonIndex].time == 0 || g_system->getMillis() - _lastClick[buttonIndex].time > maxDoubleCLickTime || moveX > maxMoveX || moveY > maxMoveY) {

+		_lastClick[buttonIndex].time = g_system->getMillis();

 		_lastClick[buttonIndex].posX = pos.x;

 		_lastClick[buttonIndex].posY = pos.y;

 		return false;

diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp
index 05b7d21dfe..d30d38ef70 100644
--- a/engines/wintermute/base/base_sub_frame.cpp
+++ b/engines/wintermute/base/base_sub_frame.cpp
@@ -262,7 +262,7 @@ bool BaseSubFrame::saveAsText(BaseDynamicBuffer *buffer, int indent, bool comple
 	Rect32 rect;

 	BasePlatform::setRectEmpty(&rect);

 	if (_surface) BasePlatform::setRect(&rect, 0, 0, _surface->getWidth(), _surface->getHeight());

-	if (!BasePlatform::equalRect(&rect, &_rect))

+	if (!(rect == _rect))

 		buffer->putTextIndent(indent + 2, "RECT { %d,%d,%d,%d }\n", _rect.left, _rect.top, _rect.right, _rect.bottom);

 

 	if (_hotspotX != 0 || _hotspotY != 0)

diff --git a/engines/wintermute/base/base_transition_manager.cpp b/engines/wintermute/base/base_transition_manager.cpp
index b524636af7..e4665756e2 100644
--- a/engines/wintermute/base/base_transition_manager.cpp
+++ b/engines/wintermute/base/base_transition_manager.cpp
@@ -29,7 +29,6 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/base/base_transition_manager.h"

 #include "engines/wintermute/base/base_game.h"

-#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

@@ -88,7 +87,7 @@ bool BaseTransitionMgr::update() {
 

 	if (!_started) {

 		_started = true;

-		_lastTime = BasePlatform::getTime();

+		_lastTime = g_system->getMillis();

 	}

 

 	switch (_type) {

@@ -97,7 +96,7 @@ bool BaseTransitionMgr::update() {
 		break;

 

 	case TRANSITION_FADE_OUT: {

-		uint32 time = BasePlatform::getTime() - _lastTime;

+		uint32 time = g_system->getMillis() - _lastTime;

 		int alpha = (int)(255 - (float)time / (float)FADE_DURATION * 255);

 		alpha = MIN(255, MAX(alpha, 0));

 		_gameRef->_renderer->fade((uint16)alpha);

@@ -108,7 +107,7 @@ bool BaseTransitionMgr::update() {
 	break;

 

 	case TRANSITION_FADE_IN: {

-		uint32 time = BasePlatform::getTime() - _lastTime;

+		uint32 time = g_system->getMillis() - _lastTime;

 		int alpha = (int)((float)time / (float)FADE_DURATION * 255);

 		alpha = MIN(255, MAX(alpha, 0));

 		_gameRef->_renderer->fade((uint16)alpha);

diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 9782d1d7db..88eec8469f 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -641,13 +641,15 @@ bool BaseFontTT::initFont() {
 

 	Common::SeekableReadStream *file = _gameRef->_fileManager->openFile(_fontFile);

 	if (!file) {

+		//TODO: Try to fallback from Arial to FreeSans

+		/*

 		// the requested font file is not in wme file space; try loading a system font

 		AnsiString fontFileName = PathUtil::combine(BasePlatform::getSystemFontPath(), PathUtil::getFileName(_fontFile));

 		file = _gameRef->_fileManager->openFile(fontFileName.c_str(), false);

 		if (!file) {

 			_gameRef->LOG(0, "Error loading TrueType font '%s'", _fontFile);

 			//return STATUS_FAILED;

-		}

+		}*/

 	}

 

 	if (file) {

diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 45544831e3..11fe6ff0cc 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -1148,7 +1148,7 @@ bool ScScript::sleep(uint32 duration) {
 

 	_state = SCRIPT_SLEEPING;

 	if (_gameRef->_state == GAME_FROZEN) {

-		_waitTime = BasePlatform::getTime() + duration;

+		_waitTime = g_system->getMillis() + duration;

 		_waitFrozen = true;

 	} else {

 		_waitTime = _gameRef->_timer + duration;

diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index e8544d8cd6..472e9d9fec 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -176,7 +176,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig
 	if (!ignoreCache) {

 		for (int i = 0; i < MAX_CACHED_SCRIPTS; i++) {

 			if (_cachedScripts[i] && scumm_stricmp(_cachedScripts[i]->_filename.c_str(), filename) == 0) {

-				_cachedScripts[i]->_timestamp = BasePlatform::getTime();

+				_cachedScripts[i]->_timestamp = g_system->getMillis();

 				*outSize = _cachedScripts[i]->_size;

 				return _cachedScripts[i]->_buffer;

 			}

@@ -216,7 +216,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig
 	CScCachedScript *cachedScript = new CScCachedScript(filename, compBuffer, compSize);

 	if (cachedScript) {

 		int index = 0;

-		uint32 MinTime = BasePlatform::getTime();

+		uint32 MinTime = g_system->getMillis();

 		for (int i = 0; i < MAX_CACHED_SCRIPTS; i++) {

 			if (_cachedScripts[i] == NULL) {

 				index = i;

@@ -275,7 +275,7 @@ bool ScEngine::tick() {
 

 		case SCRIPT_SLEEPING: {

 			if (_scripts[i]->_waitFrozen) {

-				if (_scripts[i]->_waitTime <= BasePlatform::getTime()) _scripts[i]->run();

+				if (_scripts[i]->_waitTime <= g_system->getMillis()) _scripts[i]->run();

 			} else {

 				if (_scripts[i]->_waitTime <= _gameRef->_timer) _scripts[i]->run();

 			}

@@ -314,25 +314,25 @@ bool ScEngine::tick() {
 

 		// time sliced script

 		if (_scripts[i]->_timeSlice > 0) {

-			uint32 StartTime = BasePlatform::getTime();

-			while (_scripts[i]->_state == SCRIPT_RUNNING && BasePlatform::getTime() - StartTime < _scripts[i]->_timeSlice) {

+			uint32 StartTime = g_system->getMillis();

+			while (_scripts[i]->_state == SCRIPT_RUNNING && g_system->getMillis() - StartTime < _scripts[i]->_timeSlice) {

 				_currentScript = _scripts[i];

 				_scripts[i]->executeInstruction();

 			}

-			if (_isProfiling && _scripts[i]->_filename) addScriptTime(_scripts[i]->_filename, BasePlatform::getTime() - StartTime);

+			if (_isProfiling && _scripts[i]->_filename) addScriptTime(_scripts[i]->_filename, g_system->getMillis() - StartTime);

 		}

 

 		// normal script

 		else {

 			uint32 startTime = 0;

 			bool isProfiling = _isProfiling;

-			if (isProfiling) startTime = BasePlatform::getTime();

+			if (isProfiling) startTime = g_system->getMillis();

 

 			while (_scripts[i]->_state == SCRIPT_RUNNING) {

 				_currentScript = _scripts[i];

 				_scripts[i]->executeInstruction();

 			}

-			if (isProfiling && _scripts[i]->_filename) addScriptTime(_scripts[i]->_filename, BasePlatform::getTime() - startTime);

+			if (isProfiling && _scripts[i]->_filename) addScriptTime(_scripts[i]->_filename, g_system->getMillis() - startTime);

 		}

 		_currentScript = NULL;

 	}

@@ -670,7 +670,7 @@ void ScEngine::enableProfiling() {
 	// destroy old data, if any

 	_scriptTimes.clear();

 

-	_profilingStartTime = BasePlatform::getTime();

+	_profilingStartTime = g_system->getMillis();

 	_isProfiling = true;

 }

 

@@ -687,7 +687,7 @@ void ScEngine::disableProfiling() {
 //////////////////////////////////////////////////////////////////////////

 void ScEngine::dumpStats() {

 	error("DumpStats not ported to ScummVM yet");

-	/*  uint32 totalTime = BasePlatform::getTime() - _profilingStartTime;

+	/*  uint32 totalTime = g_system->getMillis() - _profilingStartTime;

 

 	    typedef std::vector <std::pair<uint32, std::string> > TimeVector;

 	    TimeVector times;

diff --git a/engines/wintermute/base/scriptables/script_engine.h b/engines/wintermute/base/scriptables/script_engine.h
index 6d2ed92e4f..3d85192aa6 100644
--- a/engines/wintermute/base/scriptables/script_engine.h
+++ b/engines/wintermute/base/scriptables/script_engine.h
@@ -33,7 +33,6 @@
 #include "engines/wintermute/coll_templ.h"

 #include "engines/wintermute/base/base.h"

 #include "engines/wintermute/wme_debugger.h"

-#include "engines/wintermute/platform_osystem.h"

 

 namespace WinterMute {

 

@@ -47,7 +46,7 @@ public:
 	class CScCachedScript {

 	public:

 		CScCachedScript(const char *filename, byte *buffer, uint32 size) {

-			_timestamp = BasePlatform::getTime();

+			_timestamp = g_system->getMillis();

 			_buffer = new byte[size];

 			if (_buffer) memcpy(_buffer, buffer, size);

 			_size = size;

diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp
index ffa362a938..383b956555 100644
--- a/engines/wintermute/base/scriptables/script_ext_file.cpp
+++ b/engines/wintermute/base/scriptables/script_ext_file.cpp
@@ -182,7 +182,9 @@ bool SXFile::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 	else if (strcmp(name, "Delete") == 0) {

 		stack->correctParams(0);

 		close();

-		stack->pushBool(BasePlatform::deleteFile(_filename) != false);

+		error("SXFile-Method: \"Delete\" not supported");

+		//stack->pushBool(BasePlatform::deleteFile(_filename) != false);

+		stack->pushBool(false);

 		return STATUS_OK;

 	}

 

@@ -191,11 +193,13 @@ bool SXFile::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "Copy") == 0) {

 		stack->correctParams(2);

-		const char *Dest = stack->pop()->getString();

-		bool Overwrite = stack->pop()->getBool(true);

+		const char *dest = stack->pop()->getString();

+		bool overwrite = stack->pop()->getBool(true);

 

 		close();

-		stack->pushBool(BasePlatform::copyFile(_filename, Dest, !Overwrite) != false);

+		error("SXFile-Method: Copy not supported");

+		//stack->pushBool(BasePlatform::copyFile(_filename, Dest, !Overwrite) != false);

+		stack->pushBool(false);

 		return STATUS_OK;

 	}

 

diff --git a/engines/wintermute/platform_osystem.cpp b/engines/wintermute/platform_osystem.cpp
index 028a85ada1..a76cc100ce 100644
--- a/engines/wintermute/platform_osystem.cpp
+++ b/engines/wintermute/platform_osystem.cpp
@@ -26,14 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma

  */

 

-#include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/base/base_game.h"

 #include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"

-#include "engines/wintermute/utils/path_util.h"

 #include "engines/wintermute/platform_osystem.h"

-#include "engines/wintermute/base/base_registry.h"

-#include "engines/wintermute/base/sound/base_sound_manager.h"

-#include "engines/wintermute/base/scriptables/script_engine.h"

 #include "common/str.h"

 #include "common/textconsole.h"

 #include "common/system.h"

@@ -150,18 +145,6 @@ void BasePlatform::handleEvent(Common::Event *event) {
 	}

 }

 

-//////////////////////////////////////////////////////////////////////////

-int BasePlatform::SDLEventWatcher(void *userdata, Common::Event *event) {

-	//TODO

-	/*  if (event->type == SDL_WINDOWEVENT && event->window.event == SDL_WINDOWEVENT_MINIMIZED) {

-	        if (_gameRef) _gameRef->AutoSaveOnExit();

-	        if (_gameRef) _gameRef->OnActivate(false, false);

-	        SDL_ShowCursor(SDL_ENABLE);

-	    }

-	*/

-	return 1;

-}

-

 

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

 // Win32 API bindings

@@ -176,11 +159,6 @@ void BasePlatform::outputDebugString(const char *lpOutputString) {
 

 

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

-uint32 BasePlatform::getTime() {

-	return g_system->getMillis();

-}

-

-//////////////////////////////////////////////////////////////////////////

 bool BasePlatform::getCursorPos(Point32 *lpPoint) {

 	BaseRenderOSystem *renderer = static_cast<BaseRenderOSystem *>(_gameRef->_renderer);

 

@@ -212,24 +190,6 @@ bool BasePlatform::showWindow(int nCmdShow) {
 }

 

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

-bool BasePlatform::deleteFile(const char *lpFileName) {

-	return remove(lpFileName) ? true : false;

-}

-

-//////////////////////////////////////////////////////////////////////////

-bool BasePlatform::copyFile(const char *from, const char *to, bool failIfExists) {

-//	try {

-	warning("BasePlatform::copyFile(%s, %s, %d) - not implemented", from, to, failIfExists);

-	return false;

-//		if (failIfExists && boost::filesystem::exists(to)) return false;

-//		boost::filesystem::copy_file(from, to);

-//		return true;

-//	} catch (...) {

-//		return false;

-//	}

-}

-

-//////////////////////////////////////////////////////////////////////////

 void BasePlatform::setCapture() {

 	return;

 }

@@ -240,11 +200,6 @@ bool BasePlatform::releaseCapture() {
 }

 

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

-bool BasePlatform::setForegroundWindow() {

-	return false;

-}

-

-//////////////////////////////////////////////////////////////////////////

 bool BasePlatform::setRectEmpty(Rect32 *lprc) {

 	lprc->left = lprc->right = lprc->top = lprc->bottom = 0;

 	return true;

@@ -318,39 +273,6 @@ bool BasePlatform::copyRect(Rect32 *lprcDst, Rect32 *lprcSrc) {
 }

 

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

-bool BasePlatform::offsetRect(Rect32 *lprc, int dx, int dy) {

-	if (lprc == NULL) return false;

-

-	lprc->left   += dx;

-	lprc->top    += dy;

-	lprc->right  += dx;

-	lprc->bottom += dy;

-

-	return true;

-}

-

-//////////////////////////////////////////////////////////////////////////

-bool BasePlatform::equalRect(Rect32 *rect1, Rect32 *rect2) {

-	return rect1->left == rect2->left && rect1->right == rect2->right && rect1->top == rect2->top && rect1->bottom == rect2->bottom;

-}

-

-

-//////////////////////////////////////////////////////////////////////////

-AnsiString BasePlatform::getSystemFontPath() {

-/*#ifdef __WIN32__

-	// we're looking for something like "c:\windows\fonts\";

-	char winDir[MAX_PATH_LENGTH + 1];

-	winDir[MAX_PATH_LENGTH] = '\0';

-	::GetWindowsDirectory(winDir, MAX_PATH_LENGTH);

-	return PathUtil::Combine(AnsiString(winDir), "fonts");

-#else*/

-	// !PORTME

-	//return "/Library/Fonts/";

-	return "";

-//#endif

-}

-

-//////////////////////////////////////////////////////////////////////////

 AnsiString BasePlatform::getPlatformName() {

 	// TODO: Should conform to the WME-spec.

 	//return AnsiString(SDL_GetPlatform());

@@ -358,16 +280,6 @@ AnsiString BasePlatform::getPlatformName() {
 }

 

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

-char *BasePlatform::strupr(char *string) {

-	if (string) {

-		for (size_t i = 0; i < strlen(string); ++i) {

-			string[i] = toupper(string[i]);

-		}

-	}

-	return string;

-}

-

-//////////////////////////////////////////////////////////////////////////

 char *BasePlatform::strlwr(char *string) {

 	if (string) {

 		for (size_t i = 0; i < strlen(string); ++i) {

diff --git a/engines/wintermute/platform_osystem.h b/engines/wintermute/platform_osystem.h
index 601f47b29d..77a690c207 100644
--- a/engines/wintermute/platform_osystem.h
+++ b/engines/wintermute/platform_osystem.h
@@ -31,7 +31,6 @@
 

 #include "engines/wintermute/dctypes.h"

 #include "engines/wintermute/math/rect32.h"

-#include "engines/wintermute/wintypes.h"

 #include "common/events.h"

 

 namespace WinterMute {

@@ -43,21 +42,17 @@ class BasePlatform {
 public:

 	static int initialize(BaseGame *inGame, int argc, char *argv[]);

 	static void handleEvent(Common::Event *event);

-

-	static AnsiString getSystemFontPath();

 	static AnsiString getPlatformName();

 

 	// Win32 API bindings

 	static void outputDebugString(const char *lpOutputString);

-	static uint32 getTime();

+	//static uint32 getTime();

 	static bool getCursorPos(Point32 *lpPoint);

 	static bool setCursorPos(int X, int Y);

 	static bool showWindow(int nCmdShow);

-	static bool deleteFile(const char *lpFileName);

-	static bool copyFile(const char *from, const char *to, bool failIfExists);

+

 	static void setCapture();

 	static bool releaseCapture();

-	static bool setForegroundWindow();

 

 	static bool setRectEmpty(Rect32 *lprc);

 	static bool isRectEmpty(const Rect32 *lprc);

@@ -66,19 +61,10 @@ public:
 	static bool intersectRect(Rect32 *lprcDst, const Rect32 *lprcSrc1, const Rect32 *lprcSrc2);

 	static bool unionRect(Rect32 *lprcDst, Rect32 *lprcSrc1, Rect32 *lprcSrc2);

 	static bool copyRect(Rect32 *lprcDst, Rect32 *lprcSrc);

-	static bool offsetRect(Rect32 *lprc, int dx, int dy);

-	static bool equalRect(Rect32 *rect1, Rect32 *rect2);

-

 

 	// string functions

-//	static int stricmp(const char *str1, const char *str2);

-//	static int strnicmp(const char *str1, const char *str2, size_t maxCount);

-	static char *strupr(char *string);

 	static char *strlwr(char *string);

 

-	// sdl event callback

-	static int SDLEventWatcher(void *userdata, Common::Event *event);

-

 private:

 	static BaseGame *_gameRef;

 };

diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 21a60ef922..235a73e8a6 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -38,7 +38,6 @@
 #include "engines/wintermute/base/base_string_table.h"

 #include "engines/wintermute/base/base_sprite.h"

 #include "engines/wintermute/base/base_file_manager.h"

-#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/script_value.h"

 #include "engines/wintermute/base/scriptables/script.h"

 #include "engines/wintermute/base/scriptables/script_stack.h"

@@ -590,7 +589,7 @@ bool UIButton::display(int offsetX, int offsetY) {
 	_hover = (!_disable && _gameRef->_activeObject == this && (_gameRef->_interactive || _gameRef->_state == GAME_SEMI_FROZEN));

 

 	if ((_press && _hover && !_gameRef->_mouseLeftDown) ||

-	        (_oneTimePress && BasePlatform::getTime() - _oneTimePressTime >= 100)) press();

+	        (_oneTimePress && g_system->getMillis() - _oneTimePressTime >= 100)) press();

 

 

 	if (_disable) {

@@ -907,7 +906,7 @@ bool UIButton::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
 

 		if (_visible && !_disable) {

 			_oneTimePress = true;

-			_oneTimePressTime = BasePlatform::getTime();

+			_oneTimePressTime = g_system->getMillis();

 		}

 		stack->pushNULL();

 

diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp
index df3bd85bb8..3d847408b5 100644
--- a/engines/wintermute/ui/ui_edit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -40,7 +40,6 @@
 #include "engines/wintermute/base/base_sprite.h"

 #include "engines/wintermute/base/base_string_table.h"

 #include "engines/wintermute/base/base_game.h"

-#include "engines/wintermute/platform_osystem.h"

 #include "engines/wintermute/base/scriptables/script_value.h"

 #include "engines/wintermute/base/scriptables/script_stack.h"

 #include "engines/wintermute/base/scriptables/script.h"

@@ -629,8 +628,8 @@ bool UIEdit::display(int offsetX, int offsetY) {
 		// cursor

 		if (focused && curFirst) {

 			if (Count) {

-				if (BasePlatform::getTime() - _lastBlinkTime >= _cursorBlinkRate) {

-					_lastBlinkTime = BasePlatform::getTime();

+				if (g_system->getMillis() - _lastBlinkTime >= _cursorBlinkRate) {

+					_lastBlinkTime = g_system->getMillis();

 					_cursorVisible = !_cursorVisible;

 				}

 				if (_cursorVisible)

@@ -652,8 +651,8 @@ bool UIEdit::display(int offsetX, int offsetY) {
 		// cursor

 		if (focused && !curFirst) {

 			if (Count) {

-				if (BasePlatform::getTime() - _lastBlinkTime >= _cursorBlinkRate) {

-					_lastBlinkTime = BasePlatform::getTime();

+				if (g_system->getMillis() - _lastBlinkTime >= _cursorBlinkRate) {

+					_lastBlinkTime = g_system->getMillis();

 					_cursorVisible = !_cursorVisible;

 				}

 				if (_cursorVisible)

diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 1f7dc0bee9..2c3d7b78ea 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -1137,7 +1137,7 @@ bool UIWindow::handleMouse(TMouseEvent event, TMouseButton button) {
 			Rect32 dragRect = _dragRect;

 			int offsetX, offsetY;

 			getTotalOffset(&offsetX, &offsetY);

-			BasePlatform::offsetRect(&dragRect, _posX + offsetX, _posY + offsetY);

+			dragRect.offsetRect(_posX + offsetX, _posY + offsetY);

 

 			if (BasePlatform::ptInRect(&dragRect, _gameRef->_mousePos)) {

 				_dragFrom.x = _gameRef->_mousePos.x;

diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 520889fd11..5695e5e8df 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -247,7 +247,7 @@ int WinterMuteEngine::init() {
 	
 	
 	// load game
-	uint32 DataInitStart = BasePlatform::getTime();
+	uint32 DataInitStart = g_system->getMillis();
 	
 	if (DID_FAIL(_game->loadFile(_game->_settingsGameFile ? _game->_settingsGameFile : "default.game"))) {
 		_game->LOG(ret, "Error loading game file. Exiting.");
@@ -259,7 +259,7 @@ int WinterMuteEngine::init() {
 	_game->_renderer->_ready = true;
 	_game->_miniUpdateEnabled = true;
 	
-	_game->LOG(0, "Engine initialized in %d ms", BasePlatform::getTime() - DataInitStart);
+	_game->LOG(0, "Engine initialized in %d ms", g_system->getMillis() - DataInitStart);
 	_game->LOG(0, "");
 	
 	if (ConfMan.hasKey("save_slot")) {