[Bastion-cvs] bastion/src/interface/gui MenuMoveOrderEditor.cpp,1.6,1.7 MenuMoveOrderEditor.h,1.3,1.
Brought to you by:
jacek_kolodziej
|
From: Jacek K. <jac...@us...> - 2004-06-30 13:52:47
|
Update of /cvsroot/bastion/bastion/src/interface/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28722/src/interface/gui Modified Files: MenuMoveOrderEditor.cpp MenuMoveOrderEditor.h MenuOrders.cpp MenuTeam.cpp Log Message: - krok w kierunku umozliwienia istnienia swiata, bez istnienia jego wizualizacji: przeniesienie EventDispatchera z klasy GameView do statycznego pola klasy EventDispatcher. Aby pobrac EventDispatchera wystarczy teraz wywolac EvnetDispatcher::get(). Pozostaje jeszcze zrobic tak aby figurki w UnitHandlerze i InformationCollectorze byly przypisywane z zewnatrz. Index: MenuMoveOrderEditor.cpp =================================================================== RCS file: /cvsroot/bastion/bastion/src/interface/gui/MenuMoveOrderEditor.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MenuMoveOrderEditor.cpp 28 Apr 2004 11:34:24 -0000 1.6 --- MenuMoveOrderEditor.cpp 30 Jun 2004 13:52:37 -0000 1.7 *************** *** 26,30 **** MenuMoveOrderEditor::~MenuMoveOrderEditor() { ! dispatcher->unregisterListener(this); delete commonComponents; if (figure) delete figure; --- 26,30 ---- MenuMoveOrderEditor::~MenuMoveOrderEditor() { ! EventDispatcher::get()->unregisterListener(this); delete commonComponents; if (figure) delete figure; *************** *** 61,66 **** figure = NULL; ! dispatcher = menuManager->getGUIView()->getGameView()->getEventDispatcher(); ! dispatcher->registerListener(EventDispatcher::EOnMapMouseClick, this); figure = new MapPointFigure --- 61,66 ---- figure = NULL; ! EventDispatcher::get(); ! EventDispatcher::get()->registerListener(EventDispatcher::EOnMapMouseClick, this); figure = new MapPointFigure *************** *** 142,146 **** delete getInstance()->figure; getInstance()->figure = NULL; ! getInstance()->dispatcher->unregisterListener(getInstance()); if (getInstance()->creatingNewOrder && getInstance()->order) { --- 142,146 ---- delete getInstance()->figure; getInstance()->figure = NULL; ! EventDispatcher::get()->unregisterListener(getInstance()); if (getInstance()->creatingNewOrder && getInstance()->order) { *************** *** 157,161 **** delete getInstance()->figure; getInstance()->figure = NULL; ! getInstance()->dispatcher->unregisterListener(getInstance()); /// Utrwalanie parametrow rozkazu. --- 157,161 ---- delete getInstance()->figure; getInstance()->figure = NULL; ! EventDispatcher::get()->unregisterListener(getInstance()); /// Utrwalanie parametrow rozkazu. Index: MenuOrders.cpp =================================================================== RCS file: /cvsroot/bastion/bastion/src/interface/gui/MenuOrders.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MenuOrders.cpp 26 May 2004 19:00:56 -0000 1.11 --- MenuOrders.cpp 30 Jun 2004 13:52:37 -0000 1.12 *************** *** 30,35 **** MenuOrders::~MenuOrders() { ! menuManager->getGUIView()->getGameView()-> ! getEventDispatcher()->unregisterListener(this); delete orderChanges; if (menuOrderEditor) { --- 30,34 ---- MenuOrders::~MenuOrders() { ! EventDispatcher::get()->unregisterListener(this); delete orderChanges; if (menuOrderEditor) { *************** *** 114,120 **** hide(); ! menuManager->getGUIView()->getGameView()->getEventDispatcher()->registerListener( EventDispatcher::EOrderManipulation, this); ! menuManager->getGUIView()->getGameView()->getEventDispatcher()-> registerListener(EventDispatcher::ETeamEvents, this); --- 113,119 ---- hide(); ! EventDispatcher::get()->registerListener( EventDispatcher::EOrderManipulation, this); ! EventDispatcher::get()-> registerListener(EventDispatcher::ETeamEvents, this); Index: MenuMoveOrderEditor.h =================================================================== RCS file: /cvsroot/bastion/bastion/src/interface/gui/MenuMoveOrderEditor.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MenuMoveOrderEditor.h 17 Apr 2004 23:54:09 -0000 1.3 --- MenuMoveOrderEditor.h 30 Jun 2004 13:52:37 -0000 1.4 *************** *** 62,66 **** bool creatingNewOrder; ! EventDispatcher *dispatcher; Team *team; order::OrderMove *order; --- 62,66 ---- bool creatingNewOrder; ! //EventDispatcher *dispatcher; Team *team; order::OrderMove *order; Index: MenuTeam.cpp =================================================================== RCS file: /cvsroot/bastion/bastion/src/interface/gui/MenuTeam.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MenuTeam.cpp 21 May 2004 15:12:45 -0000 1.14 --- MenuTeam.cpp 30 Jun 2004 13:52:37 -0000 1.15 *************** *** 46,50 **** MenuTeam::~MenuTeam() { ! menuManager->getGUIView()->getGameView()->getEventDispatcher()-> unregisterListener(this); --- 46,50 ---- MenuTeam::~MenuTeam() { ! EventDispatcher::get()-> unregisterListener(this); *************** *** 113,117 **** //refreshLabels(); ! menuManager->getGUIView()->getGameView()->getEventDispatcher()-> registerListener(EventDispatcher::ETeamEvents, this); --- 113,117 ---- //refreshLabels(); ! EventDispatcher::get()-> registerListener(EventDispatcher::ETeamEvents, this); |