[Adonthell-commits] CVS: adonthell/src event.cc,1.14,1.15 event_list.cc,1.2,1.3 gamedata.cc,1.22,1.23

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv28011

Modified Files:
        event.cc event_list.cc gamedata.cc 
Log Message:
ADDED automatic unregistering on event destruction


Index: event.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/event.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** event.cc    9 Aug 2002 20:01:26 -0000       1.14
--- event.cc    11 Aug 2002 13:02:29 -0000      1.15
***************
*** 23,26 ****
--- 23,27 ----
  
  #include "event.h"
+ #include "event_handler.h"
  
  // constructor
***************
*** 37,40 ****
--- 38,44 ----
  event::~event ()
  {
+     // automatically remove myself from the event_handler
+     event_handler::remove_event (this);
+     
      clear ();
  }

Index: event_list.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/event_list.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** event_list.cc       9 Aug 2002 20:01:26 -0000       1.2
--- event_list.cc       11 Aug 2002 13:02:29 -0000      1.3
***************
*** 43,47 ****
          e = events.back ();
          events.pop_back ();
-         event_handler::remove_event (e);
          delete e;    
      }    
--- 43,46 ----

Index: gamedata.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gamedata.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** gamedata.cc 11 Aug 2002 11:58:21 -0000      1.22
--- gamedata.cc 11 Aug 2002 13:02:29 -0000      1.23
***************
*** 551,555 ****
      // delete all characters
      dictionary <character *>::iterator itc;
!     for (itc = data::characters.begin (); itc != data::characters.end (); 
itc++) 
      {
          itc->second->remove_from_map (); 
--- 551,555 ----
      // delete all characters
      dictionary <character *>::iterator itc;
!     for (itc = data::characters.begin (); itc != data::characters.end (); 
itc++)
      {
          itc->second->remove_from_map ();