Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tilemapobject/dev

Browse Source
This commit is contained in:
victorlevasseur
2014-09-23 22:32:19 +02:00
parent 0b02882639 10094b1912
commit ecd8528b77
2 changed files with 1790 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3053
Binaries/Output/Release_Windows/Examples/Lazer and zombies.gdg
View File

File diff suppressed because it is too large Load Diff

10
Extensions/PathfindingAutomatism/PathfindingAutomatism.cpp
View File

@@ -401,6 +401,8 @@ const float SearchContext::sqrt2 = 1.414213562;
}
PathfindingAutomatism::PathfindingAutomatism() :
parentScene(NULL),
sceneManager(NULL),
pathFound(false),
allowDiagonals(true),
acceleration(400),
@@ -422,7 +424,11 @@ PathfindingAutomatism::PathfindingAutomatism() :
void PathfindingAutomatism::MoveTo(RuntimeScene & scene, float x, float y)
{
if ( !sceneManager ) return;
if ( parentScene != &scene ) //Parent scene has changed
{
parentScene = &scene;
sceneManager = parentScene ? &ScenePathfindingObstaclesManager::managers[&scene] : NULL;
}
path.clear();
@@ -685,4 +691,4 @@ bool PathfindingAutomatism::UpdateProperty(const std::string & name, const std::
return true;
}
#endif
#endif