Corrections merge de master
hell.
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
#include "define.h"
|
||||
#include "vector3.h"
|
||||
#include "player.h"
|
||||
|
||||
#include "netprotocol.h"
|
||||
|
||||
class World;
|
||||
class Player;
|
||||
@@ -16,7 +16,7 @@ public:
|
||||
Bullet(Vector3f pos, Vector3f dir, uint64_t tid);
|
||||
~Bullet();
|
||||
|
||||
bool Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> m_mapPlayer);
|
||||
bool Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> m_mapPlayer, netprot::ChunkMod** chunkmod);
|
||||
void Transpose(int& x, int& z);
|
||||
Vector3f getPos() const;
|
||||
Vector3f getVel() const;
|
||||
|
Reference in New Issue
Block a user