diff options
| author | sfan5 <sfan5@live.de> | 2020-07-10 12:11:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-10 12:11:44 +0200 |
| commit | c6422e087257d661a30ee2cd281ccec91f2f90ca (patch) | |
| tree | 8845e2f5d136a38a553d9d759adcfa5a847f7c9e /src/nodedef.cpp | |
| parent | b1ff04e06da531dc52f6ee91e2967b39743033e6 (diff) | |
| download | minetest-c6422e087257d661a30ee2cd281ccec91f2f90ca.tar.gz minetest-c6422e087257d661a30ee2cd281ccec91f2f90ca.tar.bz2 minetest-c6422e087257d661a30ee2cd281ccec91f2f90ca.zip | |
Remove std::shared_ptr use in TileLayer (#10090)
Diffstat (limited to 'src/nodedef.cpp')
| -rw-r--r-- | src/nodedef.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp index a84338752..e5cd2c2a7 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -317,6 +317,18 @@ ContentFeatures::ContentFeatures() reset(); } +ContentFeatures::~ContentFeatures() +{ +#ifndef SERVER + for (u16 j = 0; j < 6; j++) { + delete tiles[j].layers[0].frames; + delete tiles[j].layers[1].frames; + } + for (u16 j = 0; j < CF_SPECIAL_COUNT; j++) + delete special_tiles[j].layers[0].frames; +#endif +} + void ContentFeatures::reset() { /* @@ -662,7 +674,7 @@ static void fillTileAttribs(ITextureSource *tsrc, TileLayer *layer, } else { std::ostringstream os(std::ios::binary); if (!layer->frames) { - layer->frames = std::make_shared<std::vector<FrameSpec>>(); + layer->frames = new std::vector<FrameSpec>(); } layer->frames->resize(frame_count); |