Actually fixed it this time, and squashed some warnings.
This commit is contained in:
parent
f83c03aadf
commit
84c20dfdbf
|
@ -258,9 +258,9 @@ int evaluateNextCommand(gameLogicParameters * parameters, queue * queue)
|
||||||
memset(lookMessage, 0, sizeof(userMessage));
|
memset(lookMessage, 0, sizeof(userMessage));
|
||||||
charCount = 0;
|
charCount = 0;
|
||||||
}
|
}
|
||||||
snprintf(formattedString, 38, "\n%02d. %32s", playerNumber++,
|
snprintf(formattedString, 45, "\n%02d. %31s", playerNumber++,
|
||||||
parameters->connectedPlayers[index].playerName);
|
parameters->connectedPlayers[index].playerName);
|
||||||
strncat(lookMessage->messageContent, formattedString, 37);
|
strncat(lookMessage->messageContent, formattedString, 64);
|
||||||
charCount += 38;
|
charCount += 38;
|
||||||
|
|
||||||
// Allocate another outputMessage for the queue:
|
// Allocate another outputMessage for the queue:
|
||||||
|
@ -646,7 +646,7 @@ int evaluateNextCommand(gameLogicParameters * parameters, queue * queue)
|
||||||
currentCommand->caller->talkingWith = &(parameters->connectedPlayers[playerIndex]);
|
currentCommand->caller->talkingWith = &(parameters->connectedPlayers[playerIndex]);
|
||||||
|
|
||||||
// Fill out the message to inform the receiving user what is happening:
|
// Fill out the message to inform the receiving user what is happening:
|
||||||
strncpy(talkMessage->messageContent, currentCommand->caller->playerName, 31);
|
strncpy(talkMessage->messageContent, currentCommand->caller->playerName, 32);
|
||||||
strcat(talkMessage->messageContent, " is talking to you.");
|
strcat(talkMessage->messageContent, " is talking to you.");
|
||||||
|
|
||||||
playerInfo ** recipients = calloc(1, (sizeof(playerInfo*)));
|
playerInfo ** recipients = calloc(1, (sizeof(playerInfo*)));
|
||||||
|
@ -659,7 +659,7 @@ int evaluateNextCommand(gameLogicParameters * parameters, queue * queue)
|
||||||
pushQueue(parameters->outputQueue, talkReceiverMessage, OUTPUT_MESSAGE);
|
pushQueue(parameters->outputQueue, talkReceiverMessage, OUTPUT_MESSAGE);
|
||||||
|
|
||||||
// Prep the message to the calling user.
|
// Prep the message to the calling user.
|
||||||
strncat(&talkMessage->senderName[1], currentCommand->arguments, 27);
|
memcpy(&talkMessage->senderName[1], currentCommand->arguments, sizeof(char) * 27);
|
||||||
strncat(&talkMessage->senderName[1], " > ", 4);
|
strncat(&talkMessage->senderName[1], " > ", 4);
|
||||||
strcpy(talkMessage->messageContent, "Conversation begun with: ");
|
strcpy(talkMessage->messageContent, "Conversation begun with: ");
|
||||||
strcat(talkMessage->messageContent, parameters->connectedPlayers[playerIndex].playerName);
|
strcat(talkMessage->messageContent, parameters->connectedPlayers[playerIndex].playerName);
|
||||||
|
|
Loading…
Reference in New Issue