memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online

Browse Source
This commit is contained in:
Claudel-D-Roy
2023-12-07 14:04:38 -05:00
parent d1f02c34e9 ab87da7d88
commit 58c97587bf
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SQCSim-srv/server.cpp
View File

@@ -327,7 +327,7 @@ void Server::Run() {
sendPackTo<BulletAdd>(m_sock_udp, bull, &m_buf, conn->getAddr()); sendPackTo<BulletAdd>(m_sock_udp, bull, &m_buf, conn->getAddr());
delete bull; delete bull;
} }
netbull.clear();
for (auto& bull : bullets) { for (auto& bull : bullets) {
ChunkMod* cmod = nullptr; ChunkMod* cmod = nullptr;
@@ -337,7 +337,6 @@ void Server::Run() {
outbox_bullets.emplace_back(std::move(bull)); outbox_bullets.emplace_back(std::move(bull));
} }
} }
netbull.clear();
for (auto& chat : chatlog) { for (auto& chat : chatlog) {
Log(chat->mess, false, false); Log(chat->mess, false, false);
@@ -354,9 +353,9 @@ void Server::Run() {
} }
chunkdiffs.clear(); chunkdiffs.clear();
for (auto& bull : outbox_bullets) //for (auto& bull : outbox_bullets)
delete bull; // delete bull;
outbox_bullets.clear(); //outbox_bullets.clear();
} }
Chat end; Chat end;