[Xcode4] May as well fix switch warnings.

Still need some assistance for the linker error.

src/Actor.cpp

@@ -728,6 +728,7 @@ void Actor::UpdateInternal( float fDeltaTime )
 			wrap( m_current.rotation.y, 360 );
 			wrap( m_current.rotation.z, 360 );
 			break;
+		default: break;
 	}
 
 	UpdateTweening( fDeltaTime );

src/BGAnimationLayer.cpp

@@ -193,7 +193,7 @@ void BGAnimationLayer::LoadFromAniLayerFile( const RString& sPath )
 				case EFFECT_STRETCH_SCROLL_RIGHT:	m_fTexCoordVelocityX = -0.5f; m_fTexCoordVelocityY = 0;	break;
 				case EFFECT_STRETCH_SCROLL_UP:		m_fTexCoordVelocityX = 0; m_fTexCoordVelocityY = +0.5f;	break;
 				case EFFECT_STRETCH_SCROLL_DOWN:	m_fTexCoordVelocityX = 0; m_fTexCoordVelocityY = -0.5f;	break;
-				break;
+				default: break;
 			}
 		}
 		break;

src/Course.cpp

@@ -429,12 +429,14 @@ bool Course::GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail )
 {
 	trail.Init();
 
+	// XXX: Why are beginner and challenge excluded here? -Wolfman2000
 	switch( cd )
 	{
 		case Difficulty_Beginner:
 			return false;
 		case Difficulty_Challenge:
 			return false;
+		default: break;
 	}
 
 	// Construct a new Trail, add it to the cache, then return it.

src/DancingCharacters.cpp

@@ -134,6 +134,7 @@ DancingCharacters::DancingCharacters(): m_bDrawDangerLight(false),
 			case PLAY_MODE_BATTLE:
 			case PLAY_MODE_RAVE:
 				m_pCharacter[p]->SetRotationY( MODEL_ROTATIONY_TWO_PLAYERS[p] );
+			default:
 				break;
 		}
 

src/EditMenu.cpp

@@ -278,9 +278,9 @@ bool EditMenu::RowIsSelectable( EditMenuRow row )
 			case ROW_SOURCE_STEPS_TYPE:
 			case ROW_SOURCE_STEPS:
 				return false;
+			default: return true;
 		}
 	}
-
 	return true;
 }
 

src/GameCommand.cpp

@@ -478,9 +478,8 @@ static bool AreStyleAndPlayModeCompatible( const Style *style, PlayMode pm )
 			if( style->m_StyleType==StyleType_OnePlayerTwoSides ||
 				style->m_StyleType==StyleType_TwoPlayersSharedSides )
 				return false;
+		default: return true;
 	}
-
-	return true;
 }
 
 bool GameCommand::IsPlayable( RString *why ) const
@@ -503,6 +502,7 @@ bool GameCommand::IsPlayable( RString *why ) const
 			case CoinMode_Home:
 			case CoinMode_Free:
 				iCredits = NUM_PLAYERS; // not iNumCreditsPaid
