Mercurial > fife-parpg

diff engine/core/controller/engine.cpp @ 310:8afb9b443f66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged the pathfinding branch to trunk
author wenlin_fife@33b003aa-7bff-0310-803a-e67f0ece8222
date Fri, 14 Aug 2009 00:00:58 +0000
parents 1465536aec94
children fa3778416433
line wrap: on
line diff
--- a/engine/core/controller/engine.cpp	Wed Aug 12 22:36:29 2009 +0000
+++ b/engine/core/controller/engine.cpp	Fri Aug 14 00:00:58 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());