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

@@ -34,7 +34,7 @@ public:
sockaddr_in* getAddr() const;
void getPacks(SOCKET sock);
void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns);
void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns, const uint32_t timer);
Timestamp Run(World* world);
@@ -49,7 +49,9 @@ public:
private:
std::unordered_map<Timestamp, Input> m_input_manifest;
std::vector<Input> m_input_vector;
std::unordered_map<Timestamp, Output> m_output_manifest;
std::deque<Output> m_output_vector;
std::unordered_map<Timestamp, Chat> m_chatlog;
float m_shoot_acc = 0;