[Scummvm-git-logs] scummvm master -> 2a92857e910568537d47f37ba6402786a33745d7

aquadran noreply at scummvm.org
Mon Sep 8 08:15:13 UTC 2025 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
2a92857e91 WINTERMUTE: Fix code style for names


Commit: 2a92857e910568537d47f37ba6402786a33745d7
    https://github.com/scummvm/scummvm/commit/2a92857e910568537d47f37ba6402786a33745d7
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-08T10:15:07+02:00

Commit Message:
WINTERMUTE: Fix code style for names

Changed paths:
    engines/wintermute/ad/ad_actor.cpp
    engines/wintermute/ad/ad_game.cpp
    engines/wintermute/ad/ad_game.h
    engines/wintermute/ad/ad_inventory_box.cpp
    engines/wintermute/ad/ad_item.cpp
    engines/wintermute/ad/ad_layer.cpp
    engines/wintermute/ad/ad_region.cpp
    engines/wintermute/ad/ad_scene.cpp
    engines/wintermute/ad/ad_scene.h
    engines/wintermute/ad/ad_talk_def.h
    engines/wintermute/ad/ad_talk_holder.cpp
    engines/wintermute/base/base.h
    engines/wintermute/base/base_frame.cpp
    engines/wintermute/base/base_game.cpp
    engines/wintermute/base/base_game.h
    engines/wintermute/base/base_parser.cpp
    engines/wintermute/base/base_region.cpp
    engines/wintermute/base/base_script_holder.cpp
    engines/wintermute/base/base_sprite.cpp
    engines/wintermute/base/base_sprite.h
    engines/wintermute/base/base_surface_storage.cpp
    engines/wintermute/base/base_surface_storage.h
    engines/wintermute/base/font/base_font.cpp
    engines/wintermute/base/particles/part_force.h
    engines/wintermute/base/particles/part_particle.h
    engines/wintermute/base/scriptables/script.cpp
    engines/wintermute/base/scriptables/script.h
    engines/wintermute/base/scriptables/script_engine.cpp
    engines/wintermute/base/scriptables/script_engine.h
    engines/wintermute/base/scriptables/script_ext_date.h
    engines/wintermute/base/scriptables/script_ext_file.h
    engines/wintermute/base/scriptables/script_ext_object.h
    engines/wintermute/base/scriptables/script_ext_string.h
    engines/wintermute/base/scriptables/script_stack.cpp
    engines/wintermute/base/scriptables/script_value.cpp
    engines/wintermute/base/scriptables/script_value.h
    engines/wintermute/coll_templ.h
    engines/wintermute/ext/dll_httpconnect.cpp
    engines/wintermute/persistent.h
    engines/wintermute/system/sys_class.cpp
    engines/wintermute/system/sys_class.h
    engines/wintermute/system/sys_class_registry.cpp
    engines/wintermute/system/sys_class_registry.h
    engines/wintermute/system/sys_instance.cpp
    engines/wintermute/system/sys_instance.h
    engines/wintermute/ui/ui_button.cpp
    engines/wintermute/ui/ui_edit.cpp
    engines/wintermute/ui/ui_tiled_image.cpp
    engines/wintermute/ui/ui_window.cpp
    engines/wintermute/ui/ui_window.h


diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index f126925c611..3fc36ae79bd 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -131,7 +131,7 @@ AdActor::~AdActor() {
 bool AdActor::loadFile(const char *filename) {
 	char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
 	if (buffer == nullptr) {
-		_game->LOG(0, "AdActor::LoadFile failed for file '%s'", filename);
+		_game->LOG(0, "AdActor::loadFile failed for file '%s'", filename);
 		return STATUS_FAILED;
 	}
 
diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 246302bf287..da4fe005547 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -299,7 +299,7 @@ bool AdGame::changeScene(const char *filename, bool fadeIn) {
 		}
 
 		bool ret;
-		if (_initialScene && _debugDebugMode && _debugStartupScene) {
+		if (_initialScene && _debugMode && _debugStartupScene) {
 			_initialScene = false;
 			ret = _scene->loadFile(_debugStartupScene);
 		} else {
@@ -1818,7 +1818,7 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const
 	}
 	if (startIndex >= 0) {
 		for (int32 i = startIndex; i < _dlgPendingBranches.getSize(); i++) {
-			//ClearBranchResponses(_dlgPendingBranches[i]);
+			// clearBranchResponses(_dlgPendingBranches[i]);
 			delete[] _dlgPendingBranches[i];
 			_dlgPendingBranches[i] = nullptr;
 		}
@@ -2437,7 +2437,7 @@ bool AdGame::onMouseRightUp() {
 //////////////////////////////////////////////////////////////////////////
 bool AdGame::displayDebugInfo() {
 	char str[100];
-	if (_game->_debugDebugMode) {
+	if (_game->_debugMode) {
 		Common::sprintf_s(str, "Mouse: %d, %d (scene: %d, %d)", _mousePos.x, _mousePos.y, _mousePos.x + (_scene ? _scene->getOffsetLeft() : 0), _mousePos.y + (_scene ? _scene->getOffsetTop() : 0));
 		_systemFont->drawText((byte *)str, 0, 90, _renderer->getWidth(), TAL_RIGHT);
 
diff --git a/engines/wintermute/ad/ad_game.h b/engines/wintermute/ad/ad_game.h
index 241b58edacb..8d1fdcbf13c 100644
--- a/engines/wintermute/ad/ad_game.h
+++ b/engines/wintermute/ad/ad_game.h
@@ -90,12 +90,12 @@ public:
 	char *_debugStartupScene;
 	char *_startupScene;
 	bool _initialScene;
-	bool gameResponseUsed(int ID) const;
-	bool addGameResponse(int ID);
-	bool resetResponse(int ID);
+	bool gameResponseUsed(int id) const;
+	bool addGameResponse(int id);
+	bool resetResponse(int id);
 
-	bool branchResponseUsed(int ID) const;
-	bool addBranchResponse(int ID);
+	bool branchResponseUsed(int id) const;
+	bool addBranchResponse(int id);
 	bool clearBranchResponses(char *name);
 	bool startDlgBranch(const char *branchName, const char *scriptName, const char *eventName);
 	bool endDlgBranch(const char *branchName, const char *scriptName, const char *eventName);
diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index ff84a696781..09278eb8a1c 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -167,7 +167,7 @@ bool AdInventoryBox::display() {
 bool AdInventoryBox::loadFile(const char *filename) {
 	char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
 	if (buffer == nullptr) {
-		_game->LOG(0, "AdInventoryBox::LoadFile failed for file '%s'", filename);
+		_game->LOG(0, "AdInventoryBox::loadFile failed for file '%s'", filename);
 		return STATUS_FAILED;
 	}
 
diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index 272eb54dc50..ffa75006832 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -83,7 +83,7 @@ AdItem::~AdItem() {
 bool AdItem::loadFile(const char *filename) {
 	char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
 	if (buffer == nullptr) {
-		_game->LOG(0, "AdItem::LoadFile failed for file '%s'", filename);
+		_game->LOG(0, "AdItem::loadFile failed for file '%s'", filename);
 		return STATUS_FAILED;
 	}
 
diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index e7752362793..548d61de3ac 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -67,7 +67,7 @@ AdLayer::~AdLayer() {
 bool AdLayer::loadFile(const char *filename) {
 	char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
 	if (buffer == nullptr) {
-		_game->LOG(0, "AdLayer::LoadFile failed for file '%s'", filename);
+		_game->LOG(0, "AdLayer::loadFile failed for file '%s'", filename);
 		return STATUS_FAILED;
 	}
 
diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp
index c7e9c929cf6..378705ab021 100644
--- a/engines/wintermute/ad/ad_region.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -55,7 +55,7 @@ AdRegion::~AdRegion() {
 bool AdRegion::loadFile(const char *filename) {
 	char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
 	if (buffer == nullptr) {
-		_game->LOG(0, "AdRegion::LoadFile failed for file '%s'", filename);
+		_game->LOG(0, "AdRegion::loadFile failed for file '%s'", filename);
 		return STATUS_FAILED;
 	}
 
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 60a6d846f27..46b6451b6cc 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -268,7 +268,7 @@ bool AdScene::getPath(const BasePoint &source, const BasePoint &target, AdPath *
 
 		pfPointsAdd(startX, startY, 0);
 
-		//CorrectTargetPoint(&target.x, &target.y);
+		// correctTargetPoint(&target.x, &target.y);
 
 		// last point
 		//_pfPath.add(new AdPathPoint(target.x, target.y, INT_MAX));
@@ -344,7 +344,7 @@ float AdScene::getZoomAt(int x, int y) {
 
 //////////////////////////////////////////////////////////////////////////
 uint32 AdScene::getAlphaAt(int x, int y, bool colorCheck) {
-	if (!_game->_debugDebugMode) {
+	if (!_game->_debugMode) {
 		colorCheck = false;
 	}
 
@@ -557,7 +557,7 @@ bool AdScene::initLoop() {
 	int nu_steps = 0;
 	uint32 start = _game->_currentTime;
 	while (!_pfReady && g_system->getMillis() - start <= _pfMaxTime) {
-		PathFinderStep();
+		pathFinderStep();
 		nu_steps++;
 	}
 	if (nu_steps > 0) {
@@ -1086,7 +1086,7 @@ bool AdScene::traverseNodes(bool doUpdate) {
 		/*
 		if (_autoScroll && _game->_mainObject != nullptr)
 		{
-		    ScrollToObject(_game->_mainObject);
+		    scrollToObject(_game->_mainObject);
 		}
 		*/
 
@@ -1196,7 +1196,7 @@ bool AdScene::traverseNodes(bool doUpdate) {
 			_game->_offsetPercentX = (float)offsetX / ((float)_layers[j]->_width - viewportWidth) * 100.0f;
 			_game->_offsetPercentY = (float)offsetY / ((float)_layers[j]->_height - viewportHeight) * 100.0f;
 
-			//_game->QuickMessageForm("%d %f", OffsetX+ViewportX, _game->_offsetPercentX);
+			// _game->quickMessageForm("%d %f", offsetX+ViewportX, _game->_offsetPercentX);
 		} else {
 			_game->setOffset(_offsetLeft - viewportX, _offsetTop - viewportY);
 
@@ -3695,7 +3695,7 @@ bool AdScene::getSceneObjects(BaseArray<AdObject *> &objects, bool interactiveOn
 						objects.add(regionObj[newIndex]);
 					}
 				}
-				//if (regionObj.size() > 0) Objects.Append(RegionObj);
+				// if(regionObj.getSize() > 0) objects.append(regionObj);
 			}
 			break;
 
@@ -3708,7 +3708,7 @@ bool AdScene::getSceneObjects(BaseArray<AdObject *> &objects, bool interactiveOn
 
 	// objects outside any region
 	BaseArray<AdObject *> regionObj;
-	getRegionObjects(NULL, regionObj, interactiveOnly);
+	getRegionObjects(nullptr, regionObj, interactiveOnly);
 	for (int32 newIndex = 0; newIndex < regionObj.getSize(); newIndex++) {
 		bool found = false;
 		for (int32 old = 0; old < objects.getSize(); old++) {
diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h
index 13372c3d96e..3e8f067cd59 100644
--- a/engines/wintermute/ad/ad_scene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -159,8 +159,8 @@ public:
 	bool loadBuffer(char *buffer, bool complete = true);
 	int32 _width{};
 	int32 _height{};
-	bool addObject(AdObject *Object);
-	bool removeObject(AdObject *Object);
+	bool addObject(AdObject *object);
+	bool removeObject(AdObject *object);
 	int32 _editorMarginH;
 	int32 _editorMarginV;
 	uint32 _editorColFrame;
diff --git a/engines/wintermute/ad/ad_talk_def.h b/engines/wintermute/ad/ad_talk_def.h
index 7777c7c44cb..96b3ab54e8f 100644
--- a/engines/wintermute/ad/ad_talk_def.h
+++ b/engines/wintermute/ad/ad_talk_def.h
@@ -38,7 +38,7 @@ class AdTalkDef : public BaseObject {
 public:
 	char *_defaultSpriteSetFilename;
 	AdSpriteSet *_defaultSpriteSet;
-	BaseSprite *getDefaultSprite(TDirection Dir);
+	BaseSprite *getDefaultSprite(TDirection dir);
 	bool loadDefaultSprite();
 	DECLARE_PERSISTENT(AdTalkDef, BaseObject)
 
diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp
index 57b1bced248..adaa3d5378d 100644
--- a/engines/wintermute/ad/ad_talk_holder.cpp
+++ b/engines/wintermute/ad/ad_talk_holder.cpp
@@ -77,7 +77,7 @@ BaseSprite *AdTalkHolder::getTalkStance(const char *stance) {
 		if (_animSprite) {
 			bool res = _animSprite->loadFile(_forcedTalkAnimName);
 			if (DID_FAIL(res)) {
-				_game->LOG(res, "AdTalkHolder::GetTalkStance: error loading talk sprite (object:\"%s\" sprite:\"%s\")", _name, _forcedTalkAnimName);
+				_game->LOG(res, "AdTalkHolder::getTalkStance: error loading talk sprite (object:\"%s\" sprite:\"%s\")", _name, _forcedTalkAnimName);
 				SAFE_DELETE(_animSprite);
 			} else {
 				return _animSprite;
@@ -378,7 +378,7 @@ bool AdTalkHolder::scSetProperty(const char *name, ScValue *value) {
 	// Item
 	//////////////////////////////////////////////////////////////////////////
 	if (strcmp(name, "Item")==0) {
-	    SetItem(value->getString());
+		setItem(value->getString());
 	    return STATUS_OK;
 	}
 
diff --git a/engines/wintermute/base/base.h b/engines/wintermute/base/base.h
index d1c1d5e275c..7151a95712f 100644
--- a/engines/wintermute/base/base.h
+++ b/engines/wintermute/base/base.h
@@ -50,7 +50,7 @@ public:
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent = 0);
 	BaseClass();
 	BaseGame *_game;
-	BaseClass(BaseGame *GameOwner);
+	BaseClass(BaseGame *gameOwner);
 	virtual ~BaseClass();
 
 	virtual const char *getClassName() { return ""; }
diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp
index ce1ef6550b0..6ca392faa3b 100644
--- a/engines/wintermute/base/base_frame.cpp
+++ b/engines/wintermute/base/base_frame.cpp
@@ -102,7 +102,7 @@ bool BaseFrame::oneTimeDisplay(BaseObject *owner, bool muted) {
 		_sound->play();
 		/*
 		if (_game->_state == GAME_FROZEN) {
-		    _sound->Pause(true);
+		    _sound->pause(true);
 		}
 		*/
 	}
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 125cbee859f..6b4cd0356d8 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -126,7 +126,7 @@ BaseGame::BaseGame(const Common::String &targetName) : BaseObject(this), _target
 	_directoryClass = nullptr;
 
 	_debugLogFile = nullptr;
-	_debugDebugMode = false;
+	_debugMode = false;
 	_debugShowFPS = false;
 
 	_systemFont = nullptr;
@@ -360,7 +360,7 @@ BaseGame::~BaseGame() {
 	SAFE_DELETE(_rndHc);
 #endif
 
-	DEBUG_DebugDisable();
+	debugDisable();
 	debugC(kWintermuteDebugLog, "--- shutting down normally ---\n");
 }
 
@@ -446,7 +446,7 @@ bool BaseGame::cleanup() {
 bool BaseGame::initConfManSettings() {
 	if (ConfMan.hasKey("debug_mode")) {
 		if (ConfMan.getBool("debug_mode")) {
-			DEBUG_DebugEnable("./wme.log");
+			debugEnable("./wme.log");
 		}
 	}
 
@@ -657,8 +657,8 @@ bool BaseGame::initialize3() { // renderer is initialized
 }
 
 //////////////////////////////////////////////////////////////////////
-void BaseGame::DEBUG_DebugEnable(const char *filename) {
-	_debugDebugMode = true;
+void BaseGame::debugEnable(const char *filename) {
+	_debugMode = true;
 
 	int secs = g_system->getMillis() / 1000;
 	int hours = secs / 3600;
@@ -680,13 +680,13 @@ void BaseGame::DEBUG_DebugEnable(const char *filename) {
 }
 
 //////////////////////////////////////////////////////////////////////
-void BaseGame::DEBUG_DebugDisable() {
+void BaseGame::debugDisable() {
 	if (_debugLogFile != nullptr) {
 		LOG(0, "********** DEBUG LOG CLOSED ********************************************");
 		//fclose((FILE *)_debugLogFile);
 		_debugLogFile = nullptr;
 	}
-	_debugDebugMode = false;
+	_debugMode = false;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -2859,7 +2859,7 @@ ScValue *BaseGame::scGetProperty(const char *name) {
 	// DebugMode (RO)
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "DebugMode") == 0) {
-		_scValue->setBool(_debugDebugMode);
+		_scValue->setBool(_debugMode);
 		return _scValue;
 	}
 
@@ -4981,7 +4981,7 @@ bool BaseGame::setActiveObject(BaseObject *obj) {
 	if (_activeObject) {
 		_activeObject->applyEvent("MouseLeave");
 	}
-	// if (ValidObject(_activeObject)) _activeObject->applyEvent("MouseLeave");
+	// if (validObject(_activeObject)) _activeObject->applyEvent("MouseLeave");
 	_activeObject = obj;
 	if (_activeObject) {
 		//m_AccessMgr->Speak(m_ActiveObject->GetAccessCaption(), TTS_CAPTION);
@@ -5348,7 +5348,7 @@ bool BaseGame::onMouseLeftDown() {
 		_capturedObject = _activeObject;
 	}
 	_mouseLeftDown = true;
-	//CBPlatform::SetCapture(m_Renderer->m_Window);
+	//BasePlatform::setCapture(_renderer->_window);
 
 	return STATUS_OK;
 }
@@ -5362,7 +5362,7 @@ bool BaseGame::onMouseLeftUp() {
 		_activeObject->handleMouse(MOUSE_RELEASE, MOUSE_BUTTON_LEFT);
 	}
 
-	//ReleaseCapture();
+	//BasePlatform::releaseCapture();
 	_capturedObject = nullptr;
 	_mouseLeftDown = false;
 
@@ -5528,7 +5528,7 @@ bool BaseGame::displayDebugInfo() {
 		_systemFont->drawText((byte *)str, 0, 0, 100, TAL_LEFT);
 	}
 
-	if (_game->_debugDebugMode) {
+	if (_game->_debugMode) {
 		if (!_game->_renderer->isWindowed()) {
 			Common::sprintf_s(str, "Mode: %dx%dx%d", _renderer->getWidth(), _renderer->getHeight(), _renderer->getBPP());
 		} else {
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index 3c0a7e8d121..c2575b38711 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -107,7 +107,7 @@ public:
 	bool _miniUpdateEnabled;
 	virtual bool miniUpdate();
 
-	void getMousePos(Common::Point32 *Pos);
+	void getMousePos(Common::Point32 *pos);
 	Common::Rect32 _mouseLockRect;
 
 	bool _shuttingDown;
@@ -222,9 +222,9 @@ public:
 	BaseFontStorage *_fontStorage;
 	BaseGame(const Common::String &targetName);
 	~BaseGame() override;
-	void DEBUG_DebugDisable();
-	void DEBUG_DebugEnable(const char *filename = nullptr);
-	bool _debugDebugMode;
+	void debugDisable();
+	void debugEnable(const char *filename = nullptr);
+	bool _debugMode;
 	void *_debugLogFile;
 	int32 _sequence;
 	virtual bool loadFile(const char *filename);
@@ -266,8 +266,8 @@ public:
 	// compatibility bits
 	bool _compatKillMethodThreads;
 
-	// FPS stuff
 private:
+	// FPS stuff
 	uint32 _lastTime;
 	uint32 _fpsTime;
 	uint32 _framesRendered;
@@ -396,11 +396,11 @@ public:
 	bool getCurrentViewportOffset(int *offsetX = nullptr, int *offsetY = nullptr) const;
 	bool getCurrentViewportRect(Common::Rect32 *rect, bool *custom = nullptr) const;
 	bool popViewport();
-	bool pushViewport(BaseViewport *Viewport);
-	bool setActiveObject(BaseObject *Obj);
+	bool pushViewport(BaseViewport *viewport);
+	bool setActiveObject(BaseObject *obj);
 
 	BaseSprite *_lastCursor;
-	bool drawCursor(BaseSprite *Cursor);
+	bool drawCursor(BaseSprite *cursor);
 
 	virtual bool initAfterLoad();
 
diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp
index 9acb8e9ee87..374d8ba521c 100644
--- a/engines/wintermute/base/base_parser.cpp
+++ b/engines/wintermute/base/base_parser.cpp
@@ -95,7 +95,7 @@ int32 BaseParser::getObject(char **buf, const TokenDesc *tokens, char **name, ch
 	if (tokens->id == 0) {
 		char *p = strchr(*buf, '\n');
 		if (p && p > *buf) {
-			strncpy(_lastOffender, *buf, MIN((uint32)255, (uint32)(p - *buf))); // TODO, clean
+			strncpy(_lastOffender, *buf, MIN((uint32)255, (uint32)(p - *buf)));
 		} else {
 			_lastOffender[0] = '\0';
 		}
diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp
index 00c5536664f..7d68468f51e 100644
--- a/engines/wintermute/base/base_region.cpp
+++ b/engines/wintermute/base/base_region.cpp
@@ -104,7 +104,7 @@ bool BaseRegion::pointInRegion(int x, int y) {
 bool BaseRegion::loadFile(const char *filename) {
 	char *buffer = (char *)BaseFileManager::getEngineInstance()->readWholeFile(filename);
 	if (buffer == nullptr) {
-		BaseEngine::LOG(0, "BaseRegion::LoadFile failed for file '%s'", filename);
+		BaseEngine::LOG(0, "BaseRegion::loadFile failed for file '%s'", filename);
 		return STATUS_FAILED;
 	}
 
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index bd5494a1c3a..9657d87b048 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -300,7 +300,7 @@ bool BaseScriptHolder::addScript(const char *filename) {
 	for (int32 i = 0; i < _scripts.getSize(); i++) {
 		if (scumm_stricmp(_scripts[i]->_filename, filename) == 0) {
 			if (_scripts[i]->_state != SCRIPT_FINISHED) {
-				BaseEngine::LOG(0, "BaseScriptHolder::AddScript - trying to add script '%s' multiple times (obj: '%s')", filename, _name);
+				BaseEngine::LOG(0, "BaseScriptHolder::addScript - trying to add script '%s' multiple times (obj: '%s')", filename, _name);
 				return STATUS_OK;
 			}
 		}
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp
index 6ed45c0204f..343eeeefb25 100644
--- a/engines/wintermute/base/base_sprite.cpp
+++ b/engines/wintermute/base/base_sprite.cpp
@@ -48,9 +48,9 @@ namespace Wintermute {
 IMPLEMENT_PERSISTENT(BaseSprite, false)
 
 //////////////////////////////////////////////////////////////////////
-BaseSprite::BaseSprite(BaseGame *inGame, BaseObject *Owner) : BaseScriptHolder(inGame) {
+BaseSprite::BaseSprite(BaseGame *inGame, BaseObject *owner) : BaseScriptHolder(inGame) {
 	_editorAllFrames = false;
-	_owner = Owner;
+	_owner = owner;
 	setDefaults();
 }
 
@@ -126,7 +126,7 @@ bool BaseSprite::draw(int x, int y, BaseObject *registerOwner, float zoomX, floa
 bool BaseSprite::loadFile(const char *filename, int lifeTime, TSpriteCacheType cacheType) {
 	if (!BaseFileManager::getEngineInstance()->hasFile(filename)) {
 		BaseEngine::LOG(0, "BaseSprite::LoadFile failed for file '%s'", filename);
-		if (_game->_debugDebugMode) {
+		if (_game->_debugMode) {
 			return loadFile("invalid_debug.bmp", lifeTime, cacheType);
 		} else {
 			return loadFile("invalid.bmp", lifeTime, cacheType);
diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h
index 7963bc757c9..6d5e1d28e57 100644
--- a/engines/wintermute/base/base_sprite.h
+++ b/engines/wintermute/base/base_sprite.h
@@ -69,7 +69,7 @@ public:
 	bool loadBuffer(char *buffer, bool compete = true, int lifeTime = -1, TSpriteCacheType cacheType = CACHE_ALL);
 	bool loadFile(const char *filename, int lifeTime = -1, TSpriteCacheType cacheType = CACHE_ALL);
 	uint32 _lastFrameTime;
-	bool draw(int x, int y, BaseObject *Register = nullptr, float zoomX = Graphics::kDefaultZoomX, float zoomY = Graphics::kDefaultZoomY, uint32 alpha = Graphics::kDefaultRgbaMod);
+	bool draw(int x, int y, BaseObject *registerVal = nullptr, float zoomX = Graphics::kDefaultZoomX, float zoomY = Graphics::kDefaultZoomY, uint32 alpha = Graphics::kDefaultRgbaMod);
 	bool _looping;
 	int32 _currentFrame;
 	bool addFrame(const char *filename, uint32 delay = 0, int hotspotX = 0, int hotspotY = 0, Common::Rect32 *rect = nullptr);
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp
index e1a6c330033..3b5b726af24 100644
--- a/engines/wintermute/base/base_surface_storage.cpp
+++ b/engines/wintermute/base/base_surface_storage.cpp
@@ -114,7 +114,7 @@ BaseSurface *BaseSurfaceStorage::addSurface(const char *filename, bool defaultCK
 		if (!filename) {
 			BaseEngine::LOG(0, "Missing image: '%s'", filename);
 		}
-		if (_game->_debugDebugMode) {
+		if (_game->_debugMode) {
 			return addSurface("invalid_debug.bmp", defaultCK, ckRed, ckGreen, ckBlue, lifeTime, keepLoaded);
 		} else {
 			return addSurface("invalid.bmp", defaultCK, ckRed, ckGreen, ckBlue, lifeTime, keepLoaded);
diff --git a/engines/wintermute/base/base_surface_storage.h b/engines/wintermute/base/base_surface_storage.h
index 63f04d49b8a..9b6e34db7e2 100644
--- a/engines/wintermute/base/base_surface_storage.h
+++ b/engines/wintermute/base/base_surface_storage.h
@@ -38,7 +38,7 @@ public:
 	uint32 _lastCleanupTime;
 	bool initLoop();
 	bool sortSurfaces();
-	static int surfaceSortCB(const void *arg1, const void *arg);
+	static int surfaceSortCB(const void *arg1, const void *arg2);
 	bool cleanup(bool warn = false);
 	//DECLARE_PERSISTENT(BaseSurfaceStorage, BaseClass);
 
diff --git a/engines/wintermute/base/font/base_font.cpp b/engines/wintermute/base/font/base_font.cpp
index 2f6925f5395..d291e67c9a4 100644
--- a/engines/wintermute/base/font/base_font.cpp
+++ b/engines/wintermute/base/font/base_font.cpp
@@ -82,9 +82,9 @@ bool BaseFont::persist(BasePersistenceManager *persistMgr) {
 
 
 //////////////////////////////////////////////////////////////////////////
-BaseFont *BaseFont::createFromFile(BaseGame *gameRef, const char *filename) {
-	if (isTrueType(gameRef,  filename)) {
-		BaseFontTT *font = new BaseFontTT(gameRef);
+BaseFont *BaseFont::createFromFile(BaseGame *game, const char *filename) {
+	if (isTrueType(game, filename)) {
+		BaseFontTT *font = new BaseFontTT(game);
 		if (font) {
 			if (DID_FAIL(font->loadFile(filename))) {
 				delete font;
@@ -93,7 +93,7 @@ BaseFont *BaseFont::createFromFile(BaseGame *gameRef, const char *filename) {
 		}
 		return font;
 	} else {
-		BaseFontBitmap *font = new BaseFontBitmap(gameRef);
+		BaseFontBitmap *font = new BaseFontBitmap(game);
 		if (font) {
 			if (DID_FAIL(font->loadFile(filename))) {
 				delete font;
@@ -110,7 +110,7 @@ TOKEN_DEF(FONT)
 TOKEN_DEF(TTFONT)
 TOKEN_DEF_END
 //////////////////////////////////////////////////////////////////////////
-bool BaseFont::isTrueType(BaseGame *gameRef, const char *filename) {
+bool BaseFont::isTrueType(BaseGame *game, const char *filename) {
 	TOKEN_TABLE_START(commands)
 	TOKEN_TABLE(FONT)
 	TOKEN_TABLE(TTFONT)
@@ -125,7 +125,7 @@ bool BaseFont::isTrueType(BaseGame *gameRef, const char *filename) {
 	char *workBuffer = buffer;
 
 	char *params;
-	BaseParser parser(gameRef);
+	BaseParser parser(game);
 
 	bool ret = false;
 	if (parser.getCommand(&workBuffer, commands, &params) == TOKEN_TTFONT) {
diff --git a/engines/wintermute/base/particles/part_force.h b/engines/wintermute/base/particles/part_force.h
index 0e11ea74df6..b8f0ec34420 100644
--- a/engines/wintermute/base/particles/part_force.h
+++ b/engines/wintermute/base/particles/part_force.h
@@ -49,7 +49,7 @@ public:
 	DXVector2 _direction;
 	TForceType _type;
 
-	bool persist(BasePersistenceManager *PersistMgr) override;
+	bool persist(BasePersistenceManager *persistMgr) override;
 };
 
 } // End of namespace Wintermute
diff --git a/engines/wintermute/base/particles/part_particle.h b/engines/wintermute/base/particles/part_particle.h
index 3d987aed63d..832a9e2fc57 100644
--- a/engines/wintermute/base/particles/part_particle.h
+++ b/engines/wintermute/base/particles/part_particle.h
@@ -77,7 +77,7 @@ public:
 	bool fadeIn(uint32 currentTime, int fadeTime);
 	bool fadeOut(uint32 currentTime, int fadeTime);
 
-	bool persist(BasePersistenceManager *PersistMgr) override;
+	bool persist(BasePersistenceManager *persistMgr) override;
 
 private:
 	uint32 _fadeStart;
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 7d32c7aa5c9..7ee8991cb57 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -227,10 +227,10 @@ bool ScScript::initTables() {
 			_externals[i].name = getString();
 			_externals[i].call_type = (TCallType)getDWORD();
 			_externals[i].returns = (TExternalType)getDWORD();
-			_externals[i].nu_params = getDWORD();
-			if (_externals[i].nu_params > 0) {
-				_externals[i].params = new TExternalType[_externals[i].nu_params];
-				for (int j = 0; j < _externals[i].nu_params; j++) {
+			_externals[i].numParams = getDWORD();
+			if (_externals[i].numParams > 0) {
+				_externals[i].params = new TExternalType[_externals[i].numParams];
+				for (int j = 0; j < _externals[i].numParams; j++) {
 					_externals[i].params[j] = (TExternalType)getDWORD();
 				}
 			}
@@ -438,7 +438,7 @@ void ScScript::cleanup() {
 
 	if (_externals) {
 		for (uint32 i = 0; i < _numExternals; i++) {
-			if (_externals[i].nu_params > 0) {
+			if (_externals[i].numParams > 0) {
 				delete[] _externals[i].params;
 			}
 		}
diff --git a/engines/wintermute/base/scriptables/script.h b/engines/wintermute/base/scriptables/script.h
index b4a4c9927cf..fa90419c41a 100644
--- a/engines/wintermute/base/scriptables/script.h
+++ b/engines/wintermute/base/scriptables/script.h
@@ -113,7 +113,7 @@ public:
 		char *dll_name;
 		TCallType call_type;
 		TExternalType returns;
-		int32 nu_params;
+		int32 numParams;
 		TExternalType *params;
 	} TExternalFunction;
 
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index 89a85984587..d105be10c0b 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -582,7 +582,7 @@ bool ScEngine::isValidScript(ScScript *script) {
 
 //////////////////////////////////////////////////////////////////////////
 bool ScEngine::clearGlobals(bool includingNatives) {
-	_globals->CleanProps(includingNatives);
+	_globals->cleanProps(includingNatives);
 	return STATUS_OK;
 }
 
diff --git a/engines/wintermute/base/scriptables/script_engine.h b/engines/wintermute/base/scriptables/script_engine.h
index 3f12f993643..e057dd0e99f 100644
--- a/engines/wintermute/base/scriptables/script_engine.h
+++ b/engines/wintermute/base/scriptables/script_engine.h
@@ -79,7 +79,7 @@ public:
 	bool resumeAll();
 	bool pauseAll();
 	void editorCleanup();
-	bool resetObject(BaseObject *Object);
+	bool resetObject(BaseObject *object);
 	bool resetScript(ScScript *script);
 	bool emptyScriptCache();
 	byte *getCompiledScript(const char *filename, uint32 *outSize, bool ignoreCache = false);
@@ -106,7 +106,7 @@ public:
 		return _isProfiling;
 	}
 
-	void addScriptTime(const char *filename, uint32 Time);
+	void addScriptTime(const char *filename, uint32 time);
 	void dumpStats();
 
 private:
diff --git a/engines/wintermute/base/scriptables/script_ext_date.h b/engines/wintermute/base/scriptables/script_ext_date.h
index 7731ca007f2..23eae3e2d6b 100644
--- a/engines/wintermute/base/scriptables/script_ext_date.h
+++ b/engines/wintermute/base/scriptables/script_ext_date.h
@@ -35,9 +35,9 @@ namespace Wintermute {
 
 class SXDate : public BaseScriptable {
 public:
-	int scCompare(BaseScriptable *Value) override;
+	int scCompare(BaseScriptable *value) override;
 	DECLARE_PERSISTENT(SXDate, BaseScriptable)
-	SXDate(BaseGame *inGame, ScStack *Stack);
+	SXDate(BaseGame *inGame, ScStack *stack);
 	~SXDate() override;
 	ScValue *scGetProperty(const char *name) override;
 	bool scSetProperty(const char *name, ScValue *value) override;
diff --git a/engines/wintermute/base/scriptables/script_ext_file.h b/engines/wintermute/base/scriptables/script_ext_file.h
index 4232c9046f4..0f7be0b9881 100644
--- a/engines/wintermute/base/scriptables/script_ext_file.h
+++ b/engines/wintermute/base/scriptables/script_ext_file.h
@@ -41,7 +41,7 @@ public:
 	bool scSetProperty(const char *name, ScValue *value) override;
 	bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override;
 	const char *scToString() override;
-	SXFile(BaseGame *inGame, ScStack *Stack);
+	SXFile(BaseGame *inGame, ScStack *stack);
 	~SXFile() override;
 
 private:
diff --git a/engines/wintermute/base/scriptables/script_ext_object.h b/engines/wintermute/base/scriptables/script_ext_object.h
index 91fdfd9cbff..0ff27234e77 100644
--- a/engines/wintermute/base/scriptables/script_ext_object.h
+++ b/engines/wintermute/base/scriptables/script_ext_object.h
@@ -36,7 +36,7 @@ namespace Wintermute {
 class SXObject : public BaseObject {
 public:
 	DECLARE_PERSISTENT(SXObject, BaseObject)
-	SXObject(BaseGame *inGame, ScStack *Stack);
+	SXObject(BaseGame *inGame, ScStack *stack);
 	~SXObject() override;
 };
 
diff --git a/engines/wintermute/base/scriptables/script_ext_string.h b/engines/wintermute/base/scriptables/script_ext_string.h
index 9f7800e7a45..9bfd3375b58 100644
--- a/engines/wintermute/base/scriptables/script_ext_string.h
+++ b/engines/wintermute/base/scriptables/script_ext_string.h
@@ -44,7 +44,7 @@ public:
 	const char *scToString() override;
 	void setStringVal(const char *val);
 	char *_string;
-	SXString(BaseGame *inGame, ScStack *Stack);
+	SXString(BaseGame *inGame, ScStack *stack);
 	~SXString() override;
 	int32 _capacity;
 };
diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp
index d3d432c4e22..e62cc916e5d 100644
--- a/engines/wintermute/base/scriptables/script_stack.cpp
+++ b/engines/wintermute/base/scriptables/script_stack.cpp
@@ -113,23 +113,23 @@ ScValue *ScStack::getAt(int index) {
 
 //////////////////////////////////////////////////////////////////////////
 void ScStack::correctParams(uint32 expectedParams) {
-	uint32 nuParams = (uint32)pop()->getInt();
+	uint32 numParams = (uint32)pop()->getInt();
 
-	if (expectedParams < nuParams) { // too many params
-		while (expectedParams < nuParams) {
-			//Pop();
+	if (expectedParams < numParams) { // too many params
+		while (expectedParams < numParams) {
+			//pop();
 			delete _values[_sP - expectedParams];
 			_values.removeAt(_sP - expectedParams);
-			nuParams--;
+			numParams--;
 			_sP--;
 		}
-	} else if (expectedParams > nuParams) { // need more params
-		while (expectedParams > nuParams) {
-			//Push(null_val);
+	} else if (expectedParams > numParams) { // need more params
+		while (expectedParams > numParams) {
+			//push(nullVal);
 			ScValue *nullVal = new ScValue(_game);
 			nullVal->setNULL();
-			_values.insertAt(_sP - nuParams + 1, nullVal);
-			nuParams++;
+			_values.insertAt(_sP - numParams + 1, nullVal);
+			numParams++;
 			_sP++;
 
 			if (_values.getSize() > _sP + 1) {
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp
index d45f33b5a0e..f27fc7931a4 100644
--- a/engines/wintermute/base/scriptables/script_value.cpp
+++ b/engines/wintermute/base/scriptables/script_value.cpp
@@ -279,7 +279,7 @@ void ScValue::deleteProps() {
 
 
 //////////////////////////////////////////////////////////////////////////
-void ScValue::CleanProps(bool includingNatives) {
+void ScValue::cleanProps(bool includingNatives) {
 	_valIter = _valObject.begin();
 	while (_valIter != _valObject.end()) {
 		if (!_valIter->_value->_isConstVar && (!_valIter->_value->isNative() || includingNatives)) {
@@ -621,7 +621,7 @@ void *ScValue::getMemBuffer() {
 	if (_type == VAL_NATIVE) {
 		return _valNative->scToMemBuffer();
 	} else {
-		return (void *)NULL;
+		return (void *)nullptr;
 	}
 }
 
diff --git a/engines/wintermute/base/scriptables/script_value.h b/engines/wintermute/base/scriptables/script_value.h
index 0cd9cea58c7..e663ce3d860 100644
--- a/engines/wintermute/base/scriptables/script_value.h
+++ b/engines/wintermute/base/scriptables/script_value.h
@@ -63,7 +63,7 @@ public:
 	BaseScriptable *getNative();
 	bool deleteProp(const char *name);
 	void deleteProps();
-	void CleanProps(bool includingNatives);
+	void cleanProps(bool includingNatives);
 	void setBool(bool val);
 	void setInt(int val);
 	void setFloat(double val);
@@ -92,10 +92,10 @@ private:
 public:
 	TValType _type;
 	ScValue(BaseGame *inGame);
-	ScValue(BaseGame *inGame, bool Val);
-	ScValue(BaseGame *inGame, int32 Val);
-	ScValue(BaseGame *inGame, double Val);
-	ScValue(BaseGame *inGame, const char *Val);
+	ScValue(BaseGame *inGame, bool val);
+	ScValue(BaseGame *inGame, int32 val);
+	ScValue(BaseGame *inGame, double val);
+	ScValue(BaseGame *inGame, const char *val);
 	~ScValue() override;
 	Common::HashMap<Common::String, ScValue *> _valObject;
 	Common::HashMap<Common::String, ScValue *>::iterator _valIter;
diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h
index 27dbeb2e69b..b550d8a17ba 100644
--- a/engines/wintermute/coll_templ.h
+++ b/engines/wintermute/coll_templ.h
@@ -336,7 +336,7 @@ void BaseArrayBase<TYPE>::removeAt(int32 nIndex, int32 nCount) {
 template<class TYPE>
 void BaseArrayBase<TYPE>::insertAt(int32 nStartIndex, BaseArrayBase *pNewArray) {
 	if (pNewArray->getSize() > 0) {
-		InsertAt(nStartIndex, pNewArray->getAt(0), pNewArray->getSize());
+		insertAt(nStartIndex, pNewArray->getAt(0), pNewArray->getSize());
 		for (int32 i = 0; i < pNewArray->getSize(); i++)
 			setAt(nStartIndex + i, pNewArray->getAt(i));
 	}
diff --git a/engines/wintermute/ext/dll_httpconnect.cpp b/engines/wintermute/ext/dll_httpconnect.cpp
index 77fcd7e07d6..03f946f28dd 100644
--- a/engines/wintermute/ext/dll_httpconnect.cpp
+++ b/engines/wintermute/ext/dll_httpconnect.cpp
@@ -119,7 +119,7 @@ bool EmulateHTTPConnectExternalCalls(BaseGame *inGame, ScStack *stack, ScStack *
 	// Specification: external "httpconnect.dll" cdecl long SendRecvHTTP(string, long, string, long, string, long)
 	// Always returns -7 for me in a test game, probably returns the same network errors as Register()
 	//////////////////////////////////////////////////////////////////////////
-	else if (strcmp(function->name, "SendRecvHTTP") == 0 && function->nu_params == 6) {
+	else if (strcmp(function->name, "SendRecvHTTP") == 0 && function->numParams == 6) {
 		stack->correctParams(6);
 		const char *server = stack->pop()->getString();
 		int serverMaxLen = stack->pop()->getInt();
@@ -143,7 +143,7 @@ bool EmulateHTTPConnectExternalCalls(BaseGame *inGame, ScStack *stack, ScStack *
 	// My Zbang demo does not have this dll, so there is no way to actually test it with a test game
 	// Return value is never used in Zbang scripts
 	//////////////////////////////////////////////////////////////////////////
-	else if (strcmp(function->name, "SendRecvHTTP") == 0 && function->nu_params == 4) {
+	else if (strcmp(function->name, "SendRecvHTTP") == 0 && function->numParams == 4) {
 		stack->correctParams(4);
 		const char *dirUrl = stack->pop()->getString();
 		int dirUrlMaxLen = stack->pop()->getInt();
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index cf3932eac51..6ec9163e087 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -59,8 +59,8 @@ namespace Wintermute {
 		return ::new className(DYNAMIC_CONSTRUCTOR, DYNAMIC_CONSTRUCTOR);\
 	}\
 	\
-	bool className::persistLoad(void *instance, BasePersistenceManager *persistMgr) {\
-		return ((className*)instance)->persist(persistMgr);\
+	bool className::persistLoad(void *Instance, BasePersistenceManager *persistMgr) {\
+		return ((className*)Instance)->persist(persistMgr);\
 	}\
 	\
 	const char *className::getClassName() {\
diff --git a/engines/wintermute/system/sys_class.cpp b/engines/wintermute/system/sys_class.cpp
index d68fbf447a4..f9fb39d99a2 100644
--- a/engines/wintermute/system/sys_class.cpp
+++ b/engines/wintermute/system/sys_class.cpp
@@ -41,7 +41,7 @@ SystemClass::SystemClass(const AnsiString &name, PERSISTBUILD build, PERSISTLOAD
 	_build = build;
 	_load = load;
 	_next = nullptr;
-	_savedID = -1;
+	_savedId = -1;
 	_persistent = persistentClass;
 	_numInst = 0;
 
@@ -70,7 +70,7 @@ bool SystemClass::removeAllInstances() {
 //////////////////////////////////////////////////////////////////////////
 SystemInstance *SystemClass::addInstance(void *instance, int id, int savedId) {
 	SystemInstance *inst = new SystemInstance(instance, id, this);
-	inst->setSavedID(savedId);
+	inst->setSavedId(savedId);
 	_instances[inst] = (inst);
 
 	_instanceMap[instance] = inst;
@@ -100,12 +100,12 @@ bool SystemClass::removeInstance(void *instance) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-int SystemClass::getInstanceID(void *pointer) {
+int SystemClass::getInstanceId(void *pointer) {
 	InstanceMap::iterator mapIt = _instanceMap.find(pointer);
 	if (mapIt == _instanceMap.end()) {
 		return -1;
 	} else {
-		return (mapIt->_value)->getID();
+		return (mapIt->_value)->getId();
 	}
 }
 
@@ -114,7 +114,7 @@ void *SystemClass::idToPointer(int savedID) {
 	//slow
 	Instances::iterator it;
 	for (it = _instances.begin(); it != _instances.end(); ++it) {
-		if ((it->_value)->getSavedID() == savedID) {
+		if ((it->_value)->getSavedId() == savedID) {
 			return (it->_value)->getInstance();
 		}
 	}
@@ -129,42 +129,42 @@ int SystemClass::getNumInstances() {
 //////////////////////////////////////////////////////////////////////////
 void SystemClass::dump(Common::WriteStream *stream) {
 	Common::String str;
-	str = Common::String::format("%03d %c %-20s instances: %d\n", _iD, _persistent ? 'p' : ' ', _name.c_str(), getNumInstances());
+	str = Common::String::format("%03d %c %-20s instances: %d\n", _id, _persistent ? 'p' : ' ', _name.c_str(), getNumInstances());
 	stream->write(str.c_str(), str.size());
 }
 
 //////////////////////////////////////////////////////////////////////////
-void SystemClass::saveTable(BaseGame *gameRef, BasePersistenceManager *persistMgr) {
+void SystemClass::saveTable(BaseGame *game, BasePersistenceManager *persistMgr) {
 	persistMgr->putString(_name.c_str());
-	persistMgr->putDWORD(_iD);
+	persistMgr->putDWORD(_id);
 	persistMgr->putDWORD(_instances.size());
 
 	Instances::iterator it;
 	for (it = _instances.begin(); it != _instances.end(); ++it) {
-		persistMgr->putDWORD((it->_value)->getID());
+		persistMgr->putDWORD((it->_value)->getId());
 	}
 }
 
 //////////////////////////////////////////////////////////////////////////
-void SystemClass::loadTable(BaseGame *gameRef, BasePersistenceManager *persistMgr) {
-	_savedID = persistMgr->getDWORD();
+void SystemClass::loadTable(BaseGame *game, BasePersistenceManager *persistMgr) {
+	_savedId = persistMgr->getDWORD();
 	int numInstances = persistMgr->getDWORD();
 
 	for (int i = 0; i < numInstances; i++) {
-		int instID = persistMgr->getDWORD();
+		int instId = persistMgr->getDWORD();
 		if (_persistent) {
 
 			if (i > 0) {
-				gameRef->LOG(0, "Warning: attempting to load multiple instances of persistent class %s (%d)", _name.c_str(), numInstances);
+				game->LOG(0, "Warning: attempting to load multiple instances of persistent class %s (%d)", _name.c_str(), numInstances);
 				continue;
 			}
 
 			Instances::iterator it = _instances.begin();
 			if (it != _instances.end()) {
-				(it->_value)->setSavedID(instID);
+				(it->_value)->setSavedId(instId);
 				SystemClassRegistry::getInstance()->addInstanceToTable((it->_value), (it->_value)->getInstance());
 			} else {
-				gameRef->LOG(0, "Warning: instance %d of persistent class %s not found", i, _name.c_str());
+				game->LOG(0, "Warning: instance %d of persistent class %s not found", i, _name.c_str());
 			}
 		}
 		// normal instances, create empty objects
@@ -174,20 +174,20 @@ void SystemClass::loadTable(BaseGame *gameRef, BasePersistenceManager *persistMg
 				warning("HALT");
 			}
 
-			addInstance(emptyObject, SystemClassRegistry::getInstance()->getNextID(), instID);
+			addInstance(emptyObject, SystemClassRegistry::getInstance()->getNextID(), instId);
 		}
 
 	}
 }
 
 //////////////////////////////////////////////////////////////////////////
-void SystemClass::saveInstances(BaseGame *Game, BasePersistenceManager *persistMgr) {
+void SystemClass::saveInstances(BaseGame *game, BasePersistenceManager *persistMgr) {
 	Instances::iterator it;
 	for (it = _instances.begin(); it != _instances.end(); ++it) {
 		// write instace header
 		persistMgr->putString("<INSTANCE_HEAD>");
-		persistMgr->putDWORD(_iD);
-		persistMgr->putDWORD((it->_value)->getID());
+		persistMgr->putDWORD(_id);
+		persistMgr->putDWORD((it->_value)->getId());
 		persistMgr->putString("</INSTANCE_HEAD>");
 		_load((it->_value)->getInstance(), persistMgr);
 		persistMgr->putString("</INSTANCE>");
@@ -204,7 +204,7 @@ void SystemClass::loadInstance(void *instance, BasePersistenceManager *persistMg
 void SystemClass::resetSavedIDs() {
 	Instances::iterator it;
 	for (it = _instances.begin(); it != _instances.end(); ++it) {
-		(it->_value)->setSavedID(-1);
+		(it->_value)->setSavedId(-1);
 	}
 }
 
diff --git a/engines/wintermute/system/sys_class.h b/engines/wintermute/system/sys_class.h
index c60b52d32ba..5de82fd897d 100644
--- a/engines/wintermute/system/sys_class.h
+++ b/engines/wintermute/system/sys_class.h
@@ -72,18 +72,18 @@ public:
 	SystemInstance *addInstance(void *instance, int id, int savedId = -1);
 	bool removeAllInstances();
 
-	int getInstanceID(void *pointer);
-	void *idToPointer(int savedID);
+	int getInstanceId(void *pointer);
+	void *idToPointer(int savedId);
 
-	void setID(int id) {
-		_iD = id;
+	void setId(int id) {
+		_id = id;
 	}
-	int getID() const {
-		return _iD;
+	int getId() const {
+		return _id;
 	}
 
-	int getSavedID() const {
-		return _savedID;
+	int getSavedId() const {
+		return _savedId;
 	}
 
 	bool isPersistent() const {
@@ -94,11 +94,11 @@ public:
 		return _name;
 	}
 
-	void saveTable(BaseGame *Game, BasePersistenceManager *PersistMgr);
-	void loadTable(BaseGame *Game, BasePersistenceManager *PersistMgr);
+	void saveTable(BaseGame *game, BasePersistenceManager *persistMgr);
+	void loadTable(BaseGame *game, BasePersistenceManager *persistMgr);
 
-	void saveInstances(BaseGame *Game, BasePersistenceManager *PersistMgr);
-	void loadInstance(void *instance, BasePersistenceManager *PersistMgr);
+	void saveInstances(BaseGame *game, BasePersistenceManager *persistMgr);
+	void loadInstance(void *instance, BasePersistenceManager *persistMgr);
 
 	void instanceCallback(SYS_INSTANCE_CALLBACK lpCallback, void *lpData);
 
@@ -110,8 +110,8 @@ private:
 	int _numInst;
 	bool _persistent;
 	SystemClass *_next;
-	int _iD{};
-	int _savedID;
+	int _id{};
+	int _savedId;
 	AnsiString _name;
 	PERSISTBUILD _build;
 	PERSISTLOAD _load;
diff --git a/engines/wintermute/system/sys_class_registry.cpp b/engines/wintermute/system/sys_class_registry.cpp
index cc6b49713db..96b36cf5ba5 100644
--- a/engines/wintermute/system/sys_class_registry.cpp
+++ b/engines/wintermute/system/sys_class_registry.cpp
@@ -63,12 +63,12 @@ void SystemClassRegistry::unregisterClasses() {
 
 //////////////////////////////////////////////////////////////////////////
 bool SystemClassRegistry::registerClass(SystemClass *classObj) {
-	classObj->setID(_count++);
+	classObj->setId(_count++);
 	//_classes.insert(classObj);
 	_classes[classObj] = classObj;
 
 	_nameMap[classObj->getName()] = classObj;
-	_idMap[classObj->getID()] = classObj;
+	_idMap[classObj->getId()] = classObj;
 
 	return true;
 }
@@ -92,7 +92,7 @@ bool SystemClassRegistry::unregisterClass(SystemClass *classObj) {
 		_nameMap.erase(mapIt);
 	}
 
-	IdMap::iterator idIt = _idMap.find(classObj->getID());
+	IdMap::iterator idIt = _idMap.find(classObj->getId());
 	if (idIt != _idMap.end()) {
 		_idMap.erase(idIt);
 	}
@@ -121,8 +121,8 @@ bool SystemClassRegistry::registerInstance(const char *className, void *instance
 void SystemClassRegistry::addInstanceToTable(SystemInstance *instance, void *pointer) {
 	_instanceMap[pointer] = instance;
 
-	if (instance->getSavedID() >= 0) {
-		_savedInstanceMap[instance->getSavedID()] = instance;
+	if (instance->getSavedId() >= 0) {
+		_savedInstanceMap[instance->getSavedId()] = instance;
 	}
 }
 
@@ -162,8 +162,8 @@ bool SystemClassRegistry::getPointerID(void *pointer, int *classID, int *instanc
 
 
 	SystemInstance *inst = (*it)._value;
-	*instanceID = inst->getID();
-	*classID = inst->getClass()->getID();
+	*instanceID = inst->getId();
+	*classID = inst->getClass()->getId();
 
 	return true;
 }
@@ -190,7 +190,7 @@ bool checkHeader(const char *tag, BasePersistenceManager *pm) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool SystemClassRegistry::saveTable(BaseGame *gameRef, BasePersistenceManager *persistMgr, bool quickSave) {
+bool SystemClassRegistry::saveTable(BaseGame *game, BasePersistenceManager *persistMgr, bool quickSave) {
 	persistMgr->putString("<CLASS_REGISTRY_TABLE>");
 	persistMgr->putDWORD(_classes.size());
 
@@ -201,10 +201,10 @@ bool SystemClassRegistry::saveTable(BaseGame *gameRef, BasePersistenceManager *p
 		counter++;
 
 		if (!quickSave) {
-			gameRef->setIndicatorVal((int)(50.0f / (float)((float)_classes.size() / (float)counter)));
+			game->setIndicatorVal((int)(50.0f / (float)((float)_classes.size() / (float)counter)));
 		}
 
-		(it->_value)->saveTable(gameRef,  persistMgr);
+		(it->_value)->saveTable(game, persistMgr);
 	}
 	persistMgr->putString("</CLASS_REGISTRY_TABLE>");
 	return STATUS_OK;
@@ -212,7 +212,7 @@ bool SystemClassRegistry::saveTable(BaseGame *gameRef, BasePersistenceManager *p
 
 
 //////////////////////////////////////////////////////////////////////////
-bool SystemClassRegistry::loadTable(BaseGame *gameRef, BasePersistenceManager *persistMgr) {
+bool SystemClassRegistry::loadTable(BaseGame *game, BasePersistenceManager *persistMgr) {
 	checkHeader("<CLASS_REGISTRY_TABLE>", persistMgr);
 
 	// reset SavedID of current instances
@@ -233,13 +233,13 @@ bool SystemClassRegistry::loadTable(BaseGame *gameRef, BasePersistenceManager *p
 	uint32 numClasses = persistMgr->getDWORD();
 
 	for (uint32 i = 0; i < numClasses; i++) {
-		gameRef->setIndicatorVal((int)(50.0f / (float)((float)numClasses / (float)(i + 1))));
+		game->setIndicatorVal((int)(50.0f / (float)((float)numClasses / (float)(i + 1))));
 
 		Common::String className = persistMgr->getStringObj();
 
 		// WA to be removed later
 		// This allow load save games from 2D games where SXVlink class reference is stored
-		if (!gameRef->_is3D && className == "SXVlink") {
+		if (!game->_is3D && className == "SXVlink") {
 			persistMgr->getDWORD(); // saveId
 			persistMgr->getDWORD(); // numInstances
 			continue;
@@ -247,7 +247,7 @@ bool SystemClassRegistry::loadTable(BaseGame *gameRef, BasePersistenceManager *p
 
 		NameMap::iterator mapIt = _nameMap.find(className);
 		if (mapIt != _nameMap.end()) {
-			(*mapIt)._value->loadTable(gameRef,  persistMgr);
+			(*mapIt)._value->loadTable(game,  persistMgr);
 		}
 	}
 
@@ -258,7 +258,7 @@ bool SystemClassRegistry::loadTable(BaseGame *gameRef, BasePersistenceManager *p
 
 
 //////////////////////////////////////////////////////////////////////////
-bool SystemClassRegistry::saveInstances(BaseGame *gameRef, BasePersistenceManager *persistMgr, bool quickSave) {
+bool SystemClassRegistry::saveInstances(BaseGame *game, BasePersistenceManager *persistMgr, bool quickSave) {
 
 	Classes::iterator it;
 
@@ -276,25 +276,25 @@ bool SystemClassRegistry::saveInstances(BaseGame *gameRef, BasePersistenceManage
 
 		if (!quickSave) {
 			if (counter % 20 == 0) {
-				gameRef->setIndicatorVal((int)(50.0f + 50.0f / (float)((float)_classes.size() / (float)counter)));
+				game->setIndicatorVal((int)(50.0f + 50.0f / (float)((float)_classes.size() / (float)counter)));
 			}
 		}
-		gameRef->miniUpdate();
+		game->miniUpdate();
 
-		(it->_value)->saveInstances(gameRef,  persistMgr);
+		(it->_value)->saveInstances(game,  persistMgr);
 	}
 
 	return STATUS_OK;
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool SystemClassRegistry::loadInstances(BaseGame *gameRef, BasePersistenceManager *persistMgr) {
+bool SystemClassRegistry::loadInstances(BaseGame *game, BasePersistenceManager *persistMgr) {
 	// get total instances
 	int numInstances = persistMgr->getDWORD();
 
 	for (int i = 0; i < numInstances; i++) {
 		if (i % 20 == 0) {
-			gameRef->setIndicatorVal((int)(50.0f + 50.0f / (float)((float)numInstances / (float)(i + 1))));
+			game->setIndicatorVal((int)(50.0f + 50.0f / (float)((float)numInstances / (float)(i + 1))));
 		}
 
 		checkHeader("<INSTANCE_HEAD>", persistMgr);
@@ -307,7 +307,7 @@ bool SystemClassRegistry::loadInstances(BaseGame *gameRef, BasePersistenceManage
 
 		Classes::iterator it;
 		for (it = _classes.begin(); it != _classes.end(); ++it) {
-			if ((it->_value)->getSavedID() == classID) {
+			if ((it->_value)->getSavedId() == classID) {
 				(it->_value)->loadInstance(instance, persistMgr);
 				break;
 			}
diff --git a/engines/wintermute/system/sys_class_registry.h b/engines/wintermute/system/sys_class_registry.h
index 583d009b227..75a33d2ae68 100644
--- a/engines/wintermute/system/sys_class_registry.h
+++ b/engines/wintermute/system/sys_class_registry.h
@@ -66,10 +66,10 @@ public:
 	static SystemClassRegistry *getInstance();
 
 	bool enumInstances(SYS_INSTANCE_CALLBACK lpCallback, const char *className, void *lpData);
-	bool loadTable(BaseGame *Game, BasePersistenceManager *PersistMgr);
-	bool saveTable(BaseGame *Game, BasePersistenceManager *PersistMgr, bool quickSave);
-	bool loadInstances(BaseGame *Game, BasePersistenceManager *PersistMgr);
-	bool saveInstances(BaseGame *Game, BasePersistenceManager *PersistMgr, bool quickSave);
+	bool loadTable(BaseGame *game, BasePersistenceManager *persistMgr);
+	bool saveTable(BaseGame *game, BasePersistenceManager *persistMgr, bool quickSave);
+	bool loadInstances(BaseGame *game, BasePersistenceManager *persistMgr);
+	bool saveInstances(BaseGame *game, BasePersistenceManager *persistMgr, bool quickSave);
 	void *idToPointer(int classID, int instanceID);
 	bool getPointerID(void *pointer, int *classID, int *instanceID);
 	bool registerClass(SystemClass *classObj);
diff --git a/engines/wintermute/system/sys_instance.cpp b/engines/wintermute/system/sys_instance.cpp
index ae6be6f64fc..5e1299f823b 100644
--- a/engines/wintermute/system/sys_instance.cpp
+++ b/engines/wintermute/system/sys_instance.cpp
@@ -35,7 +35,7 @@ namespace Wintermute {
 SystemInstance::SystemInstance(void *instance, int id, SystemClass *sysClass) {
 	_instance = instance;
 	_id = id;
-	_savedID = -1;
+	_savedId = -1;
 	_class = sysClass;
 
 	_used = false;
diff --git a/engines/wintermute/system/sys_instance.h b/engines/wintermute/system/sys_instance.h
index 27f6bf5f479..410278d3a15 100644
--- a/engines/wintermute/system/sys_instance.h
+++ b/engines/wintermute/system/sys_instance.h
@@ -37,11 +37,11 @@ public:
 	SystemInstance(void *instance, int id, SystemClass *sysClass);
 	virtual ~SystemInstance();
 
-	int getID() const {
+	int getId() const {
 		return _id;
 	}
-	int getSavedID() const {
-		return _savedID;
+	int getSavedId() const {
+		return _savedId;
 	}
 	void *getInstance() const {
 		return _instance;
@@ -50,14 +50,14 @@ public:
 		return _class;
 	}
 
-	void setSavedID(int id) {
-		_savedID = id;
+	void setSavedId(int id) {
+		_savedId = id;
 	}
 
 private:
 	bool _used;
 	int _id;
-	int _savedID;
+	int _savedId;
 	void *_instance;
 	SystemClass *_class;
 };
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index 5d466f1d76e..30996e0d5bc 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -725,7 +725,7 @@ bool UIButton::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), nullptr);
+	//if (image) image->draw(ImageX +((_press||_oneTimePress)&&back?1:0), ImageY +((_press||_oneTimePress)&&back?1:0), nullptr);
 	if (image) {
 		image->draw(imageX + ((_press || _oneTimePress) && back ? 1 : 0), imageY + ((_press || _oneTimePress) && back ? 1 : 0), _pixelPerfect ? this : nullptr);
 	}
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp
index fb781e1827a..fa3588422de 100644
--- a/engines/wintermute/ui/ui_edit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -605,7 +605,7 @@ bool UIEdit::display(int offsetX, int offsetY) {
 	_selStart = (int32)MIN((size_t)_selStart, strlen(_text));
 	_selEnd   = (int32)MIN((size_t)_selEnd,   strlen(_text));
 
-	//int CursorWidth = font->GetCharWidth(_cursorChar[0]);
+	//int cursorWidth = font->getCharWidth(_cursorChar[0]);
 	int cursorWidth = font->getTextWidth((byte *)_cursorChar);
 
 	int32 s1, s2;
diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp
index 4ee7edbf07a..b91b33416e9 100644
--- a/engines/wintermute/ui/ui_tiled_image.cpp
+++ b/engines/wintermute/ui/ui_tiled_image.cpp
@@ -71,38 +71,38 @@ bool UITiledImage::display(int x, int y, int width, int height) {
 	int tileWidth = _middleMiddle.right - _middleMiddle.left;
 	int tileHeight = _middleMiddle.bottom - _middleMiddle.top;
 
-	int nuColumns = (width - (_middleLeft.right - _middleLeft.left) - (_middleRight.right - _middleRight.left)) / tileWidth;
-	int nuRows = (height - (_upMiddle.bottom - _upMiddle.top) - (_downMiddle.bottom - _downMiddle.top)) / tileHeight;
+	int numColumns = (width - (_middleLeft.right - _middleLeft.left) - (_middleRight.right - _middleRight.left)) / tileWidth;
+	int numRows = (height - (_upMiddle.bottom - _upMiddle.top) - (_downMiddle.bottom - _downMiddle.top)) / tileHeight;
 
 	_game->_renderer->startSpriteBatch();
 
 	// top left/right
-	_image->_surface->displayTrans(x,                                                       y, _upLeft);
-	_image->_surface->displayTrans(x + (_upLeft.right - _upLeft.left) + nuColumns * tileWidth, y, _upRight);
+	_image->_surface->displayTrans(x, y, _upLeft);
+	_image->_surface->displayTrans(x + (_upLeft.right - _upLeft.left) + numColumns * tileWidth, y, _upRight);
 
 	// bottom left/right
-	_image->_surface->displayTrans(x,                                                       y + (_upMiddle.bottom - _upMiddle.top) + nuRows * tileHeight, _downLeft);
-	_image->_surface->displayTrans(x + (_upLeft.right - _upLeft.left) + nuColumns * tileWidth, y + (_upMiddle.bottom - _upMiddle.top) + nuRows * tileHeight, _downRight);
+	_image->_surface->displayTrans(x, y + (_upMiddle.bottom - _upMiddle.top) + numRows * tileHeight, _downLeft);
+	_image->_surface->displayTrans(x + (_upLeft.right - _upLeft.left) + numColumns * tileWidth, y + (_upMiddle.bottom - _upMiddle.top) + numRows * tileHeight, _downRight);
 
 	// left/right
-	if (nuRows > 0) {
+	if (numRows > 0) {
 		int yyy = y + (_upMiddle.bottom - _upMiddle.top);
-		_image->_surface->displayTiled(x, yyy, _middleLeft, 1, nuRows);
-		_image->_surface->displayTiled(x + (_middleLeft.right - _middleLeft.left) + nuColumns * tileWidth, yyy, _middleRight, 1, nuRows);
+		_image->_surface->displayTiled(x, yyy, _middleLeft, 1, numRows);
+		_image->_surface->displayTiled(x + (_middleLeft.right - _middleLeft.left) + numColumns * tileWidth, yyy, _middleRight, 1, numRows);
 	}
 
 	// top/bottom
-	if (nuColumns > 0) {
+	if (numColumns > 0) {
 		int xxx = x + (_upLeft.right - _upLeft.left);
-		_image->_surface->displayTiled(xxx, y, _upMiddle, nuColumns, 1);
-		_image->_surface->displayTiled(xxx, y + (_upMiddle.bottom - _upMiddle.top) + nuRows * tileHeight, _downMiddle, nuColumns, 1);
+		_image->_surface->displayTiled(xxx, y, _upMiddle, numColumns, 1);
+		_image->_surface->displayTiled(xxx, y + (_upMiddle.bottom - _upMiddle.top) + numRows * tileHeight, _downMiddle, numColumns, 1);
 	}
 
 	// tiles
-	if (nuRows > 0 && nuColumns > 0) {
+	if (numRows > 0 && numColumns > 0) {
 		int yyy = y + (_upMiddle.bottom - _upMiddle.top);
 		int xxx = x + (_upLeft.right - _upLeft.left);
-		_image->_surface->displayTiled(xxx, yyy, _middleMiddle, nuColumns, nuRows);
+		_image->_surface->displayTiled(xxx, yyy, _middleMiddle, numColumns, numRows);
 	}
 
 	_game->_renderer->endSpriteBatch();
@@ -358,11 +358,11 @@ void UITiledImage::correctSize(int32 *width, int32 *height) {
 	int tileWidth = _middleMiddle.right - _middleMiddle.left;
 	int tileHeight = _middleMiddle.bottom - _middleMiddle.top;
 
-	int nuColumns = (*width - (_middleLeft.right - _middleLeft.left) - (_middleRight.right - _middleRight.left)) / tileWidth;
-	int nuRows = (*height - (_upMiddle.bottom - _upMiddle.top) - (_downMiddle.bottom - _downMiddle.top)) / tileHeight;
+	int numColumns = (*width - (_middleLeft.right - _middleLeft.left) - (_middleRight.right - _middleRight.left)) / tileWidth;
+	int numRows = (*height - (_upMiddle.bottom - _upMiddle.top) - (_downMiddle.bottom - _downMiddle.top)) / tileHeight;
 
-	*width  = (_middleLeft.right - _middleLeft.left) + (_middleRight.right - _middleRight.left) + nuColumns * tileWidth;
-	*height = (_upMiddle.bottom - _upMiddle.top) + (_downMiddle.bottom - _downMiddle.top) + nuRows * tileHeight;
+	*width = (_middleLeft.right - _middleLeft.left) + (_middleRight.right - _middleRight.left) + numColumns * tileWidth;
+	*height = (_upMiddle.bottom - _upMiddle.top) + (_downMiddle.bottom - _downMiddle.top) + numRows * tileHeight;
 }
 
 
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index e034ef8a3f5..cab4784ecf6 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -1203,9 +1203,9 @@ bool UIWindow::handleKeypress(Common::Event *event, bool printable) {
 
 
 //////////////////////////////////////////////////////////////////////////
-bool UIWindow::handleMouseWheel(int32 Delta) {
+bool UIWindow::handleMouseWheel(int32 delta) {
 	if (_focusedWidget) {
-		return _focusedWidget->handleMouseWheel(Delta);
+		return _focusedWidget->handleMouseWheel(delta);
 	} else {
 		return false;
 	}
diff --git a/engines/wintermute/ui/ui_window.h b/engines/wintermute/ui/ui_window.h
index a26e7c8d7b9..9372e0a8957 100644
--- a/engines/wintermute/ui/ui_window.h
+++ b/engines/wintermute/ui/ui_window.h
@@ -40,7 +40,7 @@ class UIWindow : public UIObject {
 public:
 	//CBObject *GetPrevAccessObject(CBObject *CurrObject);
 	//CBObject *GetNextAccessObject(CBObject *CurrObject);
-	bool getWindowObjects(BaseArray<UIObject *> &Objects, bool InteractiveOnly);
+	bool getWindowObjects(BaseArray<UIObject *> &objects, bool interactiveOnly);
 
 	bool _pauseMusic;
 	void cleanup();
@@ -59,7 +59,7 @@ public:
 	bool goExclusive();
 	TWindowMode _mode;
 	bool moveFocus(bool forward = true);
-	bool handleMouse(TMouseEvent Event, TMouseButton Button) override;
+	bool handleMouse(TMouseEvent event, TMouseButton button) override;
 	Common::Point32 _dragFrom;
 	bool _dragging;
 	DECLARE_PERSISTENT(UIWindow, UIObject)

More information about the Scummvm-git-logs mailing list