X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2FSituation.hpp;h=25d218ddc2635d08bd26917df55623aa7082c23f;hb=cd80d7cfcac3c58d601db2ab4e0381dd77c06f44;hp=3c4a28a567ef4877b09ad68c94575c12545179cf;hpb=b4deadd9f4e399207e2530ea39a447c0d9d260a3;p=blobs.git

diff --git a/src/creature/Situation.hpp b/src/creature/Situation.hpp
index 3c4a28a..25d218d 100644
--- a/src/creature/Situation.hpp
+++ b/src/creature/Situation.hpp
@@ -53,10 +53,7 @@ public:
 	bool OnPlanet() const noexcept;
 	world::Planet &GetPlanet() const noexcept { return *planet; }
 	bool OnSurface() const noexcept;
-	int Surface() const noexcept { return surface; }
 	const glm::dvec3 &Position() const noexcept { return state.pos; }
-	bool OnTile() const noexcept;
-	glm::ivec2 SurfacePosition() const noexcept;
 	world::Tile &GetTile() const noexcept;
 	const world::TileType &GetTileType() const noexcept;
 
@@ -64,7 +61,7 @@ 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.0000001; }
+	bool Moving() const noexcept { return glm::length2(state.vel) > 0.000001; }
 	void Move(const glm::dvec3 &dp) noexcept;
 	void Accelerate(const glm::dvec3 &dv) noexcept;
 	void EnforceConstraints(State &) noexcept;
@@ -72,12 +69,11 @@ public:
 	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,