[Planeshift-cvs] CVS: planeshift/src/server adminmanager.cpp, 1.347, 1.348 client.cpp, 1.128, 1.129 entitymanager.cpp, 1.181, 1.182 gem.cpp, 1.384, 1.385 gem.h, 1.172, 1.173 progressionmanager.cpp, 1.251, 1.252 psserverchar.cpp, 1.409, 1.410

[Andy D. <kha...@us...>]

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

Modified Files:
	adminmanager.cpp client.cpp entitymanager.cpp gem.cpp gem.h 
	progressionmanager.cpp psserverchar.cpp 
Log Message:
- Made EntityManager support the Singleton design pattern.
- Made GEMSupervisor support the Singleton design pattern.

Index: adminmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v
retrieving revision 1.347
retrieving revision 1.348
diff -C2 -d -r1.347 -r1.348
*** adminmanager.cpp	19 Nov 2006 21:55:56 -0000	1.347
--- adminmanager.cpp	19 Nov 2006 22:09:56 -0000	1.348
***************
*** 529,533 ****
  {
      gemObject* found = NULL;
!     GEMSupervisor *gem = EntityManager::GetSingleton().GetGEM();
      if (!gem) return NULL;
  
--- 529,533 ----
  {
      gemObject* found = NULL;
!     GEMSupervisor *gem = GEMSupervisor::GetSingletonPtr();
      if (!gem) return NULL;
  
***************
*** 583,587 ****
          self->GetPosition(pos,sector);
                  
!         GEMSupervisor* gem = EntityManager::GetSingleton().GetGEM();
          if (!gem)
              return;
--- 583,587 ----
          self->GetPosition(pos,sector);
                  
!         GEMSupervisor* gem = GEMSupervisor::GetSingletonPtr();
          if (!gem)
              return;

Index: client.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/client.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** client.cpp	19 Nov 2006 21:55:56 -0000	1.128
--- client.cpp	19 Nov 2006 22:09:56 -0000	1.129
***************
*** 177,182 ****
      if ( id != (uint32)-1 )
      {
!         GEMSupervisor *gem = EntityManager::GetSingleton().GetGEM();
!         return gem->FindNPCEntity( id );
      }
      else
--- 177,181 ----
      if ( id != (uint32)-1 )
      {
!         return GEMSupervisor::GetSingleton().FindNPCEntity( id );
      }
      else
***************
*** 202,207 ****
          if ( id != -1 )
          {
!             GEMSupervisor *gem = EntityManager::GetSingleton().GetGEM();
!             return gem->FindNPCEntity( id );
          }
          else
--- 201,205 ----
          if ( id != -1 )
          {
!             return GEMSupervisor::GetSingleton().FindNPCEntity( id );
          }
          else

Index: entitymanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/entitymanager.cpp,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -d -r1.181 -r1.182
*** entitymanager.cpp	19 Nov 2006 21:55:56 -0000	1.181
--- entitymanager.cpp	19 Nov 2006 22:09:56 -0000	1.182
***************
*** 554,558 ****
  
  
!     gemActor *actor = new gemActor(gem,chardata,raceinfo->mesh_name,filename,
          sector,pos,yrot,client->GetClientNum(),chardata->GetCharacterID() );
  
--- 554,558 ----
  
  
!     gemActor *actor = new gemActor(chardata,raceinfo->mesh_name,filename,
          sector,pos,yrot,client->GetClientNum(),chardata->GetCharacterID() );
  
***************
*** 691,695 ****
      filename.Format("/planeshift/models/%s/%s.cal3d",raceinfo->mesh_name,raceinfo->mesh_name);
  
!     gemNPC *actor = new gemNPC(gem, chardata, raceinfo->mesh_name, filename, sector, pos, yrot, 0,chardata->GetCharacterID());
  
      if ( !actor->IsValid() )
--- 691,695 ----
      filename.Format("/planeshift/models/%s/%s.cal3d",raceinfo->mesh_name,raceinfo->mesh_name);
  
!     gemNPC *actor = new gemNPC(chardata, raceinfo->mesh_name, filename, sector, pos, yrot, 0,chardata->GetCharacterID());
  
      if ( !actor->IsValid() )
***************
*** 825,829 ****
          meshfile = "";
  
!     gemItem *obj = new gemItem(gem,iteminstance,meshname,
                                 meshfile,isec,newpos,yrot,0,iteminstance->GetUID() );
  
--- 825,829 ----
          meshfile = "";
  
!     gemItem *obj = new gemItem(iteminstance,meshname,
                                 meshfile,isec,newpos,yrot,0,iteminstance->GetUID() );
  

Index: gem.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/gem.cpp,v
retrieving revision 1.384
retrieving revision 1.385
diff -C2 -d -r1.384 -r1.385
*** gem.cpp	19 Nov 2006 21:55:56 -0000	1.384
--- gem.cpp	19 Nov 2006 22:09:56 -0000	1.385
***************
*** 611,616 ****
  }
  
! gemObject::gemObject(GEMSupervisor *cel,
!                      const char* name, 
                       const char* factname,
                       const char* filename,
--- 611,615 ----
  }
  
! gemObject::gemObject(const char* name, 
                       const char* factname,
                       const char* filename,
***************
*** 622,626 ****
  {
      if (!this->cel)
!         this->cel = cel;
  
      gemID = id;
--- 621,625 ----
  {
      if (!this->cel)
!         this->cel = GEMSupervisor::GetSingletonPtr();
  
      gemID = id;
***************
*** 1151,1156 ****
  }
  
! gemActiveObject::gemActiveObject(GEMSupervisor *cel,
!                                      const char* name,
                                       const char* factname,
                                       const char* filename,
--- 1150,1154 ----
  }
  
! gemActiveObject::gemActiveObject( const char* name,
                                       const char* factname,
                                       const char* filename,
***************
*** 1159,1163 ****
                                       float rotangle,
                                       int clientnum, uint32 id)
!                                      : gemObject(cel,name,factname,filename,room,pos,rotangle,clientnum, id)
  {
      //if entity is not set, object is not a success
--- 1157,1161 ----
                                       float rotangle,
                                       int clientnum, uint32 id)
!                                      : gemObject(name,factname,filename,room,pos,rotangle,clientnum, id)
  {
      //if entity is not set, object is not a success
***************
*** 1299,1303 ****
  /*--------------------------------------------------------------------------------------------*/
  
! gemItem::gemItem(GEMSupervisor *cel,csWeakRef<psItem> item,
                       const char* factname,
                       const char* filename,
--- 1297,1301 ----
  /*--------------------------------------------------------------------------------------------*/
  
! gemItem::gemItem(csWeakRef<psItem> item,
                       const char* factname,
                       const char* filename,
***************
*** 1306,1310 ****
                       float rotangle,
                       int clientnum,uint32 id)
!                      : gemActiveObject(cel,item->GetName(),factname,filename,room,pos,
                                         rotangle,clientnum,id)
  {
--- 1304,1308 ----
                       float rotangle,
                       int clientnum,uint32 id)
!                      : gemActiveObject(item->GetName(),factname,filename,room,pos,
                                         rotangle,clientnum,id)
  {
***************
*** 1522,1527 ****
  //--------------------------------------------------------------------------------------
  
! gemActor::gemActor(GEMSupervisor *cel,
!                        psCharacter *chardata, 
                         const char* factname,
                         const char* filename,
--- 1520,1524 ----
  //--------------------------------------------------------------------------------------
  
! gemActor::gemActor( psCharacter *chardata, 
                         const char* factname,
                         const char* filename,
***************
*** 1530,1534 ****
                         float rotangle,
                         int clientnum,uint32 id) :
!   gemObject(cel,chardata->GetCharFullName(),factname,filename,room,pos,rotangle,clientnum,id)
  {
      factions = NULL;
--- 1527,1531 ----
                         float rotangle,
                         int clientnum,uint32 id) :
!   gemObject(chardata->GetCharFullName(),factname,filename,room,pos,rotangle,clientnum,id)
  {
      factions = NULL;
***************
*** 3087,3092 ****
  //--------------------------------------------------------------------------------------
  
! gemNPC::gemNPC(GEMSupervisor *cel,
!                    psCharacter *chardata,
                     const char* factname,
                     const char* filename,
--- 3084,3088 ----
  //--------------------------------------------------------------------------------------
  
! gemNPC::gemNPC( psCharacter *chardata,
                     const char* factname,
                     const char* filename,
***************
*** 3095,3099 ****
                     float rotangle,
                     int clientnum,uint32 id)
!                    : gemActor(cel,chardata,factname,filename,room,pos,rotangle,clientnum,id)
  {
      npcdialog = NULL;
--- 3091,3095 ----
                     float rotangle,
                     int clientnum,uint32 id)
!                    : gemActor(chardata,factname,filename,room,pos,rotangle,clientnum,id)
  {
      npcdialog = NULL;

Index: gem.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/gem.h,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -d -r1.172 -r1.173
*** gem.h	19 Nov 2006 21:55:56 -0000	1.172
--- gem.h	19 Nov 2006 22:09:56 -0000	1.173
***************
*** 206,210 ****
  
  public:
!     gemObject(GEMSupervisor *cel,const char* name, const char* factname,const char* filename,iSector* room,
          const csVector3& pos,float rotangle,int clientnum,uint32 id);
  
--- 206,210 ----
  
  public:
!     gemObject(const char* name, const char* factname,const char* filename,iSector* room,
          const csVector3& pos,float rotangle,int clientnum,uint32 id);
  
***************
*** 310,315 ****
  public:
      gemActiveObject( const char *name );
!     gemActiveObject(GEMSupervisor *cel,
!                     const char* name,
                      const char* factname,
                      const char* filename,
--- 310,314 ----
  public:
      gemActiveObject( const char *name );
!     gemActiveObject( const char* name,
                      const char* factname,
                      const char* filename,
***************
*** 341,346 ****
  
  public:
!     gemItem(GEMSupervisor *cel,
!         csWeakRef<psItem> item,
          const char* factname,
          const char* filename,
--- 340,344 ----
  
  public:
!     gemItem(csWeakRef<psItem> item,
          const char* factname,
          const char* filename,
***************
*** 481,485 ****
      csRef<iPcLinearMovement> pcmove;
  
!     gemActor(GEMSupervisor *cel,psCharacter *chardata, const char* factname,const char* filename,iSector* room,
          const csVector3& pos,float rotangle,int clientnum,uint32 id);
  
--- 479,483 ----
      csRef<iPcLinearMovement> pcmove;
  
!     gemActor(psCharacter *chardata, const char* factname,const char* filename,iSector* room,
          const csVector3& pos,float rotangle,int clientnum,uint32 id);
  
***************
*** 663,667 ****
  
  public:
!     gemNPC(GEMSupervisor *cel,psCharacter *chardata, const char* factname,const char* filename,iSector* room,
          const csVector3& pos,float rotangle,int clientnum,uint32 id);
  
--- 661,665 ----
  
  public:
!     gemNPC(psCharacter *chardata, const char* factname,const char* filename,iSector* room,
          const csVector3& pos,float rotangle,int clientnum,uint32 id);
  
***************
*** 726,731 ****
  public:
  
!     gemPet(GEMSupervisor *cel,psCharacter *chardata, const char* factname,const char* filename,iSector* room,
!         const csVector3& pos,float rotangle,int clientnum,uint32 id) : gemNPC(cel,chardata,factname,filename,room,pos,rotangle,clientnum,id) 
      {
          this->persistanceLevel = "Temporary";
--- 724,729 ----
  public:
  
!     gemPet(psCharacter *chardata, const char* factname,const char* filename,iSector* room,
!         const csVector3& pos,float rotangle,int clientnum,uint32 id) : gemNPC(chardata,factname,filename,room,pos,rotangle,clientnum,id) 
      {
          this->persistanceLevel = "Temporary";

Index: progressionmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/progressionmanager.cpp,v
retrieving revision 1.251
retrieving revision 1.252
diff -C2 -d -r1.251 -r1.252
*** progressionmanager.cpp	19 Nov 2006 21:55:56 -0000	1.251
--- progressionmanager.cpp	19 Nov 2006 22:09:56 -0000	1.252
***************
*** 1729,1734 ****
          }
  
!         static GEMSupervisor* gem = EntityManager::GetSingleton().GetGEM();
!         static psWorld* world = EntityManager::GetSingleton().GetWorld();
  
          csRef<iCelEntityList> nearlist = gem->pl->FindNearbyEntities(target_sector,target_pos,range);
--- 1729,1734 ----
          }
  
!         GEMSupervisor* gem = GEMSupervisor::GetSingletonPtr();
!         psWorld* world = EntityManager::GetSingleton().GetWorld();
  
          csRef<iCelEntityList> nearlist = gem->pl->FindNearbyEntities(target_sector,target_pos,range);

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.409
retrieving revision 1.410
diff -C2 -d -r1.409 -r1.410
*** psserverchar.cpp	19 Nov 2006 21:55:58 -0000	1.409
--- psserverchar.cpp	19 Nov 2006 22:09:56 -0000	1.410
***************
*** 812,817 ****
      filename.Format("/planeshift/models/%s/%s.cal3d",raceinfo->mesh_name,raceinfo->mesh_name);
  
!     gemActor *actor = new gemActor( EntityManager::GetSingleton().GetGEM(),
!                                     chardata,
                                      raceinfo->mesh_name,
                                      filename,
--- 812,816 ----
      filename.Format("/planeshift/models/%s/%s.cal3d",raceinfo->mesh_name,raceinfo->mesh_name);
  
!     gemActor *actor = new gemActor( chardata,
                                      raceinfo->mesh_name,
                                      filename,