Skip to content
Permalink
Browse files

Remove std::shared_ptr use in TileLayer (#10090)

  • Loading branch information
sfan5 committed Jul 10, 2020
1 parent b1ff04e commit c6422e087257d661a30ee2cd281ccec91f2f90ca
Showing with 15 additions and 4 deletions.
  1. +1 −2 src/client/tile.h
  2. +13 −1 src/nodedef.cpp
  3. +1 −1 src/nodedef.h
@@ -25,7 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <string>
#include <vector>
#include <SMaterial.h>
#include <memory>
#include "util/numeric.h"
#include "config.h"

@@ -284,7 +283,7 @@ struct TileLayer
//! If true, the tile has its own color.
bool has_color = false;

std::shared_ptr<std::vector<FrameSpec>> frames = nullptr;
std::vector<FrameSpec> *frames = nullptr;

/*!
* The color of the tile, or if the tile does not own
@@ -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);

@@ -409,7 +409,7 @@ struct ContentFeatures
*/

ContentFeatures();
~ContentFeatures() = default;
~ContentFeatures();
void reset();
void serialize(std::ostream &os, u16 protocol_version) const;
void deSerialize(std::istream &is);

0 comments on commit c6422e0

Please sign in to comment.
You can’t perform that action at this time.