games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

New, experimental crashhandler for windows (creates minidumps).

Browse Source 
Several minor fixes and improvements.
This commit is contained in:
Michał W. Urbańczyk
2009-07-31 20:10:22 +00:00
parent 586957b749
commit 78afb07f52
11 changed files with 169 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
client/CPlayerInterface.cpp
View File

@ -278,34 +278,36 @@ void CPlayerInterface::heroMoved(const TryMoveHero & details)
if(details.result == TryMoveHero::TELEPORTATION || details.start == details.end)
return;
//initializing objects and performing first step of move
int3 hp = details.start;
if (details.result != TryMoveHero::SUCCESS) //hero failed to move
if(makingTurn && ho->tempOwner == playerID) //we are moving our hero
{
if(details.result != TryMoveHero::FAILED)
if (details.result != TryMoveHero::SUCCESS && details.result != TryMoveHero::FAILED) //hero didn't change tile but visit succeeded
{
adventureInt->paths.erase(ho);
adventureInt->terrain.currentPath = NULL;
}
else if(adventureInt->terrain.currentPath) //&& hero is moving
{
//remove one node from the path (the one we went)
adventureInt->terrain.currentPath->nodes.erase(adventureInt->terrain.currentPath->nodes.end()-1);
if(!adventureInt->terrain.currentPath->nodes.size()) //if it was the last one, remove entire path
{
adventureInt->paths.erase(ho);
adventureInt->terrain.currentPath = NULL;
}
}
}
if (details.result != TryMoveHero::SUCCESS) //hero failed to move
{
ho->isStanding = true;
stillMoveHero.setn(STOP_MOVE);
LOCPLINT->totalRedraw();
return;
}
if (adventureInt->terrain.currentPath) //&& hero is moving
{
//remove one node from the path (the one we went)
adventureInt->terrain.currentPath->nodes.erase(adventureInt->terrain.currentPath->nodes.end()-1);
if(!adventureInt->terrain.currentPath->nodes.size()) //if it was the last one, remove entire path
{
adventureInt->paths.erase(ho);
adventureInt->terrain.currentPath = NULL;
}
}
//initializing objects and performing first step of move
if(details.end.x+1 == details.start.x && details.end.y+1 == details.start.y) //tl
{
//ho->moveDir = 1;