Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Visual Studio 2013 compilation support for Ryzom Tools

Browse source
This commit is contained in:
kaetemi 2015-02-23 12:28:13 +01:00
parent ebdc7ba16b
commit 4cd6fad710
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/server/src/ai_share/16x16_layer.cpp
View file

@ -100,7 +100,7 @@ I16x16Layer *I16x16Layer::compress(I16x16Layer *layer, sint32 blank)
map<sint32, uint>::iterator it = count.find(val); map<sint32, uint>::iterator it = count.find(val);
if (it == count.end()) if (it == count.end())
count.insert(make_pair<sint32, uint>(val, 1)); count.insert(std::pair<sint32, uint>(val, 1));
else else
++((*it).second); ++((*it).second);
} }

12
code/ryzom/server/src/ai_share/world_map.cpp
View file

@ -1469,7 +1469,7 @@ bool CWorldMap::findAStarPath(CWorldPosition const& start, CWorldPosition const&
uint father = (uint)nodes.size()-1; uint father = (uint)nodes.size()-1;
// Add start topology to visited nodes (father holds start topo node index for the moment) // Add start topology to visited nodes (father holds start topo node index for the moment)
visited.insert(make_pair<CTopology::TTopologyId,uint>(startTopo, father)); visited.insert(std::pair<CTopology::TTopologyId, uint>(startTopo, father));
// Push start node in the heap with a zero cost // Push start node in the heap with a zero cost
heap.push(0.0f, father); heap.push(0.0f, father);
@ -1562,7 +1562,7 @@ bool CWorldMap::findAStarPath(CWorldPosition const& start, CWorldPosition const&
// Add node to heap with a computed f(n)=g(n)+h(n) // Add node to heap with a computed f(n)=g(n)+h(n)
heap.push(distance + heuristic, child); heap.push(distance + heuristic, child);
// Add node to visited // Add node to visited
visited.insert(make_pair<CTopology::TTopologyId,uint>(next, child)); visited.insert(std::pair<CTopology::TTopologyId, uint>(next, child));
} }
} }
@ -1633,7 +1633,7 @@ bool CWorldMap::findAStarPath(const CTopology::TTopologyId &start, const CTopolo
uint father = (uint)nodes.size()-1; uint father = (uint)nodes.size()-1;
// add current to visited nodes // add current to visited nodes
visited.insert(make_pair<CTopology::TTopologyId,uint>(startTopo, father)); visited.insert(std::pair<CTopology::TTopologyId, uint>(startTopo, father));
heap.push(0.0f, father); heap.push(0.0f, father);
bool found=false; bool found=false;
@ -1699,7 +1699,7 @@ bool CWorldMap::findAStarPath(const CTopology::TTopologyId &start, const CTopolo
// add node to visited and to heap // add node to visited and to heap
heap.push(heuristic, child); heap.push(heuristic, child);
visited.insert(make_pair<CTopology::TTopologyId,uint>(next, child)); visited.insert(std::pair<CTopology::TTopologyId, uint>(next, child));
} }
} }
@ -1767,7 +1767,7 @@ bool CWorldMap::findInsideAStarPath(CWorldPosition const& start, CWorldPosition
uint father = (uint)nodes.size()-1; uint father = (uint)nodes.size()-1;
// Add start node to visited nodes (father holds start node index for the moment) // Add start node to visited nodes (father holds start node index for the moment)
visited.insert(make_pair<CAStarNode, uint>(startNode, father)); visited.insert(std::pair<CAStarNode, uint>(startNode, father));
// Push start node in the heap with a zero cost // Push start node in the heap with a zero cost
heap.push(0.0f, father); heap.push(0.0f, father);
@ -1854,7 +1854,7 @@ bool CWorldMap::findInsideAStarPath(CWorldPosition const& start, CWorldPosition
// Add node to heap with a computed f(n)=g(n)+h(n) // Add node to heap with a computed f(n)=g(n)+h(n)
heap.push(distance + heuristic, child); heap.push(distance + heuristic, child);
// Add node to visited // Add node to visited
visited.insert(make_pair<CAStarNode, uint>(next, child)); visited.insert(std::pair<CAStarNode, uint>(next, child));
} }
} }