X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fworld%2Fworld.cpp;h=f648baad45c082da5139066bf7fed8f68e6a1334;hb=a50aa0f2a2fea14f5f8c56209e2ecde3088ef913;hp=242da2796af047fc0e41f472fdb5b20126009b05;hpb=b066e776622f96e906600a0c4a08de392bd03676;p=blank.git diff --git a/src/world/world.cpp b/src/world/world.cpp index 242da27..f648baa 100644 --- a/src/world/world.cpp +++ b/src/world/world.cpp @@ -127,7 +127,8 @@ glm::mat4 EntityState::Transform(const glm::ivec3 &reference) const noexcept { Player::Player(Entity &e, ChunkIndex &c) : entity(e) -, chunks(c) { +, chunks(c) +, inv_slot(0) { } @@ -166,7 +167,6 @@ Player *World::AddPlayer(const std::string &name) { } Entity &entity = AddEntity(); entity.Name(name); - // TODO: load from save file here entity.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } }); entity.WorldCollidable(true); entity.Position(config.spawn); @@ -186,7 +186,6 @@ Player *World::AddPlayer(const std::string &name, std::uint32_t id) { return nullptr; } entity->Name(name); - // TODO: load from save file here entity->Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } }); entity->WorldCollidable(true); entity->Position(config.spawn);