+			default: break;
 		}
 
 		/* With PREFSMAN->m_bDelayedCreditsReconcile disabled, enough credits must

src/GameState.cpp

@@ -748,6 +748,8 @@ void GameState::CancelStage()
 			case PLAY_MODE_BATTLE:
 			case PLAY_MODE_RAVE:
 				m_iPlayerStageTokens[p] = PREFSMAN->m_iSongsPerPlay;
+			default:
+				break;
 		}
 	}
 
@@ -1172,10 +1174,10 @@ bool GameState::IsPlayerEnabled( PlayerNumber pn ) const
 		case PLAY_MODE_BATTLE:
 		case PLAY_MODE_RAVE:
 			return true;
-	}
+		default:
-
 			return IsHumanPlayer(pn);
 	}
+}
 
 bool GameState::IsMultiPlayerEnabled( MultiPlayer mp ) const
 {
@@ -1354,8 +1356,9 @@ StageResult GameState::GetStageResult( PlayerNumber pn ) const
 			{
 			case PLAYER_1:	return (m_fTugLifePercentP1>=0.5f)?RESULT_WIN:RESULT_LOSE;
 			case PLAYER_2:	return (m_fTugLifePercentP1<0.5f)?RESULT_WIN:RESULT_LOSE;
-		default:	ASSERT(0); return RESULT_LOSE;
+			default:	FAIL_M("Invalid player for battle! Aborting..."); return RESULT_LOSE;
 			}
+		default: break;
 	}
 
 	StageResult win = RESULT_WIN;

src/Inventory.cpp

@@ -73,6 +73,7 @@ void Inventory::Load( PlayerState* pPlayerState )
 	switch( GAMESTATE->m_PlayMode )
 	{
 		case PLAY_MODE_BATTLE:
+		{
 			m_soundAcquireItem.Load( THEME->GetPathS("Inventory","aquire item") );
 			for( unsigned i=0; i<g_Items.size(); i++ )
 			{
@@ -83,6 +84,8 @@ void Inventory::Load( PlayerState* pPlayerState )
 			m_soundItemEnding.Load( THEME->GetPathS("Inventory","item ending") );
 			break;
 		}
+		default: break;
+	}
 }
 
 void Inventory::Update( float fDelta )

src/LifeMeterBar.cpp

@@ -218,6 +218,7 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
 				fDeltaLife *= m_fLifeDifficulty;
 			else
 				fDeltaLife /= m_fLifeDifficulty;
+		default:
 		break;
 	}
 

src/MemoryCardManager.cpp

@@ -465,6 +465,7 @@ void MemoryCardManager::CheckStateChanges()
 				case UsbStorageDevice::STATE_READY:
 					state = MemoryCardState_Ready;
 					break;
+				default: break;
 			}
 		}
 
@@ -493,6 +494,7 @@ void MemoryCardManager::CheckStateChanges()
 				case MemoryCardState_Error:
 					m_soundError.Play( &params );
 					break;
+				default: break;
 			}
 
 			m_State[p] = state;

src/MusicWheel.cpp

@@ -46,6 +46,7 @@ static SortOrder ForceAppropriateSort( PlayMode pm, SortOrder so )
 		case PLAY_MODE_ONI:	return SORT_ONI_COURSES;
 		case PLAY_MODE_NONSTOP:	return SORT_NONSTOP_COURSES;
 		case PLAY_MODE_ENDLESS:	return SORT_ENDLESS_COURSES;
+		default: break;
 	}
 
 	// If we're not in a course mode, don't start in a course sort.
@@ -55,11 +56,10 @@ static SortOrder ForceAppropriateSort( PlayMode pm, SortOrder so )
 		case SORT_NONSTOP_COURSES:
 		case SORT_ENDLESS_COURSES:
 			so = SortOrder_Invalid;
-		break;
+		default:
-	}
-
 			return so;
 	}
+}
 
 MusicWheelItem *MusicWheel::MakeItem()
 {
@@ -601,7 +601,7 @@ void MusicWheel::BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelIt
 					SongUtil::SortSongPointerArrayByStepsTypeAndMeter( arraySongs, st, dc );
 					break;
 				default:
-				ASSERT(0);	// unhandled SortOrder
+					FAIL_M("Unhandled sort order! Aborting...");
 			}
 
 			// Build an array of WheelItemDatas from the sorted list of Song*'s
@@ -617,6 +617,8 @@ void MusicWheel::BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelIt
 					if( so != SORT_TITLE && so != SORT_GROUP )
 						bUseSections = false;
 					break;
+				default:
+					break;
 			}
 
 			if( bUseSections )
@@ -783,7 +785,7 @@ void MusicWheel::BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelIt
 				case COURSE_SORT_RANK:
 					CourseUtil::SortCoursePointerArrayByRanking( apCourses );
 					break;
-			default:	ASSERT(0);
+				default:	FAIL_M("Impossible to sort the courses! Aborting...");
 			}
 
 			// since we can't agree, make it an option
@@ -813,6 +815,7 @@ void MusicWheel::BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelIt
 						case PLAY_MODE_ONI:	sThisSection = "Oni";		break;
 						case PLAY_MODE_NONSTOP:	sThisSection = "Nonstop";	break;
 						case PLAY_MODE_ENDLESS:	sThisSection = "Endless";	break;
+						default: break;
 					}
 				}
 
@@ -833,6 +836,8 @@ void MusicWheel::BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelIt
 			}
 			break;
 		}
+		default:
+			break;
 	}
 
 	// init music status icons
@@ -1244,6 +1249,7 @@ bool MusicWheel::Select()	// return true if this selection ends the screen
 			m_Moving = 0;
 			SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 );
 			return true;
+		default: break;
 	}
 
 	if( !WheelBase::Select() )
@@ -1257,10 +1263,6 @@ bool MusicWheel::Select()	// return true if this selection ends the screen
 		case TYPE_RANDOM:
 			StartRandom();
 			return false;
-	case TYPE_SONG:
-	case TYPE_COURSE:
-	case TYPE_PORTAL:
-		break;
 		case TYPE_SORT:
 			GetCurWheelItemData(m_iSelection)->m_pAction->ApplyToAllPlayers();
 			ChangeSort( GAMESTATE->m_PreferredSortOrder );
@@ -1272,8 +1274,8 @@ bool MusicWheel::Select()	// return true if this selection ends the screen
 				return true;
 			else
 				return false;
+		default: return true;
 	}
-	return true;
 }
 
 void MusicWheel::StartRoulette() 
@@ -1519,10 +1521,10 @@ Song* MusicWheel::GetSelectedSong()
 	{
 		case TYPE_PORTAL:
 			return GetPreferredSelectionForRandomOrPortal();
-	}
+		default:
-
 			return GetCurWheelItemData(m_iSelection)->m_pSong;
 	}
+}
 
 /* Find a random song.  If possible, find one that has the preferred difficulties of
  * each player.  Prefer songs in the active group, if any. 

src/NoteData.cpp

@@ -550,7 +550,9 @@ bool NoteData::RowNeedsAtLeastSimultaneousPresses( int iMinSimultaneousPresses,
 			case TapNote::mine:
 			case TapNote::empty:
 			case TapNote::fake:
+			case TapNote::lift: // you don't "press" on a lift.
 				continue;	// skip these types - they don't count
+			default: break;
 		}
 		++iNumNotesThisIndex;
 	}

src/NoteDataUtil.cpp

@@ -805,6 +805,7 @@ RadarStats CalculateRadarStatsFast( const NoteData &in, RadarStats &out )
 				case TapNote::fake:
 				case TapNote::autoKeysound:
 					continue;	// skip these types - they don't count
+				default: break;
 			}
 
 			if( (itr = simultaneousMap.find(r)) == simultaneousMap.end() )
@@ -834,6 +835,7 @@ RadarStats CalculateRadarStatsFast( const NoteData &in, RadarStats &out )
 						case TapNote::empty:
 						case TapNote::fake:
 							continue;	// skip these types - they don't count
+						default: break;
 					}
 					if( (itr = simultaneousMap.find(rr)) == simultaneousMap.end() )
 						simultaneousMap[rr] = 1;

src/NoteField.cpp

@@ -1265,6 +1265,7 @@ void NoteField::DrawPrimitives()
 					//if (tn.subType == TapNote::hold_head_roll)
 						continue; // skip
 				}
+				default: break;
 			}
 
 			// Don't draw hidden (fully judged) steps.

src/NotesLoaderBMS.cpp

@@ -1111,9 +1111,9 @@ bool BMSLoader::LoadNoteDataFromSimfile( const RString & cachePath, Steps & out
 	if( commonSubstring == "" )
 	{
 		copy->SetDifficulty(Difficulty_Medium);
-		RString sTag;
+		RString localTag;
-		if (GetTagFromMap(BMSData[0], "#title#", sTag))
+		if (GetTagFromMap(BMSData[0], "#title#", localTag))
-			SearchForDifficulty(sTag, copy);
+			SearchForDifficulty(localTag, copy);
 	}
 	ReadGlobalTags( BMSData[0], dummy );
 	if( commonSubstring.size() > 2 && commonSubstring[commonSubstring.size() - 2] == ' ' )

src/NotesLoaderJson.cpp

@@ -35,6 +35,7 @@ static void Deserialize(TimingSegment &seg_, const Json::Value &root)
 			static_cast<StopSegment *>(seg)->SetPause(fStop);
 			break;
 		}
+		default: break; // The rest are unused.
 	}
 }
 

src/NotesLoaderMidi.cpp

@@ -833,9 +833,10 @@ skip_track:
 
 						bNonTerminatedNote = false;
 						bNoteHandled = true;
-					}
 						break;
 					}
+					default: break;
+				}
 
 
 				switch( midiEventType )
@@ -867,7 +868,9 @@ skip_track:
 		
 						bNonTerminatedNote = true;
 						bNoteHandled = true;
+						break;
 					}
+					default: break;
 				}
 
 				countOfLastNote = count;

src/NotesWriterDWI.cpp

@@ -126,6 +126,7 @@ static RString NotesToDWIString( const TapNote tnCols[6] )
 			case TapNote::empty:
 			case TapNote::mine:
 				continue;
+			default: break;
 		}
 
 		if( tnCols[col].type == TapNote::hold_head )

src/OptionRow.cpp

@@ -427,6 +427,7 @@ void OptionRow::AfterImportOptions( PlayerNumber pn )
 	switch( m_pHand->m_Def.m_selectType )
 	{
 		case SELECT_ONE:
+		{
 			// Make sure the row actually has a selection.
 			int iSelection = GetOneSelection(pn, true);
 			if( iSelection == -1 )
@@ -434,6 +435,8 @@ void OptionRow::AfterImportOptions( PlayerNumber pn )
 				ASSERT( !m_vbSelected[pn].empty() );
 				m_vbSelected[pn][0] = true;
 			}
+		}
+		default:
 			break;
 	}
 
@@ -519,7 +522,7 @@ void OptionRow::UpdateText( PlayerNumber p )
 
 			m_textItems[index]->SetText( sText );
 		}
-		break;
+		default: break;
 	}
 }
 
@@ -760,6 +763,7 @@ void OptionRow::ResetFocusFromSelection( PlayerNumber pn )
 		case SELECT_ONE:
 			// Import the focus from the selected option.
 			iSelection = GetOneSelection( pn, true );
+		default:
 			break;
 	}
 

src/PaneDisplay.cpp

@@ -144,6 +144,7 @@ void PaneDisplay::SetContent( PaneCategory c )
 				case PaneCategory_ProfileHighScore:
 					str = NOT_AVAILABLE;
 					break;
+				default: break;
 			}
 		}
 
@@ -164,6 +165,7 @@ void PaneDisplay::SetContent( PaneCategory c )
 				case PaneCategory_ProfileHighScore:
 					str = NOT_AVAILABLE;
 					break;
+				default: break;
 			}
 		}
 
@@ -186,6 +188,7 @@ void PaneDisplay::SetContent( PaneCategory c )
 		{
 			case PaneCategory_ProfileHighScore:
 				slot = (ProfileSlot) m_PlayerNumber;
+			default: break;
 		}
 
 		if( pSteps )
@@ -215,6 +218,7 @@ void PaneDisplay::SetContent( PaneCategory c )
 				CHECKPOINT;
 				val = pHSL->GetTopScore().GetPercentDP();
 				break;
+			default: break;
 		};
 
 		if( val != RADAR_VAL_UNKNOWN )
@@ -250,6 +254,8 @@ void PaneDisplay::SetContent( PaneCategory c )
 				case PaneCategory_Lifts:
 				case PaneCategory_Fakes:
 					str = ssprintf( COUNT_FORMAT.GetValue(), val );
+					break;
+				default: break;
 			}
 		}
 	}

src/Player.cpp

@@ -659,9 +659,10 @@ void Player::Load()
 				count++;
 				count %= 4;
 			}
-		}
 			break;
 		}
+		default: break;
+	}
 
 	int iDrawDistanceAfterTargetsPixels = GAMESTATE->IsEditing() ? -100 : DRAW_DISTANCE_AFTER_TARGET_PIXELS;
 	int iDrawDistanceBeforeTargetsPixels = GAMESTATE->IsEditing() ? 400 : DRAW_DISTANCE_BEFORE_TARGET_PIXELS;
@@ -2880,6 +2881,7 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
 		switch( tn.type )
 		{
 			case TapNote::hold_head:
+			{
 				tn.HoldResult.fLife = INITIAL_HOLD_LIFE;
 				if( !REQUIRE_STEP_ON_HOLD_HEADS )
 				{
@@ -2897,7 +2899,9 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
 					}
 				}
 				break;
+			}
 			case TapNote::mine:
+			{
 				// Hold the panel while crossing a mine will cause the mine to explode
 				// TODO: Remove use of PlayerNumber.
 				PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
@@ -2915,6 +2919,8 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
 				}
 				break;
 			}
+			default: break;
+		}
 
 		if( iRow != iLastSeenRow )
 		{

src/PlayerStageStats.cpp

@@ -274,6 +274,7 @@ float PlayerStageStats::GetCurMaxPercentDancePoints() const
 	return fCurMaxPercentDancePoints;
 }
 
+// TODO: Make this use lua. Let more judgments be possible. -Wolfman2000
 int PlayerStageStats::GetLessonScoreActual() const
 {
 	int iScore = 0;
@@ -289,6 +290,7 @@ int PlayerStageStats::GetLessonScoreActual() const
 			case TNS_W2:
 			case TNS_W1:
 				iScore += m_iTapNoteScores[tns];
+			default:
 				break;
 		}
 	}
@@ -299,6 +301,7 @@ int PlayerStageStats::GetLessonScoreActual() const
 		{
 			case HNS_Held:
 				iScore += m_iHoldNoteScores[hns];
+			default:
 				break;
 		}
 	}

src/RageDisplay_Legacy.cpp

@@ -1625,6 +1625,7 @@ void RageDisplay_Legacy::SetTextureMode( TextureUnit tu, TextureMode tm )
 		glTexEnvi(GL_TEXTURE_ENV, GLenum(GL_OPERAND1_ALPHA_EXT), GL_SRC_ALPHA);
 		glTexEnvi(GL_TEXTURE_ENV, GLenum(GL_SOURCE1_ALPHA_EXT), GL_TEXTURE);
 		break;
+	default: break;
 	}
 }
 
@@ -1677,6 +1678,7 @@ void RageDisplay_Legacy::SetEffectMode( EffectMode effect )
 		case EffectMode_Overlay:	hShader = g_hOverlayShader; break;
 		case EffectMode_Screen:	hShader = g_hScreenShader; break;
 		case EffectMode_YUYV422:	hShader = g_hYUYV422Shader; break;
+		default: break;
 	}
 
 	DebugFlushGLErrors();
@@ -1712,9 +1714,8 @@ bool RageDisplay_Legacy::IsEffectModeSupported( EffectMode effect )
 		case EffectMode_Overlay:		return g_hOverlayShader != 0;
 		case EffectMode_Screen:		return g_hScreenShader != 0;
 		case EffectMode_YUYV422:	return g_hYUYV422Shader != 0;
+		default: return false;
 	}
-
-	return false;
 }
 
 void RageDisplay_Legacy::SetBlendMode( BlendMode mode )

src/RageSound.cpp

@@ -585,6 +585,7 @@ void RageSound::ApplyParams()
 		case RageSoundParams::M_CONTINUE:
 			m_pSource->SetProperty( "Continue", 1.0f );
 			break;
+		default: break;
 	}
 }
 

src/RageSoundReader_FileReader.cpp

@@ -78,6 +78,7 @@ RageSoundReader_FileReader *RageSoundReader_FileReader::TryOpenFile( RageFileBas
 			bKeepTrying = false;
 			error = err;
 			break;
+		default: break;
 	}
 
 	return NULL;

src/RageSurface_Load.cpp

@@ -67,6 +67,7 @@ static RageSurface *TryOpenFile( RString sPath, bool bHeaderOnly, RString &error
 			 * don't bother trying the other file types. */
 			bKeepTrying = false;
 			break;
