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

SQC-15_online #1

Merged
memartel merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Conversation 0 Commits 349 Files Changed 181 +1 -6
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bd3f677118 - Show all commits

5
SQCSim-srv/connection.cpp
View File

@@ -50,12 +50,8 @@ sockaddr_in* Connection::getAddr() const { return (sockaddr_in*)&m_addr; }
void Connection::getPacks(SOCKET sock) { void Connection::getPacks(SOCKET sock) {
std::vector<char*> lsPck; std::vector<char*> lsPck;
Input in; Input in;
while (true) {
lsPck = recvPacksFrom(sock, &m_buf, m_addr); lsPck = recvPacksFrom(sock, &m_buf, m_addr);
if (lsPck.empty() && !m_buf.tmp)
break;
for (auto& pck : lsPck) { for (auto& pck : lsPck) {
uint32_t bsize = m_buf.len - (pck - m_buf.ptr); uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
switch (netprot::getType(pck, 1)) { switch (netprot::getType(pck, 1)) {
@@ -70,7 +66,6 @@ void Connection::getPacks(SOCKET sock) {
} }
} }
lsPck.clear(); lsPck.clear();
}
} }
void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns) { void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns) {

2
SQCSim2021/engine.h
View File

@@ -108,7 +108,7 @@ private:
//Menu //Menu
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE }; enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE };
GameState m_gamestate = GameState::MAIN_MENU; GameState m_gamestate = GameState::PLAY;
Texture MenuTitleTexture; Texture MenuTitleTexture;
Texture MenuBGTexture; Texture MenuBGTexture;
Texture MenuStartTexture; Texture MenuStartTexture;