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 +3 -4
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 63d70be488 - Show all commits

7
SQCSim-srv/server.cpp
View File

@@ -204,8 +204,8 @@ void Server::Run() {
m_conns.erase(key); m_conns.erase(key);
continue; continue;
} }
int x = 0,// (rand() % (CHUNK_SIZE_X * WORLD_SIZE_X - 1)),// -(CHUNK_SIZE_X * WORLD_SIZE_X / 2), int x = (rand() % (CHUNK_SIZE_X * WORLD_SIZE_X - 1) - (CHUNK_SIZE_X * WORLD_SIZE_X / 2)) / 4,
y = 0;// (rand() % (CHUNK_SIZE_Y * WORLD_SIZE_Y - 1));// -(CHUNK_SIZE_Y * WORLD_SIZE_Y / 2); y = (rand() % (CHUNK_SIZE_Y * WORLD_SIZE_Y - 1) - (CHUNK_SIZE_Y * WORLD_SIZE_Y / 2)) / 4;
conn->player = new Player(Vector3f(x + .5f, CHUNK_SIZE_Y + 1.8f, y + .5f)); conn->player = new Player(Vector3f(x + .5f, CHUNK_SIZE_Y + 1.8f, y + .5f));
conn->player->m_username = conn->GetName(); conn->player->m_username = conn->GetName();
m_players[key] = conn->player; m_players[key] = conn->player;
@@ -231,7 +231,7 @@ void Server::Run() {
Chat* startchat = new Chat(); Chat* startchat = new Chat();
startchat->src_id = 0; startchat->src_id = 0;
char startmess[] = "How would -YOU- like to die today, motherfuckers?"; char startmess[] = "How would -YOU- like to die today, motherf-words?";
strcpy(startchat->mess, 140, startmess); strcpy(startchat->mess, 140, startmess);
@@ -342,7 +342,6 @@ void Server::Run() {
delete bullet; delete bullet;
} }
} }
for (auto& bull: bullit) for (auto& bull: bullit)
bullets.erase(bull); bullets.erase(bull);
bullit.clear(); bullit.clear();