summaryrefslogtreecommitdiffstats
path: root/src/world/World.hpp
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-06-17 16:23:53 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-06-17 16:23:53 +0200
commit789f70b6f1a9067843dfc1ff73d86b645efe1da9 (patch)
treef3db085f2ac1ec5fd6ad0869a63e77a7f0fb1a17 /src/world/World.hpp
parent2017-06-14 (diff)
downloadAltCraft-789f70b6f1a9067843dfc1ff73d86b645efe1da9.tar
AltCraft-789f70b6f1a9067843dfc1ff73d86b645efe1da9.tar.gz
AltCraft-789f70b6f1a9067843dfc1ff73d86b645efe1da9.tar.bz2
AltCraft-789f70b6f1a9067843dfc1ff73d86b645efe1da9.tar.lz
AltCraft-789f70b6f1a9067843dfc1ff73d86b645efe1da9.tar.xz
AltCraft-789f70b6f1a9067843dfc1ff73d86b645efe1da9.tar.zst
AltCraft-789f70b6f1a9067843dfc1ff73d86b645efe1da9.zip
Diffstat (limited to 'src/world/World.hpp')
-rw-r--r--src/world/World.hpp27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/world/World.hpp b/src/world/World.hpp
index b33499c..e315baf 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -8,27 +8,30 @@
#include <bitset>
#include <easylogging++.h>
#include "Block.hpp"
-#include "../packet/Packet.hpp"
#include "Section.hpp"
+#include "../network/Packet.hpp"
+#include "Collision.hpp"
class World {
- //utility vars
- World(const World &other);
+ //utility vars
+ World(const World &other);
- World &operator=(const World &other);
+ World &operator=(const World &other);
- //game vars
- int m_dimension = 0;
+ //game vars
+ int dimension = 0;
- //game methods
- Section ParseSection(byte *data, size_t &dataLen);
+ //game methods
+ Section ParseSection(StreamInput *data);
public:
- World();
+ World();
- ~World();
+ ~World();
- void ParseChunkData(Packet packet);
+ void ParseChunkData(std::shared_ptr<PacketChunkData> packet);
- std::map<Vector, Section> m_sections;
+ std::map<Vector, Section> sections;
+
+ bool isPlayerCollides(double X, double Y, double Z);
}; \ No newline at end of file