Skip to content

Commit 0d84dbf

Browse files
committed
Address lafriks#35 by removing Save feature.
Concerns were around using pointer-to-bool to support omitting default-true bools during save. Removed the Save feature to get past that issue, hoping to get at least part of this PR moving after 4 years.
1 parent 13b7906 commit 0d84dbf

File tree

1 file changed

+6
-34
lines changed

1 file changed

+6
-34
lines changed

tiled.go

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -121,23 +121,6 @@ func (l *loader) LoadFile(fileName string) (*Map, error) {
121121
return l.LoadReader(dir, f)
122122
}
123123

124-
// LoadTilesetFromReader loads a tileset in TSX format from an io.Reader.
125-
// baseDir is used to locate relative pats to additional tile data; default is
126-
// the current directory if empty.
127-
func (l *loader) LoadTilesetFromReader(baseDir string, r io.Reader) (*Tileset, error) {
128-
d := xml.NewDecoder(r)
129-
130-
t := &Tileset{
131-
baseDir: baseDir,
132-
}
133-
if err := d.Decode(t); err != nil {
134-
return nil, err
135-
}
136-
137-
t.SourceLoaded = true
138-
return t, nil
139-
}
140-
141124
// LoadTilesetFile loads a tileset in TSX format from a file.
142125
func (l *loader) LoadTilesetFile(fileName string) (*Tileset, error) {
143126
f, err := l.open(fileName)
@@ -151,27 +134,16 @@ func (l *loader) LoadTilesetFile(fileName string) (*Tileset, error) {
151134
}
152135

153136
// LoadTilesetFromReader loads a .tsx file into a Tileset structure
154-
func LoadTilesetFromReader(baseDir string, r io.Reader) (*Tileset, error) {
137+
func (l *loader) LoadTilesetFromReader(baseDir string, r io.Reader) (*Tileset, error) {
155138
d := xml.NewDecoder(r)
156139

157-
m := &Tileset{
158-
baseDir: baseDir,
159-
SourceLoaded: true,
140+
t := &Tileset{
141+
baseDir: baseDir,
160142
}
161-
if err := d.Decode(m); err != nil {
143+
if err := d.Decode(t); err != nil {
162144
return nil, err
163145
}
164146

165-
return m, nil
166-
}
167-
168-
// SaveTilesetToWriter saves a Tileset structure into a given writer
169-
func SaveTilesetToWriter(tileset *Tileset, w io.Writer) error {
170-
encoder := xml.NewEncoder(w)
171-
encoder.Indent("", " ")
172-
return encoder.Encode(tileset)
173-
}
174-
175-
func b(v bool) *bool {
176-
return &v
147+
t.SourceLoaded = true
148+
return t, nil
177149
}

0 commit comments

Comments
 (0)