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 11 additions and 10 deletions
Showing only changes of commit 9c1cd885cf - Show all commits

View File

@ -11,12 +11,13 @@
#define ID_LIST_SIZE 127
#define SRV_MANUAL_SETUP true
std::vector<std::string> DEATHMESSAGES = { "@ has gone to meet their maker.",
"@ has bit the dust, if you know what I mean.",
"@ has ceased to be.",
"@ is no more.",
"@ is like, super dead.",
"RIP, @.",
"So long, @, and thanks for all the lols!"};
const std::vector<std::string> DEATHMESSAGES = { "@ has gone to meet their maker.",
"@ has bit the dust, if you know what I mean.",
"@ has ceased to be.",
"@ is no more.",
"@ is like, super dead.",
"RIP, @.",
"So long, @, and thanks for all the lols!",
"@ has a bad case of being dead." };
#endif

View File

@ -268,10 +268,10 @@ void Server::Run() {
Timestamp tstamp = conn->Run(m_world);
if (conn->player->AmIDead()) {
Chat* chat = new Chat();
chat->dest_id = chat->dest_team_id = chat->src_id = 0;
Chat chat;
chat.dest_id = chat.dest_team_id = chat.src_id = 0;
strcpy(chat->mess, getDeathMessage(conn->player->GetUsername()).c_str());
strcpy(chat.mess, getDeathMessage(conn->player->GetUsername()).c_str());
m_chatlog[tstamp] = chat;