[simspark-cvs] simspark/spark/kerosin/inputserver inputcontrol.h, 1.1.2.1, 1.1.2.1.2.1

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

Update of /cvsroot/simspark/simspark/spark/kerosin/inputserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32108

Modified Files:
      Tag: projectx
	inputcontrol.h 
Log Message:
merge from HEAD


Index: inputcontrol.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -C2 -d -r1.1.2.1 -r1.1.2.1.2.1
*** inputcontrol.h	15 Feb 2007 21:02:33 -0000	1.1.2.1
--- inputcontrol.h	17 Jun 2007 10:59:24 -0000	1.1.2.1.2.1
***************
*** 69,72 ****
--- 69,75 ----
      bool SetFPSController(const std::string& path);
  
+     /** returns the cached location of the FPS controller */
+     boost::shared_ptr<oxygen::FPSController> GetFPSController();
+ 
      /** sets the FPSController to be used */
      void SetFPSController(boost::shared_ptr<oxygen::FPSController> controller);