gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-06-11 18:20:42 +00:00
Code Issues Releases Wiki Activity

move logger into d2util (#720)

Browse Source 
* moved logger into d2util

* resolved upstream conflict
This commit is contained in:
lord 2020-09-09 05:22:13 -07:00 committed by GitHub
parent cbb512ab4b
commit 28a40983ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
d2common/d2loader/loader.go
View File

@ -3,16 +3,17 @@ package d2loader
import ( import (
"errors" "errors"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"github.com/OpenDiablo2/OpenDiablo2/d2common"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2cache" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2cache"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/asset" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/asset"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/asset/types" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/asset/types"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/filesystem" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/filesystem"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/mpq" "github.com/OpenDiablo2/OpenDiablo2/d2common/d2loader/mpq"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2util"
) )
const ( const (
@ -33,7 +34,7 @@ func NewLoader() *Loader {
// that have been added // that have been added
type Loader struct { type Loader struct {
d2interface.Cache d2interface.Cache
*d2common.Logger *d2util.Logger
sources []asset.Source sources []asset.Source
} }

2
d2common/logger.go → d2common/d2util/logger.go
View File

@ -1,4 +1,4 @@
package d2common package d2util
import ( import (
"fmt" "fmt"

2
d2common/logger_test.go → d2common/d2util/logger_test.go
View File

@ -1,4 +1,4 @@
package d2common package d2util
import ( import (
"fmt" "fmt"