simspark-cvs

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21072/oxygen/gamecontrolserver

Modified Files:
	gamecontrolserver.cpp 
Log Message:
merge from projectx branch

Index: gamecontrolserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/gamecontrolserver/gamecontrolserver.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gamecontrolserver.cpp	17 Mar 2007 07:01:02 -0000	1.3
--- gamecontrolserver.cpp	17 Jun 2007 13:38:32 -0000	1.4
***************
*** 1,5 ****
  /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
  
!    this file is part of rcssserver3D
     Fri May 9 2003
     Copyright (C) 2002,2003 Koblenz University
--- 1,5 ----
  /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
  
!    this file is part of simspark
     Fri May 9 2003
     Copyright (C) 2002,2003 Koblenz University
***************
*** 161,165 ****
      scene->SetModified(true);
  
!     return aspect->Init(mCreateEffector);
  }
  
--- 161,165 ----
      scene->SetModified(true);
  
!     return aspect->Init(mCreateEffector,id);
  }