[Planeshift-cvs] CVS: planeshift/src/client entitylabels.cpp,1.68,1.69

[DaveG <da...@us...>]

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

Modified Files:
	entitylabels.cpp 
Log Message:
Fixing entity labels.
I’m dumbfounded that it actually compiled and didn’t crash, before...

Index: entitylabels.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/entitylabels.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** entitylabels.cpp	27 Oct 2005 13:09:04 -0000	1.68
--- entitylabels.cpp	30 Oct 2005 16:36:24 -0000	1.69
***************
*** 84,88 ****
  }
  
! bool psEntityLabels::Initialize(iObjectRegistry *, psCelClient * _celClient)
  {
      celClient  = _celClient;
--- 84,88 ----
  }
  
! bool psEntityLabels::Initialize(iObjectRegistry * object_reg, psCelClient * _celClient)
  {
      celClient  = _celClient;
***************
*** 94,98 ****
      eventhandler.AttachNew (new EntityEventHandler (this));
  
!     eventQueue = CS_QUERY_REGISTRY(psengine->GetObjectRegistry(), iEventQueue);
      if(!eventQueue)
      {
--- 94,98 ----
      eventhandler.AttachNew (new EntityEventHandler (this));
  
!     eventQueue = CS_QUERY_REGISTRY(object_reg, iEventQueue);
      if(!eventQueue)
      {
***************
*** 370,374 ****
          else if (option == "mouse")
              visibility = LABEL_ONMOUSE;
!         if (option == "never")
              visibility = LABEL_NEVER;
      }
--- 370,374 ----
          else if (option == "mouse")
              visibility = LABEL_ONMOUSE;
!         else if (option == "never")
              visibility = LABEL_NEVER;
      }