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

Eh?

Browse Source
This commit is contained in:
MarcEricMartel 2023-12-16 15:05:06 -05:00
parent 4a4f353250
commit 1065357e70
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SQCSim-common/netprotocol.cpp
View File

@ -1173,11 +1173,11 @@ netprot::Packet netprot::makePack(void* ptr, PACKET_TYPE type) {
} }
void netprot::recvPacks(SOCKET sock, Buffer* buf, std::vector<char*>* lsPck) { void netprot::recvPacks(SOCKET sock, Buffer* buf, std::vector<char*>* lsPck) {
int len = buf->tmp ? buf->tmp - buf->ptr : 0, int len = 0,//buf->tmp ? buf->tmp - buf->ptr : 0,
end = 0; end = 0;
char* cursor = buf->tmp ? buf->tmp : nullptr, char* cursor = nullptr,//buf->tmp ? buf->tmp : nullptr,
* next = buf->tmp ? buf->tmp + 1 : buf->ptr, * next = buf->ptr,//buf->tmp ? buf->tmp + 1 : buf->ptr,
* last = buf->tmp ? buf->tmp : buf->ptr; * last = buf->ptr,//buf->tmp ? buf->tmp : buf->ptr;
bool ended = true; bool ended = true;
struct pollfd fds[1]; struct pollfd fds[1];

21
SQCSim-srv/server.cpp
View File

@ -374,15 +374,13 @@ 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(); if (!netbull.empty())
netbull.clear();
if (!bullets.empty())
std::cout << "Bullets: " << bullets.size() << std::endl;
for (auto bull = bullets.begin(); bull != bullets.end(); ++bull) { for (auto bull = bullets.begin(); bull != bullets.end(); ++bull) {
ChunkMod* cmod = nullptr; ChunkMod* cmod = nullptr;
Bullet* bullet = *bull; Bullet* bullet = *bull;
if (bullet->Update(m_world, (1. / 60.), 20, m_players, &cmod)) { if (bullet->Update(m_world, (1. / 60.), 1, m_players, &cmod)) {
if (cmod) if (cmod)
chunkdiffs.emplace_back(cmod); chunkdiffs.emplace_back(cmod);
bullit.push_back(bull); bullit.push_back(bull);
@ -392,7 +390,12 @@ void Server::Run() {
for (auto& bull: bullit) for (auto& bull: bullit)
bullets.erase(bull); bullets.erase(bull);
bullit.clear();
if (!bullets.empty())
bullets.clear();
if (!bullit.empty())
bullit.clear();
for (auto& chat : chatlog) { for (auto& chat : chatlog) {
Log(chat->mess, false, false); Log(chat->mess, false, false);
@ -400,14 +403,16 @@ void Server::Run() {
sendPackTo<Chat>(m_sock_udp, chat, &m_buf, conn->getAddr()); sendPackTo<Chat>(m_sock_udp, chat, &m_buf, conn->getAddr());
delete chat; delete chat;
} }
chatlog.clear(); if (!chatlog.empty())
chatlog.clear();
for (auto& chmo : chunkdiffs) { for (auto& chmo : chunkdiffs) {
for (auto& [key, conn] : m_conns) for (auto& [key, conn] : m_conns)
sendPackTo<ChunkMod>(m_sock_udp, chmo, &m_buf, conn->getAddr()); sendPackTo<ChunkMod>(m_sock_udp, chmo, &m_buf, conn->getAddr());
delete chmo; delete chmo;
} }
chunkdiffs.clear(); if (!chunkdiffs.empty())
chunkdiffs.clear();
} }
Chat end; Chat end;