Fix GameState::GetCharacters always returning nothing.

Fix GetRandomCharacter if we have no characters.
2003-09-25 23:24:10 +00:00
parent 6e41e4dca5
commit ff8196712e
2 changed files with 4 additions and 3 deletions
@@ -727,7 +727,7 @@ bool GameState::ShowMarvelous() const
 	return false;
 }

-void GameState::GetCharacters( vector<Character*> apCharactersOut )
+void GameState::GetCharacters( vector<Character*> &apCharactersOut )
 {
 	for( unsigned i=0; i<m_pCharacters.size(); i++ )
 		if( m_pCharacters[i]->m_sName.CompareNoCase("default")!=0 )
@@ -741,7 +741,7 @@ Character* GameState::GetRandomCharacter()
 	if( apCharacters.size() )
 		return m_pCharacters[rand()%apCharacters.size()];
 	else
-		return NULL;
+		return GetDefaultCharacter();
 }

 Character* GameState::GetDefaultCharacter()
@@ -752,5 +752,6 @@ Character* GameState::GetDefaultCharacter()
 			return m_pCharacters[i];
 	}

+	ASSERT(0);
 	return NULL;
 }