diff options
Diffstat (limited to 'src/Instance.cpp')
-rw-r--r-- | src/Instance.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/Instance.cpp b/src/Instance.cpp index 29a912b..a6346ad 100644 --- a/src/Instance.cpp +++ b/src/Instance.cpp @@ -66,15 +66,15 @@ Instance::Instance(const Glib::ustring &file) : window(0), levelXml(0), level(0) view = new View::TopView(); window->getRenderArea()->setView(view); - mapView = new View::MapView(window->getRenderArea()); + mapView = new View::MapView(view); window->getMapArea()->setView(mapView); Gtk::ToolButton *button; xml->get_widget("ToolButtonZoomIn", button); - button->signal_clicked().connect(sigc::bind(sigc::mem_fun(view, &View::TopView::zoom), window->getRenderArea(), 2, 0, 0)); + button->signal_clicked().connect(sigc::bind(sigc::mem_fun(view, &View::TopView::zoom), 2, 0, 0)); xml->get_widget("ToolButtonZoomOut", button); - button->signal_clicked().connect(sigc::bind(sigc::mem_fun(view, &View::TopView::zoom), window->getRenderArea(), -2, 0, 0)); + button->signal_clicked().connect(sigc::bind(sigc::mem_fun(view, &View::TopView::zoom), -2, 0, 0)); if(file.empty()) createLevel(); @@ -136,13 +136,11 @@ void Instance::createLevel() { level = new Data::Level(root); view->setLevel(level); - mapView->setLevel(level); } bool Instance::loadLevel(const Glib::ustring &file) { if(level) { view->setLevel(0); - mapView->setLevel(0); delete level; level = 0; } @@ -162,7 +160,6 @@ bool Instance::loadLevel(const Glib::ustring &file) { level = new Data::Level(doc->get_root_node()); view->setLevel(level); - mapView->setLevel(level); return true; } |