From 97708c1349cedba192158414c236b2eb393c4e4b Mon Sep 17 00:00:00 2001 From: gravestench Date: Tue, 16 Feb 2021 10:02:34 -0800 Subject: [PATCH] Revert "hotfix: ds1: method setupLayerTypes is now exported + circleci build job bugfix" --- .circleci/config.yml | 2 +- d2common/d2fileformats/d2ds1/ds1.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1aa7ef04..df6c35be 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: working_directory: /go/src/github.com/{{ORG_NAME}}/{{REPO_NAME}} steps: - 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: go get -v -t -d ./... - run: go build . diff --git a/d2common/d2fileformats/d2ds1/ds1.go b/d2common/d2fileformats/d2ds1/ds1.go index 508bc6de..1e54b329 100644 --- a/d2common/d2fileformats/d2ds1/ds1.go +++ b/d2common/d2fileformats/d2ds1/ds1.go @@ -102,7 +102,7 @@ func LoadDS1(fileData []byte) (*DS1, error) { } } - ds1.LayerStreamTypes = ds1.SetupStreamLayerTypes() + ds1.LayerStreamTypes = ds1.setupStreamLayerTypes() ds1.Tiles = make([][]TileRecord, ds1.Height) @@ -328,8 +328,7 @@ func (ds1 *DS1) loadSubstitutions(br *d2datautils.StreamReader) error { return err } -// SetupStreamLayerTypes creates slice of layers types -func (ds1 *DS1) SetupStreamLayerTypes() []d2enum.LayerStreamType { +func (ds1 *DS1) setupStreamLayerTypes() []d2enum.LayerStreamType { var layerStream []d2enum.LayerStreamType if ds1.Version < v4 {