+		default: break;
 	}
 
 	return NULL;

src/ScoreKeeperRave.cpp

@@ -83,7 +83,10 @@ void ScoreKeeperRave::HandleHoldScore( const TapNote &tn )
 	float fPercentToMove = 0;
 	switch( tapScore )
 	{
-	case TNS_HitMine:	fPercentToMove = g_fSuperMeterPercentChange[SE_HitMine];	break;
+		case TNS_HitMine:
+			fPercentToMove = g_fSuperMeterPercentChange[SE_HitMine];
+		default:
+			break;
 	}
 	AddSuperMeterDelta( fPercentToMove );
 }

src/Screen.cpp

@@ -226,6 +226,7 @@ void Screen::Input( const InputEventPlus &input )
 		case GAME_BUTTON_START:	this->MenuStart	( input );	return;
 		case GAME_BUTTON_SELECT:this->MenuSelect( input );	return;
 		case GAME_BUTTON_COIN:	this->MenuCoin	( input );	return;
+		default: return;
 	}
 }
 

src/ScreenAttract.cpp

@@ -76,7 +76,7 @@ void ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuEle
 	switch( input.MenuI )
 	{
 		case GAME_BUTTON_BACK:
-		if( !(bool)BACK_GOES_TO_START_SCREEN )
+			if( !BACK_GOES_TO_START_SCREEN )
 				break;
 			// fall through
 		case GAME_BUTTON_START:
@@ -84,7 +84,10 @@ void ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuEle
 			switch( GAMESTATE->GetCoinMode() )
 			{
 				case CoinMode_Pay:
-			LOG->Trace("ScreenAttract::AttractInput: COIN_PAY (%i/%i, %i)", GAMESTATE->m_iCoins.Get(), PREFSMAN->m_iCoinsPerCredit.Get(), GAMESTATE->GetNumSidesJoined() );
+					LOG->Trace("ScreenAttract::AttractInput: COIN_PAY (%i/%i, %i)",
+							   GAMESTATE->m_iCoins.Get(),
+							   PREFSMAN->m_iCoinsPerCredit.Get(),
+							   GAMESTATE->GetNumSidesJoined() );
 					if( GAMESTATE->m_iCoins < PREFSMAN->m_iCoinsPerCredit && GAMESTATE->GetNumSidesJoined() == 0 )
 						break;	// don't fall through
 					// fall through
@@ -99,10 +102,9 @@ void ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuEle
 
 					pScreen->Cancel( SM_GoToStartScreen );
 					break;
-		default:
+				default: FAIL_M("Invalid Coin Mode! Aborting...");
-			ASSERT(0);
 			}
-		break;
+		default: break;
 	}
 
 	if( pScreen->IsTransitioning() )
