summaryrefslogtreecommitdiffstats
path: root/src/World.hpp
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2019-01-27 04:10:36 +0100
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2019-01-27 04:10:36 +0100
commitc3472b8abd8185f392e6c2afb68a7411232396d6 (patch)
tree7b3544cdb5eccfcce2a1a7c8efaa5c09ae7455df /src/World.hpp
parentRefactored GameState (diff)
downloadAltCraft-c3472b8abd8185f392e6c2afb68a7411232396d6.tar
AltCraft-c3472b8abd8185f392e6c2afb68a7411232396d6.tar.gz
AltCraft-c3472b8abd8185f392e6c2afb68a7411232396d6.tar.bz2
AltCraft-c3472b8abd8185f392e6c2afb68a7411232396d6.tar.lz
AltCraft-c3472b8abd8185f392e6c2afb68a7411232396d6.tar.xz
AltCraft-c3472b8abd8185f392e6c2afb68a7411232396d6.tar.zst
AltCraft-c3472b8abd8185f392e6c2afb68a7411232396d6.zip
Diffstat (limited to '')
-rw-r--r--src/World.hpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/World.hpp b/src/World.hpp
index 165e73d..94e17f6 100644
--- a/src/World.hpp
+++ b/src/World.hpp
@@ -11,8 +11,8 @@
#include "Entity.hpp"
#include "Block.hpp"
#include "Vector.hpp"
+#include "Section.hpp"
-class Section;
class PacketChunkData;
class PacketBlockChange;
class PacketMultiBlockChange;
@@ -28,24 +28,17 @@ struct RaycastResult {
class World {
int dimension = 0;
- std::map<Vector, std::unique_ptr<Section>> sections;
+ std::map<Vector, Section> sections;
Section ParseSection(StreamInput *data, Vector position);
std::list<Entity> entities;
- std::mutex entitiesMutex;
-
std::vector<Vector> sectionsList;
- std::mutex sectionsListMutex;
-
void UpdateSectionsList();
public:
- World();
-
- ~World();
void ParseChunkData(std::shared_ptr<PacketChunkData> packet);