X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2FSituation.hpp;h=ea466177f085ce270d0b0ca67d3389091c67c89f;hb=refs%2Fheads%2Fmaster;hp=c94d2d5c615bdb60a40349160899d87a0e494397;hpb=291f8847097107fef4e97c86036e104d97818b8b;p=blobs.git

diff --git a/src/creature/Situation.hpp b/src/creature/Situation.hpp
index c94d2d5..ea46617 100644
--- a/src/creature/Situation.hpp
+++ b/src/creature/Situation.hpp
@@ -53,10 +53,9 @@ public:
 	bool OnPlanet() const noexcept;
 	world::Planet &GetPlanet() const noexcept { return *planet; }
 	bool OnSurface() const noexcept;
-	int Surface() const noexcept { return surface; }
+	bool OnGround() const noexcept;
 	const glm::dvec3 &Position() const noexcept { return state.pos; }
-	bool OnTile() const noexcept;
-	glm::ivec2 SurfacePosition() const noexcept;
+	glm::dvec3 SurfaceNormal() const noexcept;
 	world::Tile &GetTile() const noexcept;
 	const world::TileType &GetTileType() const noexcept;
 
@@ -64,18 +63,19 @@ public:
 	const State &GetState() const noexcept { return state; }
 
 	const glm::dvec3 &Velocity() const noexcept { return state.vel; }
-	bool Moving() const noexcept { return glm::length2(state.vel) < 0.00000001; }
+	bool Moving() const noexcept { return glm::length2(state.vel) > 0.00001; }
 	void Move(const glm::dvec3 &dp) noexcept;
+	void Accelerate(const glm::dvec3 &dv) noexcept;
+	void EnforceConstraints(State &) const noexcept;
 
 	void Heading(const glm::dvec3 &h) noexcept { state.dir = h; }
 	const glm::dvec3 &Heading() const noexcept { return state.dir; }
 
-	void SetPlanetSurface(world::Planet &, int srf, const glm::dvec3 &pos) noexcept;
+	void SetPlanetSurface(world::Planet &, const glm::dvec3 &pos) noexcept;
 
 public:
 	world::Planet *planet;
 	State state;
-	int surface;
 	enum {
 		LOST,
 		PLANET_SURFACE,