Merge branch 'master' into SQC-15_online

This commit is contained in:
MarcEricMartel
2023-12-05 06:34:51 -05:00
69 changed files with 172 additions and 329 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, const uint32_t timer);
void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns);
Timestamp Run(World* world);
@@ -49,9 +49,7 @@ 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;