[Scummvm-git-logs] scummvm master -> 79608f497a73fc124cd6a3683d48f7a8b7970e13

[dreammaster]

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:
79608f497a ULTIMA8: Switch fall-through messages


Commit: 79608f497a73fc124cd6a3683d48f7a8b7970e13
    https://github.com/scummvm/scummvm/commit/79608f497a73fc124cd6a3683d48f7a8b7970e13
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-18T17:59:48-08:00

Commit Message:
ULTIMA8: Switch fall-through messages

Changed paths:
    engines/ultima/ultima8/gumps/console_gump.cpp
    engines/ultima/ultima8/usecode/uc_machine.cpp
    engines/ultima/ultima8/world/item.cpp


diff --git a/engines/ultima/ultima8/gumps/console_gump.cpp b/engines/ultima/ultima8/gumps/console_gump.cpp
index 43757c5..d7f04a7 100644
--- a/engines/ultima/ultima8/gumps/console_gump.cpp
+++ b/engines/ultima/ultima8/gumps/console_gump.cpp
@@ -80,8 +80,10 @@ void ConsoleGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled)
 	case SCROLLING_TO_HIDE:
 		if (_scrollFrame == 0)
 			return;
-		// Just reverse next_frame and fall through
+		// Just reverse next_frame
 		next_frame = _scrollFrame - 1;
+		// Intentional fall-through
+
 	case SCROLLING_TO_SHOW:
 		if (next_frame > 8)
 			break;
diff --git a/engines/ultima/ultima8/usecode/uc_machine.cpp b/engines/ultima/ultima8/usecode/uc_machine.cpp
index 4943451..53c5546 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.cpp
+++ b/engines/ultima/ultima8/usecode/uc_machine.cpp
@@ -1757,7 +1757,8 @@ void UCMachine::execProcess(UCProcess *p) {
 			LOGPF(("loop\t\t%s %02X %02X\n", print_bp(si16a),
 			       scriptsize, searchtype));
 		}
-		// FALL-THROUGH to handle first item
+		// Intentional fall-through
+
 		case 0x73:
 			// 73
 			// next loop object. pushes false if end reached
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 29ab6b4..c7fce2d 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -1237,6 +1237,7 @@ void Item::animateItem() {
 	case 2:
 		// 50 % chance
 		if (getRandom() & 1) break;
+		// Intentional fall-through
 
 	case 1:
 	case 3: