Mercurial > fife-parpg
diff engine/core/controller/engine.cpp @ 300:1465536aec94
* Reverting revisions 2937 - 2947; these have been pathfinding related changes that partially broke some FIFE-based 3rd party games
* trunk has been copied to branches/active/pathfinding before the revert, so you can continue to work on the pathfinding changes without the risk of breaking trunk by accident
| author | mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Mon, 06 Jul 2009 19:51:22 +0000 |
| parents | 8aae3fabcf41 |
| children | 8afb9b443f66 |
line wrap: on
line diff
--- a/engine/core/controller/engine.cpp Mon Jul 06 01:35:34 2009 +0000 +++ b/engine/core/controller/engine.cpp Mon Jul 06 19:51:22 2009 +0000 @@ -60,7 +60,7 @@ #include "loaders/native/video_loaders/image_loader.h" #include "loaders/native/audio_loaders/ogg_loader.h" #include "model/model.h" -//#include "pathfinder/linearpather/linearpather.h" +#include "pathfinder/linearpather/linearpather.h" #include "pathfinder/routepather/routepather.h" #include "model/metamodel/grids/hexgrid.h" #include "model/metamodel/grids/squaregrid.h" @@ -235,7 +235,7 @@ FL_LOG(_log, "Creating model"); m_model = new Model(); FL_LOG(_log, "Adding pathers to model"); -// m_model->adoptPather(new LinearPather()); + m_model->adoptPather(new LinearPather()); m_model->adoptPather(new RoutePather()); FL_LOG(_log, "Adding grid prototypes to model"); m_model->adoptCellGrid(new SquareGrid());