bulletadd

SQCSim-srv/connection.h

@@ -20,7 +20,7 @@ public:
 		PlayerInfo play);
 	~Connection();
 
-	std::unique_ptr<Player> player = nullptr;
+	Player* player = nullptr;
 
 	uint64_t GetHash(bool self = true) const;
 	uint64_t GetTeamHash() const;
@@ -36,7 +36,7 @@ public:
 	void getPacks(SOCKET sock);
 	void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns, const uint32_t timer);
 
-	void Run(World* world);
+	Timestamp Run(World* world);
 
 	void CleanInputManifest(Timestamp time);
 	
@@ -45,6 +45,8 @@ public:
 	std::vector<Bullet> Bullets;
 	std::vector<ChunkMod> ChunkDiffs;
 
+	Timestamp GetTStamp() const;
+
 private:
 	std::unordered_map<Timestamp, Input> m_input_manifest;
 	std::vector<Input> m_input_vector;
@@ -53,6 +55,7 @@ private:
 	std::unordered_map<Timestamp, Chat> m_chatlog;
 
 	float m_shoot_acc = 0;
+	Timestamp m_tstamp = 0;
 
 	SOCKET m_sock;
 	sockaddr_in m_addr;