Merge pull request #2 from ev2-1/master

[mtmap.git] / deserialize.go

diff --git a/deserialize.go b/deserialize.go
index 78b9ea2573699faac004e947a6e2f2270161ad2c..73406aa0c16b91f33c1ea4774ef34a5aa7ea6a47 100644 (file)
--- a/deserialize.go
+++ b/deserialize.go
@@ -65,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)
                }
 
@@ -149,10 +153,6 @@ func Deserialize(r io.Reader, idNameMap map[string]mt.Content) *MapBlk {
                        }
                }
 
-               if _, err := io.Copy(io.Discard, r); err != nil {
-                       panic(err)
-               }
-
                if err := r.Close(); err != nil {
                        panic(err)
                }
@@ -250,7 +250,7 @@ func Deserialize(r io.Reader, idNameMap map[string]mt.Content) *MapBlk {
 
                name, ok := nameIdMap[id]
                if !ok {
-                       panic(ErrInvalidNodeId{id})
+                       name = "unknown"
                }
 
                switch name {
@@ -263,7 +263,7 @@ func Deserialize(r io.Reader, idNameMap map[string]mt.Content) *MapBlk {
                default:
                        id, ok = idNameMap[name]
                        if !ok {
-                               panic(ErrInvalidNodeName{name})
+                               id = mt.Unknown
                        }
                }