@@ -113,6 +115,7 @@ void ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuEle
 		case GAME_BUTTON_LEFT:
 		case GAME_BUTTON_RIGHT:
 			SCREENMAN->PostMessageToTopScreen( SM_BeginFadingOut, 0 );
+		default:
 			break;
 	}
 

src/ScreenContinue.cpp

@@ -68,6 +68,7 @@ void ScreenContinue::Input( const InputEventPlus &input )
 			case GAME_BUTTON_DOWN:
 			case GAME_BUTTON_LEFT:
 			case GAME_BUTTON_RIGHT:
+			{
 				float fSeconds = floorf(m_MenuTimer->GetSeconds()) - 0.0001f;
 				fSeconds = max( fSeconds, 0.0001f ); // don't set to 0
 				m_MenuTimer->SetSeconds( fSeconds );
@@ -76,6 +77,8 @@ void ScreenContinue::Input( const InputEventPlus &input )
 				this->HandleMessage( msg );
 				return;	// handled
 			}
+			default: break;
+		}
 	}
 
 	ScreenWithMenuElementsSimple::Input( input );

src/ScreenDebugOverlay.cpp

@@ -816,9 +816,8 @@ class DebugLineProfileSlot : public IDebugLine
 			case ProfileSlot_Machine: return "Machine";
 			case ProfileSlot_Player1: return "Player 1";
 			case ProfileSlot_Player2: return "Player 2";
+			default: return RString();
 		}
-
-		return RString();
 	}
 	virtual bool IsEnabled() { return IsSelectProfilePersistent(); }
 	virtual RString GetPageName() const { return "Profiles"; }

src/ScreenEdit.cpp

@@ -4245,6 +4245,7 @@ void ScreenEdit::HandleAlterMenuChoice(AlterMenuChoice c, const vector<int> &iAn
 			}
 			break;
 		}
+		default: break;
 	}
 	
 }

src/ScreenEditMenu.cpp

@@ -208,11 +208,14 @@ void ScreenEditMenu::MenuStart( const InputEventPlus &input )
 			FILEMAN->Remove( sTempFile );
 			break;
 		}
+		default:
+			break;
 	}
 
 	switch( action )
 	{
 		case EditMenuAction_Delete:
+		{
 			ASSERT( pSteps );
 			if( pSteps->IsAutogen() )
 			{
@@ -221,6 +224,8 @@ void ScreenEditMenu::MenuStart( const InputEventPlus &input )
 				return;
 			}
 		}
+		default: break;
+	}
 
 	// Do work
 	switch( action )

src/ScreenEnding.cpp

@@ -96,6 +96,7 @@ void ScreenEnding::Init()
 			case MemoryCardState_Removed:
 			case MemoryCardState_NoCard:
 				m_sprRemoveMemoryCard[p].SetVisible( false );
+			default:
 				break;
 		}
 		LOAD_ALL_COMMANDS_AND_SET_XY_AND_ON_COMMAND( m_sprRemoveMemoryCard[p] );
@@ -116,6 +117,7 @@ void ScreenEnding::Input( const InputEventPlus &input )
 		{
 			case GAME_BUTTON_START:
 				SCREENMAN->PostMessageToTopScreen( SM_BeginFadingOut, 0 );
+			default:
 				break;
 		}
 	}

src/ScreenEvaluation.cpp

@@ -201,6 +201,7 @@ void ScreenEvaluation::Init()
 						ss.m_player[p].m_radarPossible[rc] = 1 + (rand() % 200);
 						ss.m_player[p].m_radarActual[rc] = rand() % (int)(ss.m_player[p].m_radarPossible[rc]);
 						break;
+					default: break;
 				}
 
 				;	// filled in by ScreenGameplay on start of notes
@@ -655,6 +656,7 @@ void ScreenEvaluation::Init()
 		case Grade_Tier02:
 		case Grade_Tier03:
 			this->PostScreenMessage( SM_PlayCheer, CHEER_DELAY_SECONDS );
+		default:
 			break;
 	}
 }

src/ScreenGameplay.cpp

@@ -154,6 +154,7 @@ void PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField, int
 		case PLAY_MODE_RAVE:
 			m_pSecondaryScoreDisplay = new ScoreDisplayRave;
 			m_pSecondaryScoreDisplay->SetName( "ScoreDisplayRave" );
+		default:
 			break;
 	}
 
