[Scummvm-git-logs] scummvm master -> 43f092181645a3a598b2ba9cfc0abb7554b6f5f9

digitall 547637+digitall at users.noreply.github.com
Thu Mar 18 22:06:28 UTC 2021


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:
43f0921816 ULTIMA: NUVIE: Fix GCC Compiler Switch Fallthrough Warnings


Commit: 43f092181645a3a598b2ba9cfc0abb7554b6f5f9
    https://github.com/scummvm/scummvm/commit/43f092181645a3a598b2ba9cfc0abb7554b6f5f9
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-18T22:06:02Z

Commit Message:
ULTIMA: NUVIE: Fix GCC Compiler Switch Fallthrough Warnings

Changed paths:
    engines/ultima/nuvie/gui/gui_text_input.cpp
    engines/ultima/nuvie/gui/widgets/msg_scroll.cpp


diff --git a/engines/ultima/nuvie/gui/gui_text_input.cpp b/engines/ultima/nuvie/gui/gui_text_input.cpp
index 8e62ea7b14..1d6aea492b 100644
--- a/engines/ultima/nuvie/gui/gui_text_input.cpp
+++ b/engines/ultima/nuvie/gui/gui_text_input.cpp
@@ -136,6 +136,7 @@ GUI_status GUI_TextInput::KeyDown(const Common::KeyState &keyState) {
 	case Common::KEYCODE_RETURN:
 		if (callback_object)
 			callback_object->callback(TEXTINPUT_CB_TEXT_READY, this, text);
+		// falls through
 	case Common::KEYCODE_ESCAPE :
 		release_focus();
 		break;
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp b/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
index 3cfd34ca17..3364bc5f41 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
@@ -476,7 +476,8 @@ bool MsgScroll::parse_token(MsgText *token) {
 			set_font(NUVIE_FONT_NORMAL); // english font
 			break;
 		}
-	// Note fall through. ;-) We fall through if we haven't already seen a '<' char
+		// falls through
+		// ...if we haven't already seen a '<' char
 
 	default   :
 		if (msg_line) {




More information about the Scummvm-git-logs mailing list