[Scummvm-git-logs] scummvm master -> 898b79f8dc902d0aff067ac5b7d7ec83d9ac0a73

dreammaster dreammaster at scummvm.org
Mon Aug 7 04:20:52 CEST 2017


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:
898b79f8dc LURE: Adjust switch fall through comments


Commit: 898b79f8dc902d0aff067ac5b7d7ec83d9ac0a73
    https://github.com/scummvm/scummvm/commit/898b79f8dc902d0aff067ac5b7d7ec83d9ac0a73
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-06T22:20:16-04:00

Commit Message:
LURE: Adjust switch fall through comments

Changed paths:
    engines/lure/hotspots.cpp


diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 949b16b..b0b1830 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -2713,7 +2713,7 @@ void HotspotTickHandlers::standardCharacterAnimHandler(Hotspot &h) {
 		pathFinder.reset(paths);
 		h.currentActions().top().setAction(PROCESSING_PATH);
 
-		// Deliberate fall through to processing walking path
+		// fall through
 
 	case PROCESSING_PATH:
 		// Handle processing pathfinding
@@ -2801,6 +2801,8 @@ void HotspotTickHandlers::standardCharacterAnimHandler(Hotspot &h) {
 		if (h.currentActions().isEmpty() || h.currentActions().top().action() != WALKING)
 			break;
 
+		// fall through
+
 	case WALKING:
 		// The character is currently moving
 		debugC(ERROR_DETAILED, kLureDebugAnimations, "Hotspot standard character walking");
@@ -3061,7 +3063,8 @@ void HotspotTickHandlers::playerAnimHandler(Hotspot &h) {
 		// Set current action to processing walking path
 		actions.pop();
 		h.currentActions().addFront(PROCESSING_PATH, h.roomNumber());
-		// Deliberate fall through to processing walking path
+
+		// fall through
 
 	case PROCESSING_PATH:
 		h.setCharacterMode(CHARMODE_NONE);
@@ -3111,7 +3114,7 @@ void HotspotTickHandlers::playerAnimHandler(Hotspot &h) {
 		if (mouse.getCursorNum() != CURSOR_CAMERA)
 			mouse.setCursorNum(CURSOR_ARROW);
 
-		// Deliberate fall through to walking
+		// fall through
 
 	case WALKING:
 		// The character is currently moving
@@ -3600,6 +3603,8 @@ void HotspotTickHandlers::talkAnimHandler(Hotspot &h) {
 		if (res.getTalkingCharacter() != 0)
 			return;
 
+		// fall through
+
 	case TALK_RESPOND_3:
 		// Respond
 		selectedLine = res.getTalkSelection();
@@ -4046,6 +4051,7 @@ void HotspotTickHandlers::rackSerfAnimHandler(Hotspot &h) {
 		h.setLayer(2);
 
 		// fall through
+
 	case 4:
 		if (HotspotScript::execute(&h)) {
 			h.setLayer(255);





More information about the Scummvm-git-logs mailing list