Code Cleanup for #790 (#870)

* Return errors for #790

* Fixing lint issues

* Returning nil instead of empty struct pointer

d2app/app.go

@@ -612,9 +612,11 @@ func (a *App) ToCreateGame(filePath string, connType d2clientconnectiontype.Clie
 
 // ToCharacterSelect forces the game to transition to the Character Select (load character) screen
 func (a *App) ToCharacterSelect(connType d2clientconnectiontype.ClientConnectionType, connHost string) {
-	// https://github.com/OpenDiablo2/OpenDiablo2/issues/790
+	characterSelect, err := d2gamescreen.CreateCharacterSelect(a, a.asset, a.renderer, a.inputManager,
-	characterSelect := d2gamescreen.CreateCharacterSelect(a, a.asset, a.renderer, a.inputManager,
 		a.audio, a.ui, connType, connHost)
+	if err != nil {
+		fmt.Printf("unable to create character select screen: %s", err)
+	}
 
 	a.screen.SetNextScreen(characterSelect)
 }

d2game/d2gamescreen/character_select.go

@@ -67,10 +67,16 @@ func CreateCharacterSelect(
 	ui *d2ui.UIManager,
 	connectionType d2clientconnectiontype.ClientConnectionType,
 	connectionHost string,
-) *CharacterSelect {
+) (*CharacterSelect, error) {
-	// https://github.com/OpenDiablo2/OpenDiablo2/issues/790
+	playerStateFactory, err := d2hero.NewHeroStateFactory(asset)
-	playerStateFactory, _ := d2hero.NewHeroStateFactory(asset)
+	if err != nil {
-	entityFactory, _ := d2mapentity.NewMapEntityFactory(asset)
+		return nil, err
+	}
+
+	entityFactory, err := d2mapentity.NewMapEntityFactory(asset)
+	if err != nil {
+		return nil, err
+	}
 
 	return &CharacterSelect{
 		selectedCharacter: -1,
@@ -84,7 +90,7 @@ func CreateCharacterSelect(
 		navigator:         navigator,
 		uiManager:         ui,
 		HeroStateFactory:  playerStateFactory,
-	}
+	}, nil
 }
 
 const (