@@ -166,6 +167,7 @@ void PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField, int
 	{
 		case PLAY_MODE_RAVE:
 			m_pSecondaryScoreKeeper = new ScoreKeeperRave( pPlayerState, pPlayerStageStats );
+		default:
 			break;
 	}
 
@@ -528,6 +530,7 @@ void ScreenGameplay::Init()
 			m_pCombinedLifeMeter->SetName( "CombinedLife" );
 			LOAD_ALL_COMMANDS_AND_SET_XY( *m_pCombinedLifeMeter );
 			this->AddChild( m_pCombinedLifeMeter );
+		default:
 			break;
 	}
 
@@ -559,6 +562,7 @@ void ScreenGameplay::Init()
 			break;
 		case PLAY_MODE_BATTLE:
 		case PLAY_MODE_RAVE:
+		default:
 			break;
 	}
 
@@ -722,6 +726,7 @@ void ScreenGameplay::Init()
 				m_soundBattleTrickLevel1.Load(	THEME->GetPathS(m_sName,"battle trick level1"), true );
 				m_soundBattleTrickLevel2.Load(	THEME->GetPathS(m_sName,"battle trick level2"), true );
 				m_soundBattleTrickLevel3.Load(	THEME->GetPathS(m_sName,"battle trick level3"), true );
+			default:
 				break;
 		}
 	}
@@ -999,6 +1004,7 @@ void ScreenGameplay::SetupSong( int iSongIndex )
 				case SongOptions::SOUNDEFFECT_OFF:	sType = "SoundEffectControl_Off";	break;
 				case SongOptions::SOUNDEFFECT_SPEED:	sType = "SoundEffectControl_Speed";	break;
 				case SongOptions::SOUNDEFFECT_PITCH:	sType = "SoundEffectControl_Pitch";	break;
+				default: break;
 			}
 
 			pi->m_SoundEffectControl.Load( sType, pi->GetPlayerState(), &pi->m_NoteData );
@@ -1631,6 +1637,7 @@ void ScreenGameplay::Update( float fDeltaTime )
 	switch( m_DancingState )
 	{
 		case STATE_DANCING:
+		{
 			/* Set STATSMAN->m_CurStageStats.bFailed for failed players.  In, FAIL_IMMEDIATE, send
 			 * SM_BeginFailed if all players failed, and kill dead Oni players. */
 			FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
@@ -1664,6 +1671,7 @@ void ScreenGameplay::Update( float fDeltaTime )
 				{
 					case SongOptions::LIFE_BATTERY:
 						bAllowOniDie = true;
+					default:
 						break;
 				}
 				if( bAllowOniDie && ft == PlayerOptions::FAIL_IMMEDIATE )
@@ -1697,7 +1705,7 @@ void ScreenGameplay::Update( float fDeltaTime )
 					bAllFailed = false;	// never fail.
 					break;
 				default:
-				ASSERT(0);
+					FAIL_M("Invalid fail type! Aborting...");
 				}
 			}
 
@@ -1871,6 +1879,8 @@ void ScreenGameplay::Update( float fDeltaTime )
 					ASSERT(0);
 			}
 	}
+		default: break;
+	}
 
 	PlayTicks();
 

src/ScreenJukebox.cpp

@@ -252,6 +252,8 @@ void ScreenJukebox::Input( const InputEventPlus &input )
 		case GAME_BUTTON_RIGHT:
 			SCREENMAN->PostMessageToTopScreen( SM_NotesEnded, 0 );
 			return;
+		default:
+			break;
 	}
 
 	ScreenAttract::AttractInput( input, this );

src/ScreenOptions.cpp

@@ -471,6 +471,7 @@ void ScreenOptions::TweenCursor( PlayerNumber pn )
 			break;
 		case LAYOUT_SHOW_ALL_IN_ROW:
 			break;
+		default: break;
 	}
 	cursor.SetCanGo( bCanGoLeft, bCanGoRight );
 
@@ -512,6 +513,8 @@ void ScreenOptions::Input( const InputEventPlus &input )
 				INPUTMAPPER->ResetKeyRepeat( GAME_BUTTON_START, input.pn );
 				INPUTMAPPER->ResetKeyRepeat( GAME_BUTTON_RIGHT, input.pn );
 				INPUTMAPPER->ResetKeyRepeat( GAME_BUTTON_LEFT, input.pn );
+			default:
+				break;
 		}
 	}
 
@@ -742,6 +745,7 @@ void ScreenOptions::AfterChangeValueOrRow( PlayerNumber pn )
 		case INPUTMODE_SHARE_CURSOR:
 			pText = &m_textExplanationTogether;
 			break;
+		default: break;
 	}
 	if( pText->GetText() != text )
 	{
@@ -800,6 +804,7 @@ void ScreenOptions::MenuStart( const InputEventPlus &input )
 				return;
 			}
 		}
+		default: break;
 	}
 
 	this->ProcessMenuStart( input );
@@ -1171,6 +1176,7 @@ void ScreenOptions::AfterChangeRow( PlayerNumber pn )
 		switch( m_OptionsNavigation )
 		{
 			case NAV_TOGGLE_FIVE_KEY:
+			{
 				if( row.GetRowDef().m_layoutType != LAYOUT_SHOW_ONE_IN_ROW )
 				{
 					int iSelectionDist = -1;
@@ -1188,6 +1194,8 @@ void ScreenOptions::AfterChangeRow( PlayerNumber pn )
 				}
 				break;
 			}
+			default: break;
+		}
 
 		if( row.GetFirstItemGoesDown() )
 		{

src/ScreenPrompt.cpp

@@ -124,6 +124,7 @@ void ScreenPrompt::Input( const InputEventPlus &input )
 			case KEY_RIGHT:
 				this->MenuRight( input );
 				return;
+			default: break;
 		}
 	}
 
