[Planeshift-cvs] CVS: planeshift/src/client/gui chatwindow.cpp,1.116,1.117 pawsactivemagicwindow.cpp

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8277/src/client/gui

Modified Files:
	chatwindow.cpp pawsactivemagicwindow.cpp 
	pawsbookreadingwindow.cpp pawsbuddy.cpp pawscharcreatemain.cpp 
	pawschardescription.cpp pawscharpick.cpp pawscharpick.h 
	pawscontainerdescwindow.cpp pawscraft.cpp pawsdetailwindow.cpp 
	pawsexchangewindow.cpp pawsglyphwindow.cpp pawsgmgui.cpp 
	pawsgmspawn.cpp pawsgroupwindow.cpp pawsguildwindow.cpp 
	pawsinfowindow.cpp pawsinteractwindow.cpp 
	pawsitemdescriptionwindow.cpp pawsloading.cpp 
	pawslootwindow.cpp pawsmerchantwindow.cpp 
	pawspetitiongmwindow.cpp pawspetitionwindow.cpp 
	pawsquestrewardwindow.cpp pawsquestwindow.cpp 
	pawsskillwindow.cpp pawsspellbookwindow.cpp psmainwidget.cpp 
Log Message:
- Normalized all MSG_TYPES to use MSGTYPE_ for prefix.
- Added PSF for a number of messages.
- Created uniq number for petition request message. Used different
  format for same id before => NETVERSION BUMPED  
- Added force of character type to NPC for importnpc.


Index: chatwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/chatwindow.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** chatwindow.cpp	18 Feb 2006 14:12:07 -0000	1.116
--- chatwindow.cpp	22 Feb 2006 22:19:42 -0000	1.117
***************
*** 124,129 ****
      soundmgr = psengine->GetSoundManager();
  
!     msgqueue->Subscribe(this, MSGTYPECHAT);
!     msgqueue->Subscribe(this, MSGTYPESYSTEM);
  
      SubscribeCommands();
--- 124,129 ----
      soundmgr = psengine->GetSoundManager();
  
!     msgqueue->Subscribe(this, MSGTYPE_CHAT);
!     msgqueue->Subscribe(this, MSGTYPE_SYSTEM);
  
      SubscribeCommands();
***************
*** 718,722 ****
      bool flashEnabled = true;
  
