Mercurial > fife-parpg

comparison engine/core/controller/engine.cpp @ 300:1465536aec94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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
comparison
equal deleted inserted replaced
299:ff8bc835260c 300:1465536aec94
58 #include "video/fonts/abstractfont.h" 58 #include "video/fonts/abstractfont.h"
59 #include "loaders/native/video_loaders/subimage_loader.h" 59 #include "loaders/native/video_loaders/subimage_loader.h"
60 #include "loaders/native/video_loaders/image_loader.h" 60 #include "loaders/native/video_loaders/image_loader.h"
61 #include "loaders/native/audio_loaders/ogg_loader.h" 61 #include "loaders/native/audio_loaders/ogg_loader.h"
62 #include "model/model.h" 62 #include "model/model.h"
63 //#include "pathfinder/linearpather/linearpather.h" 63 #include "pathfinder/linearpather/linearpather.h"
64 #include "pathfinder/routepather/routepather.h" 64 #include "pathfinder/routepather/routepather.h"
65 #include "model/metamodel/grids/hexgrid.h" 65 #include "model/metamodel/grids/hexgrid.h"
66 #include "model/metamodel/grids/squaregrid.h" 66 #include "model/metamodel/grids/squaregrid.h"
67 #include "view/view.h" 67 #include "view/view.h"
68 #include "view/renderers/camerazonerenderer.h" 68 #include "view/renderers/camerazonerenderer.h"
233 m_soundmanager->setVolume(static_cast<float>(m_settings.getInitialVolume()) / 10); 233 m_soundmanager->setVolume(static_cast<float>(m_settings.getInitialVolume()) / 10);
234 234
235 FL_LOG(_log, "Creating model"); 235 FL_LOG(_log, "Creating model");
236 m_model = new Model(); 236 m_model = new Model();
237 FL_LOG(_log, "Adding pathers to model"); 237 FL_LOG(_log, "Adding pathers to model");
238 // m_model->adoptPather(new LinearPather()); 238 m_model->adoptPather(new LinearPather());
239 m_model->adoptPather(new RoutePather()); 239 m_model->adoptPather(new RoutePather());
240 FL_LOG(_log, "Adding grid prototypes to model"); 240 FL_LOG(_log, "Adding grid prototypes to model");
241 m_model->adoptCellGrid(new SquareGrid()); 241 m_model->adoptCellGrid(new SquareGrid());
242 m_model->adoptCellGrid(new HexGrid()); 242 m_model->adoptCellGrid(new HexGrid());
243 243