diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2019-02-25 18:47:55 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2019-02-25 18:47:55 -0500 |
| commit | d7bae41fab5570bdac547a46463974adb4723f96 (patch) | |
| tree | 37b0567300f2e3d0a74ceae5861272f4ff970558 /include/world.hpp | |
| parent | 58774909a78f06b8de3cb60e2f010e8ceccbf3a6 (diff) | |
mem leak patches; world ground from image
Diffstat (limited to 'include/world.hpp')
| -rw-r--r-- | include/world.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/world.hpp b/include/world.hpp index 0bfe078..d53a40b 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -69,7 +69,7 @@ constexpr const unsigned int INDOOR_FLOOR_HEIGHT = (INDOOR_FLOOR_HEIGHTT + INDOO struct WorldData2 { // Data variables - std::vector<WorldData> data; /**< The world's ground data. */ + ObjectTexture ground; float startX; /**< The furthest left coordinate of the world. */ // Indoor variables @@ -125,8 +125,6 @@ private: static std::vector<vec2> stars; - static int getLineIndex(float x); - public: static std::thread thAmbient; @@ -159,7 +157,8 @@ public: static void goWorldRight(Position& p, Solid &d); static void goWorldPortal(Position& p); - static void generate(LuaScript& script); + static void generate(const char *file); + static float getGroundHeight(float x); static bool save(void); static void load(const std::string& file); |