!     if ( me->GetType() == MSGTYPESYSTEM )
      {
          psSystemMessage msg(me);
--- 718,722 ----
      bool flashEnabled = true;
  
!     if ( me->GetType() == MSGTYPE_SYSTEM )
      {
          psSystemMessage msg(me);

Index: pawsactivemagicwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsactivemagicwindow.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pawsactivemagicwindow.cpp	3 Feb 2006 23:00:56 -0000	1.9
--- pawsactivemagicwindow.cpp	22 Feb 2006 22:19:42 -0000	1.10
***************
*** 52,56 ****
  
      msgHandler = psengine->GetMsgHandler();
!     if ( !msgHandler->Subscribe( this, MSGTYPEACTIVEMAGIC ) )
          return false;
  
--- 52,56 ----
  
      msgHandler = psengine->GetMsgHandler();
!     if ( !msgHandler->Subscribe( this, MSGTYPE_ACTIVEMAGIC ) )
          return false;
  

Index: pawsbookreadingwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsbookreadingwindow.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pawsbookreadingwindow.cpp	9 Feb 2006 07:24:58 -0000	1.7
--- pawsbookreadingwindow.cpp	22 Feb 2006 22:19:42 -0000	1.8
***************
*** 50,54 ****
  
      if ( !msgHandler ) return false;
!     if ( !msgHandler->Subscribe( this,  MSG_TYPE_READ_BOOK ) ) return false;
  
      // Store some of our children for easy access later on.
--- 50,54 ----
  
      if ( !msgHandler ) return false;
!     if ( !msgHandler->Subscribe( this,  MSGTYPE_READ_BOOK ) ) return false;
  
      // Store some of our children for easy access later on.

Index: pawsbuddy.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsbuddy.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** pawsbuddy.cpp	3 Feb 2006 23:00:56 -0000	1.26
--- pawsbuddy.cpp	22 Feb 2006 22:19:42 -0000	1.27
***************
*** 38,43 ****
  bool pawsBuddyWindow::PostSetup()
  {
!     psengine->GetMsgHandler()->Subscribe( this, MSG_BUDDY_LIST );
!     psengine->GetMsgHandler()->Subscribe( this, MSG_BUDDY_STATUS );
                  
      buddyList = (pawsListBox*)FindWidget("BuddyList");
--- 38,43 ----
  bool pawsBuddyWindow::PostSetup()
  {
!     psengine->GetMsgHandler()->Subscribe( this, MSGTYPE_BUDDY_LIST );
!     psengine->GetMsgHandler()->Subscribe( this, MSGTYPE_BUDDY_STATUS );
                  
      buddyList = (pawsListBox*)FindWidget("BuddyList");
***************
*** 76,80 ****
      buddyList->Clear();
                 
!     if ( me->GetType() == MSG_BUDDY_LIST )
      {
          psBuddyListMsg mesg(me);
--- 76,80 ----
      buddyList->Clear();
                 
!     if ( me->GetType() == MSGTYPE_BUDDY_LIST )
      {
          psBuddyListMsg mesg(me);
***************
*** 92,96 ****
      
      }
!     else if ( me->GetType() == MSG_BUDDY_STATUS )
      {
          psBuddyStatus mesg(me);
--- 92,96 ----
      
      }
!     else if ( me->GetType() == MSGTYPE_BUDDY_STATUS )
      {
          psBuddyStatus mesg(me);

Index: pawscharcreatemain.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharcreatemain.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** pawscharcreatemain.cpp	18 Feb 2006 14:12:07 -0000	1.88
--- pawscharcreatemain.cpp	22 Feb 2006 22:19:42 -0000	1.89
***************
*** 67,72 ****
      
      msgHandler = psengine->GetMsgHandler();
!     msgHandler->Subscribe(this, MSG_CHARCREATE_CP); 
!     msgHandler->Subscribe(this, MSG_CHARCREATE_NAME);
      createManager->SetGender( PSCHARACTER_GENDER_MALE ); 
      currentGender = PSCHARACTER_GENDER_MALE;
--- 67,72 ----
      
      msgHandler = psengine->GetMsgHandler();
!     msgHandler->Subscribe(this, MSGTYPE_CHAR_CREATE_CP); 
!     msgHandler->Subscribe(this, MSGTYPE_CHAR_CREATE_NAME);
      createManager->SetGender( PSCHARACTER_GENDER_MALE ); 
      currentGender = PSCHARACTER_GENDER_MALE;
***************
*** 187,191 ****
      switch ( me->GetType() )
      {
!         case MSG_CHARCREATE_CP:
          {  
              int race = me->GetInt32();
--- 187,191 ----
      switch ( me->GetType() )
      {
!         case MSGTYPE_CHAR_CREATE_CP:
          {  
              int race = me->GetInt32();
***************
*** 197,201 ****
          }
          
!         case MSG_CHARCREATE_NAME:
          {
               psNameCheckMessage msg;
--- 197,201 ----
          }
          
!         case MSGTYPE_CHAR_CREATE_NAME:
          {
               psNameCheckMessage msg;

Index: pawschardescription.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawschardescription.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pawschardescription.cpp	3 Feb 2006 23:00:56 -0000	1.16
--- pawschardescription.cpp	22 Feb 2006 22:19:42 -0000	1.17
***************
*** 76,82 ****
  void pawsCharDescription::RequestDetails()
  {
!     if ( !psengine->GetMsgHandler()->Subscribe( this, MSGTYPECHARACTERDETAILS ) )
      {
!         printf("Couldn't subscribe to MSGTYPECHARACTERDETAILS (pawsCharDescription)");
          return;
      }
--- 76,82 ----
  void pawsCharDescription::RequestDetails()
  {
!     if ( !psengine->GetMsgHandler()->Subscribe( this, MSGTYPE_CHARACTERDETAILS ) )
      {
!         printf("Couldn't subscribe to MSGTYPE_CHARACTERDETAILS (pawsCharDescription)");
          return;
      }
***************
*** 89,93 ****
  {
  
!     if (me->GetType() == MSGTYPECHARACTERDETAILS)
      {
          psCharacterDetailsMessage msg(me);
--- 89,93 ----
  {
  
!     if (me->GetType() == MSGTYPE_CHARACTERDETAILS)
      {
          psCharacterDetailsMessage msg(me);
***************
*** 96,100 ****
          {
              description->SetText(msg.desc);
!             psengine->GetMsgHandler()->Unsubscribe( this, MSGTYPECHARACTERDETAILS );
          }
          return;
--- 96,100 ----
          {
              description->SetText(msg.desc);
!             psengine->GetMsgHandler()->Unsubscribe( this, MSGTYPE_CHARACTERDETAILS );
          }
          return;

Index: pawscharpick.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharpick.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** pawscharpick.cpp	18 Feb 2006 14:12:07 -0000	1.55
--- pawscharpick.cpp	22 Feb 2006 22:19:42 -0000	1.56
***************
*** 67,72 ****
      if(msgHandler)
      {
!         msgHandler->Unsubscribe( this, MSGTYPECHARACTERDATA );
!         msgHandler->Unsubscribe( this, MSG_CHARDELETE );
      }
  }
--- 67,72 ----
      if(msgHandler)
      {
!         msgHandler->Unsubscribe( this, MSGTYPE_CHARACTERDATA );
!         msgHandler->Unsubscribe( this, MSGTYPE_CHAR_DELETE );
      }
  }
***************
*** 79,84 ****
  
      // Subscribe our message types that we are interested in. 
!     if ( !msgHandler->Subscribe( this, MSGTYPECHARACTERDATA ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSG_CHARDELETE ) ) return false;
          
      view = (pawsObjectView*)FindWidget("PaperDollView");
--- 79,84 ----
  
      // Subscribe our message types that we are interested in. 
!     if ( !msgHandler->Subscribe( this, MSGTYPE_CHARACTERDATA ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSGTYPE_CHAR_DELETE ) ) return false;
          
      view = (pawsObjectView*)FindWidget("PaperDollView");
***************
*** 96,100 ****
          // Incomming character description.  At the moment it is just the
          // character name and the factory of the mesh.
!         case MSGTYPECHARACTERDATA:
          {
              // Set the name of the character in the right button.
--- 96,100 ----
          // Incomming character description.  At the moment it is just the
          // character name and the factory of the mesh.
!         case MSGTYPE_CHARACTERDATA:
          {
              // Set the name of the character in the right button.
***************
*** 155,159 ****
              return;
          }
!         case MSG_CHARDELETE:
          {
              // Emulate back click
--- 155,159 ----
              return;
          }
!         case MSGTYPE_CHAR_DELETE:
          {
              // Emulate back click

Index: pawscharpick.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscharpick.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** pawscharpick.h	3 Feb 2006 23:00:57 -0000	1.15
--- pawscharpick.h	22 Feb 2006 22:19:42 -0000	1.16
***************
*** 23,27 ****
   *  
   *  From this window you can also select to create a new character and enter
!  *  that phase. This is connected to the network and listens for MSGTYPECHARACTERDATA
   *  type messages.
   */
--- 23,27 ----
   *  
   *  From this window you can also select to create a new character and enter
!  *  that phase. This is connected to the network and listens for MSGTYPE_CHARACTERDATA
   *  type messages.
   */

Index: pawscontainerdescwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscontainerdescwindow.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** pawscontainerdescwindow.cpp	6 Feb 2006 08:00:50 -0000	1.40
--- pawscontainerdescwindow.cpp	22 Feb 2006 22:19:42 -0000	1.41
***************
*** 80,86 ****
  
      if ( !msgHandler ) return false;
!     if ( !msgHandler->Subscribe(this, MSG_TYPE_VIEW_CONTAINER ) )
          return false;        
!     if ( !msgHandler->Subscribe(this, MSG_TYPE_UPDATE_ITEM ) )
          return false;        
  
--- 80,86 ----
  
      if ( !msgHandler ) return false;
!     if ( !msgHandler->Subscribe(this, MSGTYPE_VIEW_CONTAINER ) )
          return false;        
!     if ( !msgHandler->Subscribe(this, MSGTYPE_UPDATE_ITEM ) )
          return false;        
  
***************
*** 200,209 ****
      switch ( me->GetType() )
      {
!         case MSG_TYPE_VIEW_CONTAINER:
          {
              HandleViewItem( me );
              break;
          }
!         case MSG_TYPE_UPDATE_ITEM:
          {
              HandleUpdateItem( me );
--- 200,209 ----
      switch ( me->GetType() )
      {
!         case MSGTYPE_VIEW_CONTAINER:
          {
              HandleViewItem( me );
              break;
          }
!         case MSGTYPE_UPDATE_ITEM:
          {
              HandleUpdateItem( me );

Index: pawscraft.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawscraft.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pawscraft.cpp	9 Feb 2006 07:24:58 -0000	1.6
--- pawscraft.cpp	22 Feb 2006 22:19:42 -0000	1.7
***************
*** 36,40 ****
      if ( !msgHandler ) return false;
  
!     if ( !msgHandler->Subscribe( this, MSG_CRAFT_INFO ) )
          return false;
          
--- 36,40 ----
      if ( !msgHandler ) return false;
  
!     if ( !msgHandler->Subscribe( this, MSGTYPE_CRAFT_INFO ) )
          return false;
          

Index: pawsdetailwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsdetailwindow.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** pawsdetailwindow.cpp	3 Feb 2006 23:00:57 -0000	1.15
--- pawsdetailwindow.cpp	22 Feb 2006 22:19:42 -0000	1.16
***************
*** 50,59 ****
  {
      target = NULL;     
!     psengine->GetMsgHandler()->Subscribe( this, MSGTYPECHARACTERDETAILS );
  }
  
  pawsDetailWindow::~pawsDetailWindow()
  {
!     psengine->GetMsgHandler()->Unsubscribe( this, MSGTYPECHARACTERDETAILS );
  }
  
--- 50,59 ----
  {
      target = NULL;     
!     psengine->GetMsgHandler()->Subscribe( this, MSGTYPE_CHARACTERDETAILS );
  }
  
  pawsDetailWindow::~pawsDetailWindow()
  {
!     psengine->GetMsgHandler()->Unsubscribe( this, MSGTYPE_CHARACTERDETAILS );
  }
  
***************
*** 80,84 ****
  {
  
!     if (me->GetType() == MSGTYPECHARACTERDETAILS)
      {
          psCharacterDetailsMessage msg(me);
--- 80,84 ----
  {
  
!     if (me->GetType() == MSGTYPE_CHARACTERDETAILS)
      {
          psCharacterDetailsMessage msg(me);

Index: pawsexchangewindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsexchangewindow.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** pawsexchangewindow.cpp	3 Feb 2006 23:00:57 -0000	1.50
--- pawsexchangewindow.cpp	22 Feb 2006 22:19:42 -0000	1.51
***************
*** 68,79 ****
  pawsExchangeWindow::~pawsExchangeWindow()
  {
!     msgHandler->Unsubscribe( this, MSGTYPEGUIEXCHANGE );
!     msgHandler->Unsubscribe( this, MSG_TYPE_EXCHANGE_REQUEST );
!     msgHandler->Unsubscribe( this, MSG_TYPE_EXCHANGE_ADD_ITEM );
!     msgHandler->Unsubscribe( this, MSG_TYPE_EXCHANGE_REMOVE_ITEM );
!     msgHandler->Unsubscribe( this, MSG_TYPE_EXCHANGE_ACCEPT );       
!     msgHandler->Unsubscribe( this, MSG_TYPE_EXCHANGE_END );
!     msgHandler->Unsubscribe( this, MSG_TYPE_EXCHANGE_STATUS );
!     msgHandler->Unsubscribe( this, MSG_TYPE_EXCHANGE_MONEY );
  
      SCF_DESTRUCT_IBASE();
--- 68,79 ----
  pawsExchangeWindow::~pawsExchangeWindow()
  {
!     msgHandler->Unsubscribe( this, MSGTYPE_GUIEXCHANGE );
!     msgHandler->Unsubscribe( this, MSGTYPE_EXCHANGE_REQUEST );
!     msgHandler->Unsubscribe( this, MSGTYPE_EXCHANGE_ADD_ITEM );
!     msgHandler->Unsubscribe( this, MSGTYPE_EXCHANGE_REMOVE_ITEM );
!     msgHandler->Unsubscribe( this, MSGTYPE_EXCHANGE_ACCEPT );       
!     msgHandler->Unsubscribe( this, MSGTYPE_EXCHANGE_END );
!     msgHandler->Unsubscribe( this, MSGTYPE_EXCHANGE_STATUS );
!     msgHandler->Unsubscribe( this, MSGTYPE_EXCHANGE_MONEY );
  
      SCF_DESTRUCT_IBASE();
***************
*** 87,98 ****
      if ( !msgHandler ) return false;
  
!     if ( !msgHandler->Subscribe( this, MSGTYPEGUIEXCHANGE ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSG_TYPE_EXCHANGE_REQUEST ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSG_TYPE_EXCHANGE_ADD_ITEM ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSG_TYPE_EXCHANGE_REMOVE_ITEM ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSG_TYPE_EXCHANGE_ACCEPT ) ) return false;        
!     if ( !msgHandler->Subscribe( this, MSG_TYPE_EXCHANGE_END ) ) return false;        
!     if ( !msgHandler->Subscribe( this, MSG_TYPE_EXCHANGE_STATUS ) ) return false;           
!     if ( !msgHandler->Subscribe( this, MSG_TYPE_EXCHANGE_MONEY ) ) return false;               
       
      // the two backgrounds for the offering/receiving frame
--- 87,98 ----
      if ( !msgHandler ) return false;
  
!     if ( !msgHandler->Subscribe( this, MSGTYPE_GUIEXCHANGE ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSGTYPE_EXCHANGE_REQUEST ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSGTYPE_EXCHANGE_ADD_ITEM ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSGTYPE_EXCHANGE_REMOVE_ITEM ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSGTYPE_EXCHANGE_ACCEPT ) ) return false;        
!     if ( !msgHandler->Subscribe( this, MSGTYPE_EXCHANGE_END ) ) return false;        
!     if ( !msgHandler->Subscribe( this, MSGTYPE_EXCHANGE_STATUS ) ) return false;           
!     if ( !msgHandler->Subscribe( this, MSGTYPE_EXCHANGE_MONEY ) ) return false;               
       
      // the two backgrounds for the offering/receiving frame
***************
*** 200,204 ****
          //  Starting a new Exchange
          /////////////////////////////////////
!         case MSG_TYPE_EXCHANGE_REQUEST:
          {            
              psExchangeRequestMsg msg(me);
--- 200,204 ----
          //  Starting a new Exchange
          /////////////////////////////////////
!         case MSGTYPE_EXCHANGE_REQUEST:
          {            
              psExchangeRequestMsg msg(me);
***************
*** 210,214 ****
          //  Close Exchange ( either by rejection or normal end
          ///////////////////////////////////////////////////////////
!         case MSG_TYPE_EXCHANGE_END:
          {     
              Hide();
--- 210,214 ----
          //  Close Exchange ( either by rejection or normal end
          ///////////////////////////////////////////////////////////
!         case MSGTYPE_EXCHANGE_END:
          {     
              Hide();
***************
*** 230,234 ****
          //  Update the accept status for the exchange.
          ///////////////////////////////////////////////////////////        
!         case MSG_TYPE_EXCHANGE_STATUS:
          {
              psExchangeStatusMsg mesg(me);
--- 230,234 ----
          //  Update the accept status for the exchange.
          ///////////////////////////////////////////////////////////        
!         case MSGTYPE_EXCHANGE_STATUS:
          {
              psExchangeStatusMsg mesg(me);
***************
*** 247,251 ****
          //  Incomming money update
          ///////////////////////////////////////////////////////////                        
!         case MSG_TYPE_EXCHANGE_MONEY:
          {
              HandleMoney( me );
--- 247,251 ----
          //  Incomming money update
          ///////////////////////////////////////////////////////////                        
!         case MSGTYPE_EXCHANGE_MONEY:
          {
              HandleMoney( me );
***************
*** 256,260 ****
          //  An item has been removed from the exchange
          ///////////////////////////////////////////////////////////                
!         case MSG_TYPE_EXCHANGE_REMOVE_ITEM:
          {
              psExchangeRemoveItemMsg item(me);            
--- 256,260 ----
          //  An item has been removed from the exchange
          ///////////////////////////////////////////////////////////                
!         case MSGTYPE_EXCHANGE_REMOVE_ITEM:
          {
              psExchangeRemoveItemMsg item(me);            
***************
*** 282,286 ****
          //  An item has been added to the exchange
          ///////////////////////////////////////////////////////////        
!         case MSG_TYPE_EXCHANGE_ADD_ITEM:
          {
              psExchangeAddItemMsg item(me);                        
--- 282,286 ----
          //  An item has been added to the exchange
          ///////////////////////////////////////////////////////////        
!         case MSGTYPE_EXCHANGE_ADD_ITEM:
          {
              psExchangeAddItemMsg item(me);                        

Index: pawsglyphwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsglyphwindow.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** pawsglyphwindow.cpp	18 Feb 2006 21:54:07 -0000	1.31
--- pawsglyphwindow.cpp	22 Feb 2006 22:19:42 -0000	1.32
***************
*** 100,105 ****
  
      // Subscribe our message types that we are interested in.
!     if ( !msgHandler->Subscribe( this, MSG_TYPE_GLPYH_REQUEST ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSG_TYPE_GLYPH_ASSEMBLE ) ) return false;
      
      
--- 100,105 ----
  
      // Subscribe our message types that we are interested in.
!     if ( !msgHandler->Subscribe( this, MSGTYPE_GLPYH_REQUEST ) ) return false;
!     if ( !msgHandler->Subscribe( this, MSGTYPE_GLYPH_ASSEMBLE ) ) return false;
      
      
***************
*** 153,162 ****
      switch( me->GetType() )
      {
!         case MSG_TYPE_GLPYH_REQUEST:
          {
              HandleGlyphList(me);
              break;
          }
!         case MSG_TYPE_GLYPH_ASSEMBLE:
          {
              HandleAssemble( me );
--- 153,162 ----
      switch( me->GetType() )
      {
!         case MSGTYPE_GLPYH_REQUEST:
          {
              HandleGlyphList(me);
              break;
          }
!         case MSGTYPE_GLYPH_ASSEMBLE:
          {
              HandleAssemble( me );

Index: pawsgmgui.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsgmgui.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** pawsgmgui.cpp	4 Feb 2006 19:10:20 -0000	1.65
--- pawsgmgui.cpp	22 Feb 2006 22:19:42 -0000	1.66
***************
*** 90,95 ****
  pawsGmGUIWindow::~pawsGmGUIWindow()
  {
!     msgqueue->Unsubscribe(this, MSGTYPEGMGUI);
!     msgqueue->Unsubscribe(this, MSGTYPEMAPACTION);
  }
  
--- 90,95 ----
  pawsGmGUIWindow::~pawsGmGUIWindow()
  {
!     msgqueue->Unsubscribe(this, MSGTYPE_GMGUI);
!     msgqueue->Unsubscribe(this, MSGTYPE_MAPACTION);
  }
  
***************
*** 101,106 ****
  
      // Subscribe to certain types of messages (those we want to handle)
!     msgqueue->Subscribe(this, MSGTYPEGMGUI);
!     msgqueue->Subscribe(this, MSGTYPEMAPACTION);
  
      playerList = (pawsListBox*)FindWidget("PlayerList");
--- 101,106 ----
  
      // Subscribe to certain types of messages (those we want to handle)
!     msgqueue->Subscribe(this, MSGTYPE_GMGUI);
!     msgqueue->Subscribe(this, MSGTYPE_MAPACTION);
  
      playerList = (pawsListBox*)FindWidget("PlayerList");
***************
*** 146,150 ****
      switch ( me->GetType() )
      {
!     case MSGTYPEGMGUI:
          {
          psGMGuiMessage message( me );
--- 146,150 ----
      switch ( me->GetType() )
      {
!     case MSGTYPE_GMGUI:
          {
          psGMGuiMessage message( me );
***************
*** 154,158 ****
          }
          break;
!     case MSGTYPEMAPACTION:
          {
          psMapActionMessage actionMsg( me );
--- 154,158 ----
          }
          break;
!     case MSGTYPE_MAPACTION:
          {
          psMapActionMessage actionMsg( me );

Index: pawsgmspawn.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsgmspawn.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** pawsgmspawn.cpp	3 Feb 2006 23:00:57 -0000	1.16
--- pawsgmspawn.cpp	22 Feb 2006 22:19:42 -0000	1.17
***************
*** 63,68 ****
  bool pawsGMSpawnWindow::PostSetup()
  {
!     psengine->GetMsgHandler()->Subscribe( this, MSGTYPEGMSPAWNITEMS );
!     psengine->GetMsgHandler()->Subscribe( this, MSGTYPEGMSPAWNTYPES );
                  
      itemName = (pawsTextBox*)FindWidget("ItemName");
--- 63,68 ----
  bool pawsGMSpawnWindow::PostSetup()
  {
!     psengine->GetMsgHandler()->Subscribe( this, MSGTYPE_GMSPAWNITEMS );
!     psengine->GetMsgHandler()->Subscribe( this, MSGTYPE_GMSPAWNTYPES );
                  
      itemName = (pawsTextBox*)FindWidget("ItemName");
***************
*** 109,113 ****
  void pawsGMSpawnWindow::HandleMessage(MsgEntry* me)
  {
!     if(me->GetType() == MSGTYPEGMSPAWNITEMS) 
      {
          psGMSpawnItems msg(me);
--- 109,113 ----
  void pawsGMSpawnWindow::HandleMessage(MsgEntry* me)
  {
!     if(me->GetType() == MSGTYPE_GMSPAWNITEMS) 
      {
          psGMSpawnItems msg(me);
***************
*** 124,128 ****
  
      }
!     else if(me->GetType() == MSGTYPEGMSPAWNTYPES) 
      {
          Show();
--- 124,128 ----
  
      }
!     else if(me->GetType() == MSGTYPE_GMSPAWNTYPES) 
      {
          Show();

Index: pawsgroupwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsgroupwindow.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** pawsgroupwindow.cpp	3 Feb 2006 23:00:57 -0000	1.33
--- pawsgroupwindow.cpp	22 Feb 2006 22:19:42 -0000	1.34
***************
*** 64,68 ****
  pawsGroupWindow::~pawsGroupWindow()
  {
!     msgHandler->Unsubscribe( this, MSGTYPEGUIGROUP );
  }
  
--- 64,68 ----
  pawsGroupWindow::~pawsGroupWindow()
  {
!     msgHandler->Unsubscribe( this, MSGTYPE_GUIGROUP );
  }
  
***************
*** 72,76 ****
  
      if ( !msgHandler ) return false;
!     if ( !msgHandler->Subscribe( this, MSGTYPEGUIGROUP ) ) return false;
  
      memberList = (pawsListBox*)FindWidget("List");
--- 72,76 ----
  
      if ( !msgHandler ) return false;
!     if ( !msgHandler->Subscribe( this, MSGTYPE_GUIGROUP ) ) return false;
  
      memberList = (pawsListBox*)FindWidget("List");

Index: pawsguildwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsguildwindow.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** pawsguildwindow.cpp	3 Feb 2006 23:00:57 -0000	1.57
--- pawsguildwindow.cpp	22 Feb 2006 22:19:42 -0000	1.58
***************
*** 171,178 ****
  {
      msgHandler = psengine->GetMsgHandler();
!     if ( !msgHandler->Subscribe( this, MSGTYPEGUIGUILD ) )
          return false;
  
!     if ( !msgHandler->Subscribe( this, MSGTYPEMOTD ) )
          return false;
      //Request a MOTD for the guild
--- 171,178 ----
  {
      msgHandler = psengine->GetMsgHandler();
!     if ( !msgHandler->Subscribe( this, MSGTYPE_GUIGUILD ) )
          return false;
  
!     if ( !msgHandler->Subscribe( this, MSGTYPE_MOTD ) )
          return false;
      //Request a MOTD for the guild
***************
*** 267,271 ****
  void pawsGuildWindow::HandleMessage( MsgEntry* me )
  {
!     if (me->GetType() == MSGTYPEMOTD)
      {
          psMOTDMessage motd(me);
--- 267,271 ----
  void pawsGuildWindow::HandleMessage( MsgEntry* me )
  {
!     if (me->GetType() == MSGTYPE_MOTD)
      {
          psMOTDMessage motd(me);

Index: pawsinfowindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsinfowindow.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** pawsinfowindow.cpp	3 Feb 2006 23:00:57 -0000	1.38
--- pawsinfowindow.cpp	22 Feb 2006 22:19:42 -0000	1.39
***************
*** 72,76 ****
  
      msgHandler = psengine->GetMsgHandler();
!     if ( !msgHandler->Subscribe( this, MSGTYPEMODE ) )
          return false;
  
--- 72,76 ----
  
      msgHandler = psengine->GetMsgHandler();
!     if ( !msgHandler->Subscribe( this, MSGTYPE_MODE ) )
          return false;
  
***************
*** 117,121 ****
      switch ( me->GetType() )
      {
!         case MSGTYPEMODE:
  
              handleTypeMode( me );
--- 117,121 ----
      switch ( me->GetType() )
      {
!         case MSGTYPE_MODE:
  
              handleTypeMode( me );

Index: pawsinteractwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsinteractwindow.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** pawsinteractwindow.cpp	3 Feb 2006 23:00:57 -0000	1.34
--- pawsinteractwindow.cpp	22 Feb 2006 22:19:42 -0000	1.35
***************
*** 131,135 ****
  
      if ( !msgHandler ) return false;
!     if ( !msgHandler->Subscribe( this, MSGTYPEGUIINTERACT) ) return false;
  
      return true;
--- 131,135 ----
  
      if ( !msgHandler ) return false;
!     if ( !msgHandler->Subscribe( this, MSGTYPE_GUIINTERACT) ) return false;
  
      return true;

Index: pawsitemdescriptionwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsitemdescriptionwindow.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** pawsitemdescriptionwindow.cpp	3 Feb 2006 23:00:57 -0000	1.20
--- pawsitemdescriptionwindow.cpp	22 Feb 2006 22:19:42 -0000	1.21
***************
*** 58,62 ****
      if(msgHandler)
      {
!         msgHandler->Unsubscribe(this,MSG_TYPE_VIEW_ITEM);
      }
  
--- 58,62 ----
      if(msgHandler)
      {
!         msgHandler->Unsubscribe(this,MSGTYPE_VIEW_ITEM);
      }
  
***************
*** 69,73 ****
  
      if ( !msgHandler ) return false;
!     if ( !msgHandler->Subscribe( this,  MSG_TYPE_VIEW_ITEM ) ) return false;
  
      // Store some of our children for easy access later on.
--- 69,73 ----
  
      if ( !msgHandler ) return false;
!     if ( !msgHandler->Subscribe( this,  MSGTYPE_VIEW_ITEM ) ) return false;
  
      // Store some of our children for easy access later on.

Index: pawsloading.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsloading.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** pawsloading.cpp	18 Feb 2006 14:12:07 -0000	1.25
--- pawsloading.cpp	22 Feb 2006 22:19:42 -0000	1.26
***************
*** 36,40 ****
  pawsLoadWindow::~pawsLoadWindow()
  {
!     psengine->GetMsgHandler()->Unsubscribe(this,MSGTYPEMOTD);
  }
  
--- 36,40 ----
  pawsLoadWindow::~pawsLoadWindow()
  {
!     psengine->GetMsgHandler()->Unsubscribe(this,MSGTYPE_MOTD);
  }
  
***************
*** 52,56 ****
  {
  
!     if ( !psengine->GetMsgHandler()->Subscribe(this,MSGTYPEMOTD))
          return false;
  
--- 52,56 ----
  {
  
!     if ( !psengine->GetMsgHandler()->Subscribe(this,MSGTYPE_MOTD))
          return false;
  
***************
*** 65,69 ****
  void pawsLoadWindow::HandleMessage(MsgEntry *me)
  {
!     if ( me->GetType() == MSGTYPEMOTD )
      {
          psMOTDMessage tipmsg(me);
--- 65,69 ----
  void pawsLoadWindow::HandleMessage(MsgEntry *me)
  {
!     if ( me->GetType() == MSGTYPE_MOTD )
      {
          psMOTDMessage tipmsg(me);

Index: pawslootwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawslootwindow.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** pawslootwindow.cpp	3 Feb 2006 23:00:57 -0000	1.18
--- pawslootwindow.cpp	22 Feb 2006 22:19:42 -0000	1.19
***************
*** 59,64 ****
      if (msgqueue)
      {
!         msgqueue->Unsubscribe(this, MSGTYPELOOT);
!         msgqueue->Unsubscribe(this, MSGTYPELOOTREMOVE);
      }
  
--- 59,64 ----
      if (msgqueue)
      {
!         msgqueue->Unsubscribe(this, MSGTYPE_LOOT);
!         msgqueue->Unsubscribe(this, MSGTYPE_LOOTREMOVE);
      }
  
***************
*** 74,79 ****
  
      // Subscribe to certain types of messages (those we want to handle)
!     msgqueue->Subscribe(this, MSGTYPELOOT);
!     msgqueue->Subscribe(this, MSGTYPELOOTREMOVE);
  
      // Subscribe certain petition commands with this widget
--- 74,79 ----
  
      // Subscribe to certain types of messages (those we want to handle)
!     msgqueue->Subscribe(this, MSGTYPE_LOOT);
!     msgqueue->Subscribe(this, MSGTYPE_LOOTREMOVE);
  
      // Subscribe certain petition commands with this widget
***************
*** 113,117 ****
      switch(me->GetType())
      {
!         case MSGTYPELOOT:
          {
              // Get the petition message data from the server
--- 113,117 ----
      switch(me->GetType())
      {
!         case MSGTYPE_LOOT:
          {
              // Get the petition message data from the server
***************
*** 143,147 ****
              }
          }
!         case MSGTYPELOOTREMOVE:
          {
              if (!IsVisible())
--- 143,147 ----
              }
          }
!         case MSGTYPE_LOOTREMOVE:
          {
              if (!IsVisible())

Index: pawsmerchantwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsmerchantwindow.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** pawsmerchantwindow.cpp	3 Feb 2006 23:00:57 -0000	1.32
--- pawsmerchantwindow.cpp	22 Feb 2006 22:19:42 -0000	1.33
***************
*** 111,115 ****
      if ( !msgHandler ) return false;
  
!     if ( !msgHandler->Subscribe( this, MSGTYPEGUIMERCHANT ) )
          return false;
  
--- 111,115 ----
      if ( !msgHandler ) return false;
  
!     if ( !msgHandler->Subscribe( this, MSGTYPE_GUIMERCHANT ) )
          return false;
  

Index: pawspetitiongmwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawspetitiongmwindow.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** pawspetitiongmwindow.cpp	3 Feb 2006 23:00:57 -0000	1.34
--- pawspetitiongmwindow.cpp	22 Feb 2006 22:19:42 -0000	1.35
***************
*** 61,65 ****
  pawsPetitionGMWindow::~pawsPetitionGMWindow()
  {
!     msgqueue->Unsubscribe(this, MSGTYPEPETITION);
  
      SCF_DESTRUCT_IBASE();
--- 61,65 ----
  pawsPetitionGMWindow::~pawsPetitionGMWindow()
  {
!     msgqueue->Unsubscribe(this, MSGTYPE_PETITION);
  
      SCF_DESTRUCT_IBASE();
***************
*** 73,77 ****
  
      // Subscribe to certain types of messages (those we want to handle)
!     msgqueue->Subscribe(this, MSGTYPEPETITION);
  
      // Grab the pointer to the petition listbox:
--- 73,77 ----
  
      // Subscribe to certain types of messages (those we want to handle)
!     msgqueue->Subscribe(this, MSGTYPE_PETITION);
  
      // Grab the pointer to the petition listbox:

Index: pawspetitionwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawspetitionwindow.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** pawspetitionwindow.cpp	3 Feb 2006 23:00:57 -0000	1.31
--- pawspetitionwindow.cpp	22 Feb 2006 22:19:42 -0000	1.32
***************
*** 60,64 ****
  {
      /*// Unsubscribe commands and messages
!     msgqueue->Unsubscribe(this, MSGTYPEPETITION);*/
  
      SCF_DESTRUCT_IBASE();
--- 60,64 ----
  {
      /*// Unsubscribe commands and messages
!     msgqueue->Unsubscribe(this, MSGTYPE_PETITION);*/
  
      SCF_DESTRUCT_IBASE();
***************
*** 72,76 ****
  
      // Subscribe to certain types of messages (those we want to handle)
!     msgqueue->Subscribe(this, MSGTYPEPETITION);
  
      // Subscribe certain petition commands with this widget
--- 72,76 ----
  
      // Subscribe to certain types of messages (those we want to handle)
!     msgqueue->Subscribe(this, MSGTYPE_PETITION);
  
      // Subscribe certain petition commands with this widget

Index: pawsquestrewardwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsquestrewardwindow.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pawsquestrewardwindow.cpp	3 Feb 2006 23:00:57 -0000	1.10
--- pawsquestrewardwindow.cpp	22 Feb 2006 22:19:42 -0000	1.11
***************
*** 58,62 ****
  pawsQuestRewardWindow::~pawsQuestRewardWindow()
  {
!     msgqueue->Unsubscribe(this, MSGTYPEQUESTREWARD);
  
      SCF_DESTRUCT_IBASE();
--- 58,62 ----
  pawsQuestRewardWindow::~pawsQuestRewardWindow()
  {
!     msgqueue->Unsubscribe(this, MSGTYPE_QUESTREWARD);
  
      SCF_DESTRUCT_IBASE();
***************
*** 68,72 ****
          return false;
  
!     msgqueue->Subscribe(this, MSGTYPEQUESTREWARD);
  
      rewardList  = (pawsListBox*)FindWidget("QuestRewardList");
--- 68,72 ----
          return false;
  
!     msgqueue->Subscribe(this, MSGTYPE_QUESTREWARD);
  
      rewardList  = (pawsListBox*)FindWidget("QuestRewardList");

Index: pawsquestwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsquestwindow.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** pawsquestwindow.cpp	3 Feb 2006 23:00:57 -0000	1.23
--- pawsquestwindow.cpp	22 Feb 2006 22:19:42 -0000	1.24
***************
*** 89,94 ****
      if (msgqueue)
      {
!         msgqueue->Unsubscribe(this, MSGTYPEQUESTLIST);
!         msgqueue->Unsubscribe(this, MSGTYPEQUESTINFO);
      }
  
--- 89,94 ----
      if (msgqueue)
      {
!         msgqueue->Unsubscribe(this, MSGTYPE_QUESTLIST);
!         msgqueue->Unsubscribe(this, MSGTYPE_QUESTINFO);
      }
  
***************
*** 107,112 ****
  
      // Subscribe to certain types of messages (those we want to handle)
!     msgqueue->Subscribe(this, MSGTYPEQUESTLIST);
!     msgqueue->Subscribe(this, MSGTYPEQUESTINFO);
  
      // Subscribe certain petition commands with this widget
--- 107,112 ----
  
      // Subscribe to certain types of messages (those we want to handle)
!     msgqueue->Subscribe(this, MSGTYPE_QUESTLIST);
!     msgqueue->Subscribe(this, MSGTYPE_QUESTINFO);
  
      // Subscribe certain petition commands with this widget
***************
*** 138,142 ****
  void pawsQuestListWindow::HandleMessage ( MsgEntry* me )
  {
!     if (me->GetType() == MSGTYPEQUESTLIST)
      {
          // Get the petition message data from the server
--- 138,142 ----
  void pawsQuestListWindow::HandleMessage ( MsgEntry* me )
  {
!     if (me->GetType() == MSGTYPE_QUESTLIST)
      {
          // Get the petition message data from the server

Index: pawsskillwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsskillwindow.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** pawsskillwindow.cpp	14 Feb 2006 01:48:36 -0000	1.52
--- pawsskillwindow.cpp	22 Feb 2006 22:19:42 -0000	1.53
***************
*** 84,88 ****
  
      msgHandler = psengine->GetMsgHandler();
!     if ( !msgHandler->Subscribe( this, MSGTYPEGUISKILL ) )
          return false;
  
--- 84,88 ----
  
      msgHandler = psengine->GetMsgHandler();
!     if ( !msgHandler->Subscribe( this, MSGTYPE_GUISKILL ) )
          return false;
  

Index: pawsspellbookwindow.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsspellbookwindow.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** pawsspellbookwindow.cpp	3 Feb 2006 23:00:57 -0000	1.21
--- pawsspellbookwindow.cpp	22 Feb 2006 22:19:42 -0000	1.22
***************
*** 54,58 ****
  {
      msgHandler = psengine->GetMsgHandler();
!     if ( !msgHandler->Subscribe( this, MSG_TYPE_SPELL_BOOK ) )
          return false;
  
--- 54,58 ----
  {
      msgHandler = psengine->GetMsgHandler();
!     if ( !msgHandler->Subscribe( this, MSGTYPE_SPELL_BOOK ) )
          return false;
  
***************
*** 68,72 ****
      switch ( me->GetType() )
      {
!         case MSG_TYPE_SPELL_BOOK:
          {
              HandleSpells( me );
--- 68,72 ----
      switch ( me->GetType() )
      {
!         case MSGTYPE_SPELL_BOOK:
          {
              HandleSpells( me );

Index: psmainwidget.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psmainwidget.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** psmainwidget.cpp	3 Feb 2006 23:00:57 -0000	1.66
--- psmainwidget.cpp	22 Feb 2006 22:19:42 -0000	1.67
***************
*** 182,186 ****
  {
      if(msgqueue)
!         msgqueue->Unsubscribe(this, MSGTYPESYSTEM);
  
      SCF_DESTRUCT_IBASE();
--- 182,186 ----
  {
      if(msgqueue)
!         msgqueue->Unsubscribe(this, MSGTYPE_SYSTEM);
  
      SCF_DESTRUCT_IBASE();
***************
*** 463,467 ****
      mesgFirstFont  = graphics2D->GetFontServer()->LoadFont("/this/data/ttf/scurlock.ttf",(int)fontsize*2);
  
!     msgqueue->Subscribe(this, MSGTYPESYSTEM);
  
      return true;
--- 463,467 ----
      mesgFirstFont  = graphics2D->GetFontServer()->LoadFont("/this/data/ttf/scurlock.ttf",(int)fontsize*2);
  
!     msgqueue->Subscribe(this, MSGTYPE_SYSTEM);
  
      return true;
***************
*** 471,475 ****
  void psMainWidget::HandleMessage( MsgEntry* message )
  {
!     if(message->GetType() != MSGTYPESYSTEM)
          return;
  
--- 471,475 ----
  void psMainWidget::HandleMessage( MsgEntry* message )
  {
!     if(message->GetType() != MSGTYPE_SYSTEM)
          return;