[Scummvm-git-logs] scummvm master -> 008e2b85b612f3bd4c953201fba33e000451fb2c

digitall 547637+digitall at users.noreply.github.com
Thu Oct 24 03:08:17 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:
008e2b85b6 ZVISION: Fix Missing Default Switch Cases


Commit: 008e2b85b612f3bd4c953201fba33e000451fb2c
    https://github.com/scummvm/scummvm/commit/008e2b85b612f3bd4c953201fba33e000451fb2c
Author: D G Turner (digitall at scummvm.org)
Date: 2019-10-24T02:04:53+01:00

Commit Message:
ZVISION: Fix Missing Default Switch Cases

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

Changed paths:
    engines/zvision/graphics/render_table.cpp
    engines/zvision/scripting/controls/lever_control.cpp
    engines/zvision/scripting/menu.cpp
    engines/zvision/scripting/script_manager.cpp


diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index b0c0b92..96c2c41 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -63,6 +63,8 @@ void RenderTable::setRenderState(RenderState newState) {
 	case FLAT:
 		// Intentionally left empty
 		break;
+	default:
+		break;
 	}
 }
 
@@ -137,6 +139,8 @@ void RenderTable::generateRenderTable() {
 	case ZVision::RenderTable::FLAT:
 		// Intentionally left empty
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp
index 553b5ec..fb88f2f 100644
--- a/engines/zvision/scripting/controls/lever_control.cpp
+++ b/engines/zvision/scripting/controls/lever_control.cpp
@@ -360,6 +360,8 @@ int LeverControl::calculateVectorAngle(const Common::Point &pointOne, const Comm
 		case 3:
 			angle = 180 + angle;
 			break;
+		default:
+			break;
 		}
 
 		return angle;
diff --git a/engines/zvision/scripting/menu.cpp b/engines/zvision/scripting/menu.cpp
index f149cf3..c81de35 100644
--- a/engines/zvision/scripting/menu.cpp
+++ b/engines/zvision/scripting/menu.cpp
@@ -201,6 +201,9 @@ void MenuZGI::onMouseUp(const Common::Point &Pos) {
 					_engine->getScriptManager()->changeLocation('g', 'j', 's', 'e', 0);
 				}
 			break;
+
+		default:
+			break;
 		}
 	}
 }
diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp
index a0ebbd3..16423dc 100644
--- a/engines/zvision/scripting/script_manager.cpp
+++ b/engines/zvision/scripting/script_manager.cpp
@@ -245,6 +245,8 @@ bool ScriptManager::checkPuzzleCriteria(Puzzle *puzzle, uint counter) {
 			case Puzzle::LESS_THAN:
 				criteriaMet = getStateValue(entryIter->key) < argumentValue;
 				break;
+			default:
+				break;
 			}
 
 			// If one check returns false, don't keep checking





More information about the Scummvm-git-logs mailing list