[Scummvm-git-logs] scummvm master -> da153dd2829ec58a5c3edc92a029568d6daef376

digitall 547637+digitall at users.noreply.github.com
Tue Jun 2 02:44:53 UTC 2020


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

Summary:
da153dd282 ULTIMA8: Fix Unused Variable Compiler Warnings


Commit: da153dd2829ec58a5c3edc92a029568d6daef376
    https://github.com/scummvm/scummvm/commit/da153dd2829ec58a5c3edc92a029568d6daef376
Author: D G Turner (digitall at scummvm.org)
Date: 2020-06-02T03:42:11+01:00

Commit Message:
ULTIMA8: Fix Unused Variable Compiler Warnings

These are emitted from GCC when -Wunused-but-set-variable and
-Wunused-variable are passed to the compiler.

Changed paths:
    engines/ultima/ultima8/ultima8.cpp


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 65ffe9d005..d458340dff 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -707,7 +707,7 @@ void Ultima8Engine::leaveTextMode(Gump *gump) {
 }
 
 void Ultima8Engine::handleEvent(const Common::Event &event) {
-	bool handled = false;
+	//bool handled = false;
 
 	switch (event.type) {
 	case Common::EVENT_KEYDOWN:
@@ -803,8 +803,8 @@ void Ultima8Engine::handleEvent(const Common::Event &event) {
 			button = Shared::BUTTON_MIDDLE;
 
 		_mouse->setMouseCoords(event.mouse.x, event.mouse.y);
-		if (_mouse->buttonDown(button))
-			handled = true;
+		_mouse->buttonDown(button);
+		//if (_mouse->buttonDown(button)) handled = true;
 		break;
 	}
 
@@ -818,8 +818,8 @@ void Ultima8Engine::handleEvent(const Common::Event &event) {
 			button = Shared::BUTTON_MIDDLE;
 
 		_mouse->setMouseCoords(event.mouse.x, event.mouse.y);
-		if (_mouse->buttonUp(button))
-			handled = true;
+		_mouse->buttonUp(button);
+		//if (_mouse->buttonUp(button)) handled = true;
 		break;
 	}
 
@@ -839,7 +839,7 @@ void Ultima8Engine::handleEvent(const Common::Event &event) {
 }
 
 void Ultima8Engine::handleDelayedEvents() {
-	uint32 now = g_system->getMillis();
+	//uint32 now = g_system->getMillis();
 
 	_mouse->handleDelayedEvents();
 }




More information about the Scummvm-git-logs mailing list