gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-09-29 22:56:07 -04:00
Code Issues Releases Wiki Activity

Code Cleanup for #790 (#870)

Browse Source 
* Return errors for #790

* Fixing lint issues

* Returning nil instead of empty struct pointer
This commit is contained in:
Stephen Horan 2020-10-30 20:19:06 -04:00 committed by GitHub
parent 4506380dbb
commit fb8e25ebdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
d2app/app.go
View File

@ -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 := d2gamescreen.CreateCharacterSelect(a, a.asset, a.renderer, a.inputManager,
characterSelect, err := 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)
}

16
d2game/d2gamescreen/character_select.go
View File

@ -67,10 +67,16 @@ func CreateCharacterSelect(
ui *d2ui.UIManager,
connectionType d2clientconnectiontype.ClientConnectionType,
connectionHost string,
) *CharacterSelect {
// https://github.com/OpenDiablo2/OpenDiablo2/issues/790
playerStateFactory, _ := d2hero.NewHeroStateFactory(asset)
entityFactory, _ := d2mapentity.NewMapEntityFactory(asset)
) (*CharacterSelect, error) {
playerStateFactory, err := d2hero.NewHeroStateFactory(asset)
if err != nil {
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 (