[Once-cvs] oncecode/src/server/behaviours ocarea_bl.cpp,1.2.2.9,1.2.2.10 ocobject_bl.cpp,1.1.2.3,1.1.2.4 ocobject_bl.h,1.1.2.3,1.1.2.4 ocplayer_bl.cpp,1.2.2.10,1.2.2.11

[Remi B. <els...@us...>]

Update of /cvsroot/once/oncecode/src/server/behaviours
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17480/src/server/behaviours

Modified Files:
      Tag: cel-switch
	ocarea_bl.cpp ocobject_bl.cpp ocobject_bl.h ocplayer_bl.cpp 
Log Message:
Lots of cleaning in client. I now consider that client code is sane for improving.

Index: ocplayer_bl.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/server/behaviours/ocplayer_bl.cpp,v
retrieving revision 1.2.2.10
retrieving revision 1.2.2.11
diff -C2 -d -r1.2.2.10 -r1.2.2.11
*** ocplayer_bl.cpp	28 Aug 2004 20:40:12 -0000	1.2.2.10
--- ocplayer_bl.cpp	29 Aug 2004 16:06:20 -0000	1.2.2.11
***************
*** 153,157 ****
    if (!loader->LoadMesh(pcmesh, player_data.entity_name)) return false;
    if (!loader->LoadLinearMovement(entity)) return false;
!   serversys->GetEntityRegistry()->Register(id, entity);
    
    return true;
--- 153,157 ----
    if (!loader->LoadMesh(pcmesh, player_data.entity_name)) return false;
    if (!loader->LoadLinearMovement(entity)) return false;
!   serversys->GetEntityRegistry()->Register(entity_id, entity);
    
    return true;

Index: ocobject_bl.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/server/behaviours/Attic/ocobject_bl.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** ocobject_bl.cpp	28 Aug 2004 20:40:12 -0000	1.1.2.3
--- ocobject_bl.cpp	29 Aug 2004 16:06:20 -0000	1.1.2.4
***************
*** 34,41 ****
  
  ocObjectWrapper::ocObjectWrapper(iCelPlLayer* my_pl, ocBehaviourLayer* my_bl) :
!   ocBehaviourBase(my_bl, ++max_entity_id,
! 		  csRef<iCelEntity>(my_pl->CreateEntity())),
    pl(my_pl),
!   bl(my_bl)
  {
  }
--- 34,41 ----
  
  ocObjectWrapper::ocObjectWrapper(iCelPlLayer* my_pl, ocBehaviourLayer* my_bl) :
!   ocBehaviourBase(my_bl, csRef<iCelEntity>(my_pl->CreateEntity())),
    pl(my_pl),
!   bl(my_bl),
!   entity_id(++max_entity_id)
  {
  }
***************
*** 52,55 ****
--- 52,56 ----
    pl->CreatePropertyClass(entity, "pcsubscribable");
    pcsubscribable = CEL_QUERY_PROPCLASS_ENT(entity, iPcSubscribable);
+   pcsubscribable->SetID(entity_id);
  }
  

Index: ocobject_bl.h
===================================================================
RCS file: /cvsroot/once/oncecode/src/server/behaviours/Attic/ocobject_bl.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** ocobject_bl.h	28 Aug 2004 20:40:12 -0000	1.1.2.3
--- ocobject_bl.h	29 Aug 2004 16:06:20 -0000	1.1.2.4
***************
*** 53,56 ****
--- 53,58 ----
    /// The maximum ID reached.
    static ocID max_entity_id;
+   /// The current ID
+   ocID entity_id;
    
  public:
***************
*** 82,85 ****
--- 84,92 ----
     */
    csRef<iPcSubscribable> GetSubscribable() { return pcsubscribable; }
+ 
+   /**
+    * Returns the ID
+    */
+   ocID GetID() { return entity_id; }
  };
  

Index: ocarea_bl.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/server/behaviours/ocarea_bl.cpp,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -C2 -d -r1.2.2.9 -r1.2.2.10
*** ocarea_bl.cpp	28 Aug 2004 20:40:12 -0000	1.2.2.9
--- ocarea_bl.cpp	29 Aug 2004 16:06:20 -0000	1.2.2.10
***************
*** 78,82 ****
  
    serversys->GetLoader()->LoadRegion(pcregion, area_data.area_name);
!   serversys->GetEntityRegistry()->Register(id, entity);
  
    return true;
--- 78,82 ----
  
    serversys->GetLoader()->LoadRegion(pcregion, area_data.area_name);
!   serversys->GetEntityRegistry()->Register(entity_id, entity);
  
    return true;