Merge pull request #2 from ev2-1/master

[mtmap.git] / deserialize.go

diff --git a/deserialize.go b/deserialize.go
index 38100479322b0f1942918c7181ea8c17ef1571fa..73406aa0c16b91f33c1ea4774ef34a5aa7ea6a47 100644 (file)
--- a/deserialize.go
+++ b/deserialize.go
@@ -15,7 +15,6 @@ var (
        ErrInvalidNodeMetaVer  = errors.New("invalid node meta version")
        ErrInvalidNameIdMapVer = errors.New("invalid name id mapping version")
        ErrInvalidStaticObjVer = errors.New("invalid static object version")
-       ErrInvalidNode         = errors.New("invalid node")
 )
 
 func Deserialize(r io.Reader, idNameMap map[string]mt.Content) *MapBlk {
@@ -66,7 +65,11 @@ func Deserialize(r io.Reader, idNameMap map[string]mt.Content) *MapBlk {
                        panic(err)
                }
 
-               if _, err := io.Copy(io.Discard, r); err != nil {
+               if err := binary.Read(r, binary.BigEndian, &blk.Param1); err != nil {
+                       panic(err)
+               }
+
+               if err := binary.Read(r, binary.BigEndian, &blk.Param2); err != nil {
                        panic(err)
                }
 
@@ -87,69 +90,67 @@ func Deserialize(r io.Reader, idNameMap map[string]mt.Content) *MapBlk {
                        panic(err)
                }
 
-               if version != NodeMetaVer {
-                       panic(ErrInvalidNodeMetaVer)
-               }
-
-               var count uint16
-               if err := binary.Read(r, binary.BigEndian, &count); err != nil {
-                       panic(err)
-               }
-
-               for i := uint16(0); i < count; i++ {
-                       var pos uint16
-                       if err := binary.Read(r, binary.BigEndian, &pos); err != nil {
-                               panic(err)
+               if version != 0 {
+                       if version != NodeMetaVer {
+                               panic(ErrInvalidNodeMetaVer)
                        }
 
-                       var num uint32
-                       if err := binary.Read(r, binary.BigEndian, &num); err != nil {
+                       var count uint16
+                       if err := binary.Read(r, binary.BigEndian, &count); err != nil {
                                panic(err)
                        }
 
-                       var data = &mt.NodeMeta{}
-                       data.Fields = make([]mt.NodeMetaField, 0)
-                       for j := uint32(0); j < num; j++ {
-                               var field mt.NodeMetaField
-
-                               var lenName uint16
-                               if err := binary.Read(r, binary.BigEndian, &lenName); err != nil {
-                                       panic(err)
-                               }
-
-                               var name = make([]byte, lenName)
-                               if err := binary.Read(r, binary.BigEndian, &name); err != nil {
+                       for i := uint16(0); i < count; i++ {
+                               var pos uint16
+                               if err := binary.Read(r, binary.BigEndian, &pos); err != nil {
                                        panic(err)
                                }
-                               field.Name = string(name)
 
-                               var lenValue uint32
-                               if err := binary.Read(r, binary.BigEndian, &lenValue); err != nil {
+                               var num uint32
+                               if err := binary.Read(r, binary.BigEndian, &num); err != nil {
                                        panic(err)
                                }
 
-                               var value = make([]byte, lenValue)
-                               if err := binary.Read(r, binary.BigEndian, &value); err != nil {
-                                       panic(err)
+                               var data = &mt.NodeMeta{}
+                               data.Fields = make([]mt.NodeMetaField, 0)
+                               for j := uint32(0); j < num; j++ {
+                                       var field mt.NodeMetaField
+
+                                       var lenName uint16
+                                       if err := binary.Read(r, binary.BigEndian, &lenName); err != nil {
+                                               panic(err)
+                                       }
+
+                                       var name = make([]byte, lenName)
+                                       if err := binary.Read(r, binary.BigEndian, &name); err != nil {
+                                               panic(err)
+                                       }
+                                       field.Name = string(name)
+
+                                       var lenValue uint32
+                                       if err := binary.Read(r, binary.BigEndian, &lenValue); err != nil {
+                                               panic(err)
+                                       }
+
+                                       var value = make([]byte, lenValue)
+                                       if err := binary.Read(r, binary.BigEndian, &value); err != nil {
+                                               panic(err)
+                                       }
+                                       field.Value = string(value)
+
+                                       if err := binary.Read(r, binary.BigEndian, &field.Private); err != nil {
+                                               panic(err)
+                                       }
+
+                                       data.Fields = append(data.Fields, field)
                                }
-                               field.Value = string(value)
 
-                               if err := binary.Read(r, binary.BigEndian, &field.Private); err != nil {
+                               if err := data.Inv.Deserialize(r); err != nil {
                                        panic(err)
                                }
 
-                               data.Fields = append(data.Fields, field)
-                       }
-
-                       if err := data.Inv.Deserialize(r); err != nil {
-                               panic(err)
+                               blk.NodeMetas[pos] = data
                        }
-
-                       blk.NodeMetas[pos] = data
-               }
-
-               if _, err := io.Copy(io.Discard, r); err != nil {
-                       panic(err)
                }
 
                if err := r.Close(); err != nil {
@@ -223,10 +224,10 @@ func Deserialize(r io.Reader, idNameMap map[string]mt.Content) *MapBlk {
                panic(err)
        }
 
-       nameIdMap := make(map[mt.Content]string)
+       var nameIdMap = make(map[mt.Content]string)
 
        for i := uint16(0); i < nameIdMapCount; i++ {
-               var id uint16
+               var id mt.Content
                if err := binary.Read(r, binary.BigEndian, &id); err != nil {
                        panic(err)
                }
@@ -241,18 +242,29 @@ func Deserialize(r io.Reader, idNameMap map[string]mt.Content) *MapBlk {
                        panic(err)
                }
 
-               nameIdMap[mt.Content(id)] = string(name)
+               nameIdMap[id] = string(name)
        }
 
        for i := 0; i < 4096; i++ {
-               name, ok := nameIdMap[blk.Param0[i]]
+               id := blk.Param0[i]
+
+               name, ok := nameIdMap[id]
                if !ok {
-                       panic(ErrInvalidNode)
+                       name = "unknown"
                }
 
-               id, ok := idNameMap[name]
-               if !ok {
-                       panic(ErrInvalidNode)
+               switch name {
+               case "unknown":
+                       id = mt.Unknown
+               case "air":
+                       id = mt.Air
+               case "ignore":
+                       id = mt.Ignore
+               default:
+                       id, ok = idNameMap[name]
+                       if !ok {
+                               id = mt.Unknown
+                       }
                }
 
                blk.Param0[i] = id