@@ -204,6 +205,7 @@ void ScreenPrompt::End( bool bCancelled )
 		case ANSWER_NO:
 			m_smSendOnPop = SM_Failure;
 			break;
+		default: break;
 	}
 
 	if( bCancelled )
@@ -226,6 +228,7 @@ void ScreenPrompt::End( bool bCancelled )
 			if( g_pOnNo )
 				g_pOnNo(g_pCallbackData);
 			break;
+		default: break;
 	}
 
 	s_LastAnswer = bCancelled ? ANSWER_CANCEL : m_Answer;

src/ScreenRanking.cpp

@@ -220,6 +220,7 @@ float ScreenRanking::SetPage( const PageToShow &pts )
 			bShowPoints = pts.pCourse->IsOni();
 			bShowTime = pts.pCourse->IsOni();
 			break;
+		default: break;
 	}
 
 	for( int l=0; l<NUM_RANKING_LINES; l++ )

src/ScreenSelectCharacter.cpp

@@ -209,6 +209,7 @@ void ScreenSelectCharacter::BeforeRowChange( PlayerNumber pn )
 		case CHOOSING_HUMAN_CHARACTER:
 			m_sprCardArrows[pnAffected].StopEffect();
 			break;
+		default: break;
 	}
 }
 
@@ -221,6 +222,7 @@ void ScreenSelectCharacter::AfterRowChange( PlayerNumber pn )
 		case CHOOSING_HUMAN_CHARACTER:
 			m_sprCardArrows[pnAffected].SetEffectGlowShift();
 			break;
+		default: break;
 	}
 }
 
@@ -299,6 +301,7 @@ void ScreenSelectCharacter::Move( PlayerNumber pn, int deltaValue )
 	{
 		case CHOOSING_CPU_CHARACTER:
 		case CHOOSING_HUMAN_CHARACTER:
+		{
 			vector<Character*> apCharacters;
 			CHARMAN->GetCharacters( apCharacters );
 			m_iSelectedCharacter[pnAffected] += deltaValue;
@@ -307,6 +310,8 @@ void ScreenSelectCharacter::Move( PlayerNumber pn, int deltaValue )
 			m_soundChange.Play();
 			break;
 		}
+		default: break;
+	}
 }
 
 bool ScreenSelectCharacter::AllAreFinishedChoosing() const
@@ -338,6 +343,7 @@ void ScreenSelectCharacter::MakeSelection( PlayerNumber pn )
 		case CHOOSING_CPU_CHARACTER:
 			m_SelectionRow[pn] = FINISHED_CHOOSING;
 			break;
+		default: break;
 	}
 	AfterRowChange(pn);
 	AfterValueChange(pn);

src/ScreenSelectMusic.cpp

@@ -543,6 +543,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
 					else
 						m_soundLocked.Play();
 					break;
+				default: break;
 			}
 		}
 		else if( input.type == IET_FIRST_PRESS && input.MenuI != GAME_BUTTON_SELECT )

src/ScreenSyncOverlay.cpp

@@ -214,10 +214,14 @@ bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input )
 			{
 				case IET_RELEASE:	fDelta *= 0;	break;
 				case IET_REPEAT:
+				{
 					if( INPUTFILTER->GetSecsHeld(input.DeviceI) < 1.0f )
 						fDelta *= 0;
 					else
 						fDelta *= 10;
+					break;
+				}
+				default: break;
 			}
 			if( GAMESTATE->m_pCurSong != NULL )
 			{
@@ -239,19 +243,25 @@ bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input )
 			{
 				case IET_RELEASE:	fDelta *= 0;	break;
 				case IET_REPEAT:
+				{
 					if( INPUTFILTER->GetSecsHeld(input.DeviceI) < 1.0f )
 						fDelta *= 0;
 					else
 						fDelta *= 10;
 				}
+				default: break;
+			}
 
 			switch( a )
 			{
 				case ChangeGlobalOffset:
+				{
 				PREFSMAN->m_fGlobalOffsetSeconds.Set( PREFSMAN->m_fGlobalOffsetSeconds + fDelta );
 				break;
+				}
 
 				case ChangeSongOffset:
+				{
 					if( GAMESTATE->m_pCurSong != NULL )
 					{
 						GAMESTATE->m_pCurSong->m_SongTiming.m_fBeat0OffsetInSeconds += fDelta;
@@ -263,6 +273,8 @@ bool ScreenSyncOverlay::OverlayInput( const InputEventPlus &input )
 					}
 					break;
 				}
+				default: break;
+			}
 		}
 		break;
 	default:

src/ScreenTestInput.cpp

@@ -97,12 +97,17 @@ void ScreenTestInput::Input( const InputEventPlus &input )
 	{
 		case IET_FIRST_PRESS:
 		case IET_RELEASE:
+		{
 			switch( input.type )
 			{
 				case IET_FIRST_PRESS:	sMessage += "Pressed";	break;
 				case IET_RELEASE:	sMessage += "Released";	break;
+				default: break;
 			}
 			MESSAGEMAN->Broadcast( sMessage );
+			break;
+		}
+		default: break;
 	}
 
 	Screen::Input( input );	// default handler

src/ScreenTestLights.cpp

