pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 05:21:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make VS debug mode happy

Browse Source 
This actually hurts microbenchmarking

I couldn't get the ModelEntry::polys vector to play nice with benchmarking
so it will just be using push_back so I don't have write a new ctor
(writing a new ctor and using emplace_back vs push_back were equal)
This commit is contained in:
Michael Cook (mackal) 2016-07-18 21:57:25 -04:00
parent 8983f3c5dc
commit ccb5427b45
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/map.cpp
View File

@ -360,13 +360,13 @@ bool Map::LoadV2(FILE *f) {
} }
std::vector<char> data; std::vector<char> data;
data.reserve(data_size); data.resize(data_size);
if (fread(&data[0], data_size, 1, f) != 1) { if (fread(&data[0], data_size, 1, f) != 1) {
return false; return false;
} }
std::vector<char> buffer; std::vector<char> buffer;
buffer.reserve(buffer_size); buffer.resize(buffer_size);
uint32 v = InflateData(&data[0], data_size, &buffer[0], buffer_size); uint32 v = InflateData(&data[0], data_size, &buffer[0], buffer_size);
char *buf = &buffer[0]; char *buf = &buffer[0];
@ -486,7 +486,7 @@ bool Map::LoadV2(FILE *f) {
p.v2 = v2; p.v2 = v2;
p.v3 = v3; p.v3 = v3;
p.vis = vis; p.vis = vis;
me->polys[j] = p; me->polys.push_back(p);
} }
models[name] = std::move(me); models[name] = std::move(me);
@ -696,8 +696,8 @@ bool Map::LoadV2(FILE *f) {
uint32 ter_vert_count = ((quads_per_tile + 1) * (quads_per_tile + 1)); uint32 ter_vert_count = ((quads_per_tile + 1) * (quads_per_tile + 1));
std::vector<uint8> flags; std::vector<uint8> flags;
std::vector<float> floats; std::vector<float> floats;
flags.reserve(ter_quad_count); flags.resize(ter_quad_count);
floats.reserve(ter_vert_count); floats.resize(ter_vert_count);
for (uint32 i = 0; i < tile_count; ++i) { for (uint32 i = 0; i < tile_count; ++i) {
bool flat; bool flat;
flat = *(bool*)buf; flat = *(bool*)buf;