Skip special ids

[mtmap.git] / deserialize.go

diff --git a/deserialize.go b/deserialize.go
index 90af77c5cc91d0ed0aedbd365c73973b4349758c..7980ca6ff8968989fd31ae901e3f7b44647b9125 100644 (file)
--- a/deserialize.go
+++ b/deserialize.go
@@ -4,7 +4,6 @@ import (
        "compress/zlib"
        "encoding/binary"
        "errors"
-       "fmt"
        "github.com/anon55555/mt"
        "io"
 )
@@ -18,22 +17,6 @@ var (
        ErrInvalidStaticObjVer = errors.New("invalid static object version")
 )
 
-type ErrInvalidNodeName struct {
-       Name string
-}
-
-func (e ErrInvalidNodeName) Error() string {
-       return fmt.Sprintf("invalid node \"%v\"", e.Name)
-}
-
-type ErrInvalidNodeId struct {
-       Id mt.Content
-}
-
-func (e ErrInvalidNodeId) Error() string {
-       return fmt.Sprintf("invalid node %v", e.Id)
-}
-
 func Deserialize(r io.Reader, idNameMap map[string]mt.Content) *MapBlk {
        var blk = &MapBlk{}
 
@@ -261,17 +244,20 @@ func Deserialize(r io.Reader, idNameMap map[string]mt.Content) *MapBlk {
        }
 
        for i := 0; i < 4096; i++ {
-               name, ok := nameIdMap[blk.Param0[i]]
+               id := blk.Param0[i]
+               if isSpecial(id) {
+                       continue
+               }
+
+               name, ok := nameIdMap[id]
                if !ok {
-                       panic(ErrInvalidNodeId{blk.Param0[i]})
+                       panic(ErrInvalidNodeId{id})
                }
 
-               id, ok := idNameMap[name]
+               blk.Param0[i], ok = idNameMap[name]
                if !ok {
                        panic(ErrInvalidNodeName{name})
                }
-
-               blk.Param0[i] = id
        }
 
        return blk