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

[digitall]

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

Summary:
eaff2c539f TOLTECS: Fix Missing Default Switch Cases
e4a874c6b8 TEENAGENT: Fix Missing Default Switch Cases


Commit: eaff2c539f68e67431853192038df9c8454d33dc
    https://github.com/scummvm/scummvm/commit/eaff2c539f68e67431853192038df9c8454d33dc
Author: D G Turner (digitall at scummvm.org)
Date: 2019-11-14T03:27:41Z

Commit Message:
TOLTECS: Fix Missing Default Switch Cases

These are flagged by GCC if -Wswitch-default is enabled.

Changed paths:
    engines/toltecs/render.cpp


diff --git a/engines/toltecs/render.cpp b/engines/toltecs/render.cpp
index bf68eee..42805ed 100644
--- a/engines/toltecs/render.cpp
+++ b/engines/toltecs/render.cpp
@@ -238,6 +238,8 @@ RenderQueueItem *RenderQueue::findItemInQueue(RenderQueueArray *queue, const Ren
 				if (prevItem->mask.surface == item.mask.surface)
 					return prevItem;
 				break;
+			default:
+				break;
 			}
 		}
 	}


Commit: e4a874c6b87ee556a92588253dcc16ee5a0a7ab3
    https://github.com/scummvm/scummvm/commit/e4a874c6b87ee556a92588253dcc16ee5a0a7ab3
Author: D G Turner (digitall at scummvm.org)
Date: 2019-11-14T03:28:11Z

Commit Message:
TEENAGENT: Fix Missing Default Switch Cases

These are flagged by GCC if -Wswitch-default is enabled.

Changed paths:
    engines/teenagent/animation.cpp
    engines/teenagent/dialog.cpp
    engines/teenagent/resources.cpp
    engines/teenagent/teenagent.cpp


diff --git a/engines/teenagent/animation.cpp b/engines/teenagent/animation.cpp
index 5708c10..6c3a091 100644
--- a/engines/teenagent/animation.cpp
+++ b/engines/teenagent/animation.cpp
@@ -199,6 +199,9 @@ void Animation::load(Common::SeekableReadStream &s, Type type) {
 		}
 
 		break;
+
+	default:
+		break;
 	}
 
 	debugC(2, kDebugAnimation, "%u frames", dataSize / 3);
diff --git a/engines/teenagent/dialog.cpp b/engines/teenagent/dialog.cpp
index 0993c26..3c0f392 100644
--- a/engines/teenagent/dialog.cpp
+++ b/engines/teenagent/dialog.cpp
@@ -115,17 +115,20 @@ void Dialog::show(Scene *scene, uint16 addr, uint16 animation1, uint16 animation
 				color = (color == color1) ? color2 : color1;
 				debugC(1, kDebugDialog, "changing color to %02x", color);
 				break;
+
+			default:
+				break;
 			}
 			break;
 
-		case 0xff: {
+		case 0xff:
 			//FIXME : wait for the next cycle of the animation
-		}
-		break;
+			break;
 
 		default:
 			message += c;
 			n = 0;
+			break;
 		}
 	}
 
diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp
index b7e0d55..8388ee0 100644
--- a/engines/teenagent/resources.cpp
+++ b/engines/teenagent/resources.cpp
@@ -176,7 +176,6 @@ Common::SeekableReadStream *Resources::loadLan(uint32 id) const {
 
 Common::SeekableReadStream *Resources::loadLan000(uint32 id) const {
 	switch (id) {
-
 	case 81:
 		if (dseg.get_byte(dsAddr_dogHasBoneFlag))
 			return lan500.getStream(160);
@@ -222,6 +221,9 @@ Common::SeekableReadStream *Resources::loadLan000(uint32 id) const {
 			return lan500.getStream(400);
 		}
 		break;
+
+	default:
+		break;
 	}
 	return lan000.getStream(id);
 }
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index 12f5123..f70f244 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -167,6 +167,7 @@ void TeenAgentEngine::processObject() {
 	break;
 
 	case kActionNone:
+	default:
 		break;
 	}
 }