pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-08 08:12:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

unique_ptr is a better fit here

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-01-30 02:34:33 -05:00
parent 8086eecfe2
commit 769987ca33
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/map.cpp
View File

@ -413,9 +413,9 @@ bool Map::LoadV2(FILE *f) {
buf += sizeof(uint32); buf += sizeof(uint32);
} }
std::map<std::string, std::shared_ptr<ModelEntry>> models; std::map<std::string, std::unique_ptr<ModelEntry>> models;
for (uint32 i = 0; i < model_count; ++i) { for (uint32 i = 0; i < model_count; ++i) {
std::shared_ptr<ModelEntry> me(new ModelEntry); std::unique_ptr<ModelEntry> me(new ModelEntry);
std::string name = buf; std::string name = buf;
buf += name.length() + 1; buf += name.length() + 1;
@ -456,7 +456,7 @@ bool Map::LoadV2(FILE *f) {
me->polys[j] = p; me->polys[j] = p;
} }
models[name] = me; models[name] = std::move(me);
} }
for (uint32 i = 0; i < plac_count; ++i) { for (uint32 i = 0; i < plac_count; ++i) {
@ -487,7 +487,7 @@ bool Map::LoadV2(FILE *f) {
if (models.count(name) == 0) if (models.count(name) == 0)
continue; continue;
auto model = models[name]; auto &model = models[name];
auto &mod_polys = model->polys; auto &mod_polys = model->polys;
auto &mod_verts = model->verts; auto &mod_verts = model->verts;
for (uint32 j = 0; j < mod_polys.size(); ++j) { for (uint32 j = 0; j < mod_polys.size(); ++j) {