SQC-15_online #1

Merged
memartel_loc merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
2 changed files with 5 additions and 5 deletions
Showing only changes of commit 4841e8d5ba - Show all commits

View File

@ -334,11 +334,11 @@ void Server::Run() {
delete chmo;
}
for (auto& bull : outbox_bullets)
delete bull;
//for (auto& bull : outbox_bullets)
//delete bull;
for (auto& bull : netbull)
delete bull;
//for (auto& bull : netbull)
//delete bull;
outbox_bullets.clear();
netbull.clear();

View File

@ -1625,7 +1625,7 @@ void Engine::KeyPressEvent(unsigned char key) {
break;
case 36: // ESC - Quitter
if (m_networkgame)
break;
Stop();
if (m_gamestate == GameState::PLAY) {
m_gamestate = GameState::PAUSE;
}