From 05e9f34765d78487e7bae5b47da00bc160137204 Mon Sep 17 00:00:00 2001 From: Intyre Date: Fri, 18 Dec 2020 19:02:34 +0100 Subject: [PATCH] Renamed ObjectDetailRecord --- d2core/d2map/d2mapentity/factory.go | 2 +- d2core/d2map/d2mapentity/object.go | 2 +- d2core/d2records/object_details_loader.go | 2 +- d2core/d2records/object_details_record.go | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/d2core/d2map/d2mapentity/factory.go b/d2core/d2map/d2mapentity/factory.go index 527adfc6..2b400b3f 100644 --- a/d2core/d2map/d2mapentity/factory.go +++ b/d2core/d2map/d2mapentity/factory.go @@ -263,7 +263,7 @@ func (f *MapEntityFactory) NewCastOverlay(x, y int, overlayRecord *d2records.Ove } // NewObject creates an instance of AnimatedComposite -func (f *MapEntityFactory) NewObject(x, y int, objectRec *d2records.ObjectDetailsRecord, +func (f *MapEntityFactory) NewObject(x, y int, objectRec *d2records.ObjectDetailRecord, palettePath string) (*Object, error) { locX, locY := float64(x), float64(y) entity := &Object{ diff --git a/d2core/d2map/d2mapentity/object.go b/d2core/d2map/d2mapentity/object.go index 71dbaf1e..314e9e04 100644 --- a/d2core/d2map/d2mapentity/object.go +++ b/d2core/d2map/d2mapentity/object.go @@ -20,7 +20,7 @@ type Object struct { composite *d2asset.Composite highlight bool // nameLabel d2ui.Label - objectRecord *d2records.ObjectDetailsRecord + objectRecord *d2records.ObjectDetailRecord drawLayer int name string } diff --git a/d2core/d2records/object_details_loader.go b/d2core/d2records/object_details_loader.go index 1e4bb850..2dcbf43d 100644 --- a/d2core/d2records/object_details_loader.go +++ b/d2core/d2records/object_details_loader.go @@ -11,7 +11,7 @@ func objectDetailsLoader(r *RecordManager, d *d2txt.DataDictionary) error { i := 0 for d.Next() { - record := &ObjectDetailsRecord{ + record := &ObjectDetailRecord{ Index: i, Name: d.String("Name"), Description: d.String("description - not loaded"), diff --git a/d2core/d2records/object_details_record.go b/d2core/d2records/object_details_record.go index ee56249a..7137cf63 100644 --- a/d2core/d2records/object_details_record.go +++ b/d2core/d2records/object_details_record.go @@ -1,10 +1,10 @@ package d2records // ObjectDetails stores all of the ObjectDetailRecords -type ObjectDetails map[int]*ObjectDetailsRecord +type ObjectDetails map[int]*ObjectDetailRecord -// ObjectDetailsRecord represents the settings for one type of object from objects.txt -type ObjectDetailsRecord struct { +// ObjectDetailRecord represents the settings for one type of object from objects.txt +type ObjectDetailRecord struct { Index int // Line number in file, this is the actual index used for objects FrameCount [8]int // how many frames does this mode have, 0 = skip FrameDelta [8]int // what rate is the animation played at (256 = 100% speed)