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

Work around for msvc tuple bug

Browse Source
This commit is contained in:
KimLS 2014-06-16 15:09:17 -07:00
parent 64784be57e
commit 308562f939
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

@ -790,7 +790,7 @@ bool Map::LoadV2(FILE *f) {
else { else {
i1 = (uint32)verts.size(); i1 = (uint32)verts.size();
verts.push_back(Vertex(QuadVertex1X, QuadVertex1Y, QuadVertex1Z)); verts.push_back(Vertex(QuadVertex1X, QuadVertex1Y, QuadVertex1Z));
cur_verts[t] = i1; cur_verts[std::make_tuple(QuadVertex1X, QuadVertex1Y, QuadVertex1Z)] = i1;
} }
t = std::make_tuple(QuadVertex2X, QuadVertex2Y, QuadVertex2Z); t = std::make_tuple(QuadVertex2X, QuadVertex2Y, QuadVertex2Z);
@ -801,7 +801,7 @@ bool Map::LoadV2(FILE *f) {
else { else {
i2 = (uint32)verts.size(); i2 = (uint32)verts.size();
verts.push_back(Vertex(QuadVertex2X, QuadVertex2Y, QuadVertex2Z)); verts.push_back(Vertex(QuadVertex2X, QuadVertex2Y, QuadVertex2Z));
cur_verts[t] = i2; cur_verts[std::make_tuple(QuadVertex2X, QuadVertex2Y, QuadVertex2Z)] = i2;
} }
t = std::make_tuple(QuadVertex3X, QuadVertex3Y, QuadVertex3Z); t = std::make_tuple(QuadVertex3X, QuadVertex3Y, QuadVertex3Z);
@ -812,7 +812,7 @@ bool Map::LoadV2(FILE *f) {
else { else {
i3 = (uint32)verts.size(); i3 = (uint32)verts.size();
verts.push_back(Vertex(QuadVertex3X, QuadVertex3Y, QuadVertex3Z)); verts.push_back(Vertex(QuadVertex3X, QuadVertex3Y, QuadVertex3Z));
cur_verts[t] = i3; cur_verts[std::make_tuple(QuadVertex3X, QuadVertex3Y, QuadVertex3Z)] = i3;
} }
t = std::make_tuple(QuadVertex4X, QuadVertex4Y, QuadVertex4Z); t = std::make_tuple(QuadVertex4X, QuadVertex4Y, QuadVertex4Z);
@ -823,7 +823,7 @@ bool Map::LoadV2(FILE *f) {
else { else {
i4 = (uint32)verts.size(); i4 = (uint32)verts.size();
verts.push_back(Vertex(QuadVertex4X, QuadVertex4Y, QuadVertex4Z)); verts.push_back(Vertex(QuadVertex4X, QuadVertex4Y, QuadVertex4Z));
cur_verts[t] = i4; cur_verts[std::make_tuple(QuadVertex4X, QuadVertex4Y, QuadVertex4Z)] = i4;
} }
indices.push_back(i4); indices.push_back(i4);