[Scummvm-git-logs] scummvm master -> 8da29e1b89b60d34a0ff2b8898fc2149e608ea0c

digitall dgturner at iee.org
Mon Sep 16 00:04:56 CEST 2019


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:
8da29e1b89 WINTERMUTE: Fix MSVC Warning


Commit: 8da29e1b89b60d34a0ff2b8898fc2149e608ea0c
    https://github.com/scummvm/scummvm/commit/8da29e1b89b60d34a0ff2b8898fc2149e608ea0c
Author: D G Turner (digitall at scummvm.org)
Date: 2019-09-15T23:00:36+01:00

Commit Message:
WINTERMUTE: Fix MSVC Warning

This is due to the _lastLine variable being unsigned, but having
-1 assigned to it as a default / invalid value. This could probably
be assigned 0 with no issues, but since this is exposed, this warning
is fixed instead by assigning the unsigned equivalent of -1 so no
dependent code will see a change.

Changed paths:
    engines/wintermute/debugger/debugger_controller.cpp


diff --git a/engines/wintermute/debugger/debugger_controller.cpp b/engines/wintermute/debugger/debugger_controller.cpp
index 8d1968d..3d13ab3 100644
--- a/engines/wintermute/debugger/debugger_controller.cpp
+++ b/engines/wintermute/debugger/debugger_controller.cpp
@@ -188,7 +188,7 @@ Error DebuggerController::stepFinish() {
 
 void DebuggerController::clear() {
 	_lastScript = nullptr;
-	_lastLine = -1;
+	_lastLine = 0xFFFFFFFF; // Invalid
 }
 
 Common::String DebuggerController::readValue(const Common::String &name, Error *error) {





More information about the Scummvm-git-logs mailing list