Corrections merge de master

hell.
This commit is contained in:
MarcEricMartel
2023-12-05 13:44:54 -05:00
parent 4775de01d8
commit 464ba131c4
19 changed files with 327 additions and 170 deletions

View File

@@ -11,6 +11,7 @@
#include "array2d.h"
#include "bullet.h"
#include "chunk.h"
#include "netprotocol.h"
class Chunk;
class Bullet;
@@ -37,7 +38,7 @@ public:
void GetScope(unsigned int& x, unsigned int& y);
void ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block);
netprot::ChunkMod* ChangeBlockAtCursor(BlockType blockType, const Vector3f& player_pos, const Vector3f& player_dir, bool& block, bool net);
void ChangeBlockAtPosition(BlockType blockType, Vector3f pos);
void CleanUpWorld(int& deleteframes, bool clear);
int GettbDeleted() const;