mirror of
https://github.com/OpenDiablo2/OpenDiablo2
synced 2024-06-05 23:40:43 +00:00
Revert "hotfix: ds1: method setupLayerTypes is now exported + circleci build job bugfix"
This commit is contained in:
parent
6191bd8546
commit
97708c1349
|
@ -9,7 +9,7 @@ jobs:
|
||||||
working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}}
|
working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}}
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run: sudo apt-get --allow-releaseinfo-change update && sudo apt-get install -y libgtk-3-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev libsdl2-dev libasound2-dev > /dev/null 2>&1
|
- run: sudo apt-get install -y libgtk-3-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libgl1-mesa-dev libsdl2-dev libasound2-dev > /dev/null 2>&1
|
||||||
- run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
|
- run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin
|
||||||
- run: go get -v -t -d ./...
|
- run: go get -v -t -d ./...
|
||||||
- run: go build .
|
- run: go build .
|
||||||
|
|
|
@ -102,7 +102,7 @@ func LoadDS1(fileData []byte) (*DS1, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ds1.LayerStreamTypes = ds1.SetupStreamLayerTypes()
|
ds1.LayerStreamTypes = ds1.setupStreamLayerTypes()
|
||||||
|
|
||||||
ds1.Tiles = make([][]TileRecord, ds1.Height)
|
ds1.Tiles = make([][]TileRecord, ds1.Height)
|
||||||
|
|
||||||
|
@ -328,8 +328,7 @@ func (ds1 *DS1) loadSubstitutions(br *d2datautils.StreamReader) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetupStreamLayerTypes creates slice of layers types
|
func (ds1 *DS1) setupStreamLayerTypes() []d2enum.LayerStreamType {
|
||||||
func (ds1 *DS1) SetupStreamLayerTypes() []d2enum.LayerStreamType {
|
|
||||||
var layerStream []d2enum.LayerStreamType
|
var layerStream []d2enum.LayerStreamType
|
||||||
|
|
||||||
if ds1.Version < v4 {
|
if ds1.Version < v4 {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user