diff options
| -rw-r--r-- | deserialize.go | 4 | ||||
| -rw-r--r-- | serialize.go | 3 | ||||
| -rw-r--r-- | types.go | 17 |
3 files changed, 4 insertions, 20 deletions
diff --git a/deserialize.go b/deserialize.go index 78b9ea2..579acac 100644 --- 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 85f1b28..22c591f 100644 --- 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" } } @@ -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) -} |