@@ -65,6 +65,7 @@ void ScreenTestLights::Update( float fDeltaTime )
 		case LIGHTSMODE_TEST_MANUAL_CYCLE:
 			s += MANUAL_CYCLE.GetValue()+"\n";
 			break;
+		default: break;
 	}
 
 	if( cl == CabinetLight_Invalid )

src/ScreenTestSound.cpp

@@ -153,6 +153,7 @@ void ScreenTestSound::Input( const InputEventPlus &input )
 				break;
 			}
 			case 's':
+			{
 				for( int i = 0; i < nsounds; ++i )
 				{
 					/* Stop copied sounds. */
@@ -161,29 +162,28 @@ void ScreenTestSound::Input( const InputEventPlus &input )
 						snds[j]->Stop();
 				}
 				break;
+			}
 			case 'l':
 			{
 				RageSoundParams p = s[selected].s.GetParams();
 				p.StopMode = RageSoundParams::M_LOOP;
 				s[selected].s.SetParams( p );
-			}
-
 				break;
+			}
 			case 'a':
 			{
 				RageSoundParams p = s[selected].s.GetParams();
 				p.StopMode = RageSoundParams::M_STOP;
 				s[selected].s.SetParams( p );
-			}
 				break;
+			}
 			case 'c':
 			{
 				RageSoundParams p = s[selected].s.GetParams();
 				p.StopMode = RageSoundParams::M_CONTINUE;
 				s[selected].s.SetParams( p );
-			}
 				break;
-
+			}
 /*			case KEY_LEFT:
 				obj.SetX(obj.GetX() - 10);
 				break;
@@ -197,8 +197,9 @@ void ScreenTestSound::Input( const InputEventPlus &input )
 				obj.SetY(obj.GetY() + 10);
 				break;
 */
+			default: break;
 		}
-
+		default: break;
 	}
 
 }

src/ScreenTextEntry.cpp

@@ -203,6 +203,7 @@ void ScreenTextEntry::Input( const InputEventPlus &input )
 			case IET_FIRST_PRESS:
 			case IET_REPEAT:
 				BackspaceInAnswer();
+			default:
 				break;
 		}
 	}

src/SongManager.cpp

@@ -497,7 +497,7 @@ RageColor SongManager::GetSongColor( const Song* pSong ) const
 		int i = m_vPreferredSongSort.size();
 		return SONG_GROUP_COLOR.GetValue( i%NUM_SONG_GROUP_COLORS );
 	}
-	else
+	else // TODO: Have a better fallback plan with colors?
 	{
 		/* XXX: Previously, this matched all notes, which set a song to "extra"
 		 * if it had any 10-foot steps at all, even edits or doubles.
@@ -519,6 +519,7 @@ RageColor SongManager::GetSongColor( const Song* pSong ) const
 				case Difficulty_Challenge:
 				case Difficulty_Edit:
 					continue;
+				default: break;
 			}
 
 			//if(pSteps->m_StepsType != st)
@@ -527,7 +528,7 @@ RageColor SongManager::GetSongColor( const Song* pSong ) const
 			if( pSteps->GetMeter() >= EXTRA_COLOR_METER )
 				return (RageColor)EXTRA_COLOR;
 		}
-		if( pSong->m_sMainTitle == "DVNO")
+		if( pSong->m_sMainTitle == "DVNO") // XXX: What IS this? An easter egg? -Wolfman2000
 		{
 			return RageColor(1.0f,0.8f,0.0f,1.0f);
 		}

src/StageStats.cpp

@@ -169,6 +169,7 @@ void StageStats::FinalizeScores( bool bSummary )
 		case PLAY_MODE_BATTLE:
 		case PLAY_MODE_RAVE:
 			return; // don't save scores in battle
+		default: break;
 	}
 
 	if( PREFSMAN->m_sTestInitialScreen.Get() != "" )

src/StepMania.cpp

@@ -1295,6 +1295,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 			}
 			StepMania::InsertCoin();
 			return false; // Attract needs to know because it goes to TitleMenu on > 1 credit
+		default: break;
 	}
 
 	/* Re-added for StepMania 3.9 theming veterans, plus it's just faster than

src/UnlockManager.cpp

@@ -271,15 +271,17 @@ static float GetArcadePoints( const Profile *pProfile )
 			case PLAY_MODE_NONSTOP:
 			case PLAY_MODE_ONI:
 			case PLAY_MODE_ENDLESS:
+			{
 				fAP += pProfile->m_iNumSongsPlayedByPlayMode[pm];
-			break;
 			}
-
+			default: break;
+		}
 	}
 
 	return fAP;
 }
 
+// TODO: Make this more flexible for games with many grade tiers. Lua-ize it? -Wolfman2000
 static float GetSongPoints( const Profile *pProfile )
 {
 	float fSP =	0;
@@ -297,6 +299,7 @@ static float GetSongPoints( const Profile *pProfile )
 		case Grade_Tier07:/*D*/		fSP += 1* pProfile->m_iNumStagesPassedByGrade[g];	break;
 		case Grade_Failed:
 		case Grade_NoData:
+		default:
 			;	// no points
 			break;
 		}
@@ -309,8 +312,10 @@ static float GetSongPoints( const Profile *pProfile )
 			case PLAY_MODE_NONSTOP:
 			case PLAY_MODE_ONI:
 			case PLAY_MODE_ENDLESS:
+			{
 			fSP += pProfile->m_iNumSongsPlayedByPlayMode[pm];
-			break;
+			}
+			default: break;
 		}
 
 	}