From 74c72e90d4fc317684a1149a09bc3a5e36dd99c9 Mon Sep 17 00:00:00 2001 From: shoopea Date: Sun, 12 Jan 2020 20:16:42 +0800 Subject: [PATCH] test --- obj.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/obj.go b/obj.go index ff2f79e..5eb7452 100644 --- a/obj.go +++ b/obj.go @@ -968,7 +968,7 @@ func loadObjItem2() error { if id == 0 { id = getSilentObjItemID(i.Code, ``) if id == 0 { - id, err = addObjItem(i.Code, n, i.ItemTypeID, i.Weight, (i.Exchange != ``), i.Auction) + id, err = addObjItem(i.Code, n, i.ItemTypeID, i.Weight, i.Exchange, i.Auction) logOnError(err, "loadObjItem2 : addObjItem") } } else { @@ -1014,7 +1014,9 @@ func loadObjItem() error { c.ObjID64 = id c.ItemTypeID = type_id c.Code = intl_id - c.Name = name + n := make([]string, 1) + n = append(n, name) + c.Names = n c.Weight = weight muxObjItem.Lock() @@ -1039,14 +1041,15 @@ func loadObjItem() error { return err } - if _, ok := cacheObjItem[intl_id]; ok { - c := new(ChatWarsItem) - c.ObjID64 = id - c.Code = intl_id - c.Name = name - c.Weight = weight + if c, ok := cacheObjItem[intl_id]; ok { + n := c.Names + n = append(n, name) + c.Names = n muxObjItem.Lock() - cacheObjItem[name] = *c + cacheObjItem[intl_id] = *c + for _, n := range c.Names { + cacheObjItem[name] = *c + } muxObjItem.Unlock() } else { log.Printf("loadObjItem : orphaned obj_name for `%s` : %s.\n", intl_id, name)