sockets documentation and cleanup

[chaz/yoink] / src / Scene.hh

diff --git a/src/Scene.hh b/src/Scene.hh
index 7558e3a6fce7af7a09587dffd15860a04b34996f..d92784a2a0e2e7babc76f0054d893af25ac8ab50 100644 (file)
--- a/src/Scene.hh
+++ b/src/Scene.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _SCENE_HH_
 #define _SCENE_HH_
@@ -43,6 +26,10 @@
 class Character;
 
 
+namespace Mf {
+class Settings;
+}
+
 class Scene;
 typedef boost::shared_ptr<Scene> SceneP;
 
@@ -60,7 +47,7 @@ public:
                return SceneP(new Scene(name));
        }
 
-       Mf::Script::Result load(Mf::Script& script);
+       Mf::Script::Result load(Mf::Settings& settings, Mf::Script& script);
 
        void draw(Mf::Scalar alpha) const;
        void drawIfVisible(Mf::Scalar alpha, const Mf::Frustum& frustum) const;
@@ -68,14 +55,12 @@ public:
        Mf::Scalar getZCoord(const Mf::Vector2& position) const;
 
        bool castRay(const Mf::Ray<2>& ray,
-                       std::list<Mf::Ray<2>::Intersection>& hits) const;
+                       std::list<Mf::Ray<2>::Contact>& hits) const;
        bool checkForCollision(Character& character);
 
-       static std::string getPath(const std::string& name);
+       static bool getPath(std::string& name);
 };
 
 
 #endif // _SCENE_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-