Don't error on unknown nodes

diff --git a/deserialize.go b/deserialize.go
index 78b9ea2573699faac004e947a6e2f2270161ad2c..579acac240cc3e988f3cac441d6485a932a7c008 100644 (file)
--- a/deserialize.go
+++ b/deserialize.go
@@ -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
                        }
                }
 

diff --git a/serialize.go b/serialize.go
index 85f1b28e22360b0b18df52fbb2d024bc32995f87..22c591f7223d32c8d0488ced44c4d4d8978b0f23 100644 (file)
--- a/serialize.go
+++ b/serialize.go
@@ -179,7 +179,8 @@ func Serialize(blk *MapBlk, w io.Writer, nameIdMap map[mt.Content]string) {
                default:
                        name, ok = nameIdMap[id]
                        if !ok {
-                               panic(ErrInvalidNodeId{id})
+                               id = mt.Unknown
+                               name = "unknown"
                        }
                }
 

diff --git a/types.go b/types.go
index 5c923a391a30164867104b8215ba40b7d54745b4..abb02e2cb8bcaaf1b9654c588f8cc3a40bce7c19 100644 (file)
--- a/types.go
+++ b/types.go
@@ -1,7 +1,6 @@
 package mtmap
 
 import (
-       "fmt"
        "github.com/anon55555/mt"
 )
 
@@ -35,19 +34,3 @@ type StaticObj struct {
        Pos  [3]float32
        Data string
 }
-
-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)
-}