Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-28 08:57:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sfan5 2020-07-10 12:11:44 +02:00 committed by GitHub
parent b1ff04e06d
commit c6422e0872
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/tile.h
View File

@ -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

14
src/nodedef.cpp
View File

@ -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);

2
src/nodedef.h
View File

@ -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);