Mercurial > fife-parpg

diff engine/core/controller/engine.cpp @ 33:112fc4af772d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved grid ownership to model in similar way as with pathers
author jasoka@33b003aa-7bff-0310-803a-e67f0ece8222
date Fri, 11 Jul 2008 15:42:54 +0000
parents 75b6394ced14
children 90005975cdbb
line wrap: on
line diff
--- a/engine/core/controller/engine.cpp	Fri Jul 11 15:37:16 2008 +0000
+++ b/engine/core/controller/engine.cpp	Fri Jul 11 15:42:54 2008 +0000
@@ -59,12 +59,11 @@
 #include "loaders/native/video_loaders/subimage_loader.h"
 #include "loaders/native/video_loaders/image_loader.h"
 #include "loaders/native/audio_loaders/ogg_loader.h"
-//#include "loaders/fallout/model_loaders/dat1.h"
-//#include "loaders/fallout/model_loaders/dat2.h"
 #include "model/model.h"
 #include "pathfinder/linearpather/linearpather.h"
 #include "pathfinder/routepather/routepather.h"
-
+#include "model/metamodel/grids/hexgrid.h"
+#include "model/metamodel/grids/squaregrid.h"
 #include "view/view.h"
 #include "view/renderers/camerazonerenderer.h"
 #include "view/renderers/quadtreerenderer.h"
@@ -232,6 +231,9 @@
 		FL_LOG(_log, "Adding pathers to model");
 		m_model->adoptPather(new LinearPather());
 		m_model->adoptPather(new RoutePather());
+		FL_LOG(_log, "Adding grid prototypes to model");
+		m_model->adoptCellGrid(new SquareGrid());
+		m_model->adoptCellGrid(new HexGrid());
 
 		FL_LOG(_log, "Creating view");
 		m_view = new View(m_renderbackend, m_imagepool, m_animpool);