From 807071d35159de0660f9df31c48d5bf895ca3622 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 27 Apr 2008 15:15:17 +0000 Subject: [FIX] Pokemod objects now know about parents [FIX] Project includes are now relative [FIX] Headers included for better detection of invalid headers [FIX] Validation code commented out so it can be done better git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@111 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemodr/MapUI.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'pokemodr/MapUI.cpp') diff --git a/pokemodr/MapUI.cpp b/pokemodr/MapUI.cpp index 27bcfc6b..36a2cc3e 100644 --- a/pokemodr/MapUI.cpp +++ b/pokemodr/MapUI.cpp @@ -15,26 +15,26 @@ * with this program. If not, see . */ -// Qt includes -#include -#include - -// General includes -#include -#include +// Header include +#include "MapUI.h" // Pokemod includes -#include -#include +#include "../pokemod/MapWarp.h" +#include "../pokemod/Pokemod.h" -// Header include -#include "MapUI.h" +// General includes +#include "../general/BugCatcher.h" +#include "../general/Exception.h" + +// Qt includes +#include +#include MapUI::MapUI(Map* map, QWidget* parent) : ObjectUI(parent), m_map(map), m_map_mod(new Map(*map)), - m_model(new TilemapModel(this, m_map_mod->map(), m_map->pokemod())), + m_model(new TilemapModel(this, m_map_mod->map(), static_cast(m_map->pokemod()))), m_delegate(new TileDelegate(this)) { setupUi(this); -- cgit