mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 07:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into 310

Browse source 
Conflicts:
	src/game/CharacterHandler.cpp
	src/game/Player.cpp
This commit is contained in:
tomrus88 2009-04-29 11:51:15 +04:00
commit d4323e0071
88 changed files with 681 additions and 685 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/WaypointMovementGenerator.cpp
View file

@ -56,7 +56,7 @@ void WaypointMovementGenerator<Creature>::LoadPath(Creature &c)
uint32 node_count = i_path->size();
i_hasDone.resize(node_count);
for(uint32 i = 0; i < node_count-1; i++)
for(uint32 i = 0; i < node_count-1; ++i)
i_hasDone[i] = false;
// to prevent a misbehavior inside "update"
@ -470,7 +470,7 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
break;
}
for (i = 0; i < nodes[atNode].enodenum; i++) //loop through all the links for this node
for (i = 0; i < nodes[atNode].enodenum; ++i) //loop through all the links for this node
{
newnode = nodes[atNode].links[i].targetNode;
@ -528,7 +528,7 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
parent[newnode] = atNode; //set the new parent for this node
gcost[newnode] = gc; //and the new g cost
for (i = 1; i < numOpen; i++) //loop through all the items on the open list
for (i = 1; i < numOpen; ++i) //loop through all the items on the open list
{
if (openlist[i] == newnode) //find this node in the list
{