diff options
Diffstat (limited to 'src/hexen')
| -rw-r--r-- | src/hexen/p_inter.c | 8 | ||||
| -rw-r--r-- | src/hexen/st_start.c | 27 |
2 files changed, 6 insertions, 29 deletions
diff --git a/src/hexen/p_inter.c b/src/hexen/p_inter.c index b66042ad..514d92a6 100644 --- a/src/hexen/p_inter.c +++ b/src/hexen/p_inter.c @@ -78,8 +78,8 @@ void P_SetMessage(player_t * player, char *message, boolean ultmsg) } if (strlen(message) > 79) { - memcpy(player->message, message, 80); - player->message[80] = 0; + strncpy(player->message, message, 80); + player->message[79] = 0; } else { @@ -112,8 +112,8 @@ void P_SetYellowMessage(player_t * player, char *message, boolean ultmsg) } if (strlen(message) > 79) { - memcpy(player->message, message, 80); - player->message[80] = 0; + strncpy(player->message, message, 80); + player->message[79] = 0; } else { diff --git a/src/hexen/st_start.c b/src/hexen/st_start.c index cd89484b..1f3cca1f 100644 --- a/src/hexen/st_start.c +++ b/src/hexen/st_start.c @@ -271,25 +271,10 @@ void ST_NetDone(void) void ST_Message(char *message, ...) { va_list argptr; - char buffer[80]; va_start(argptr, message); - vsprintf(buffer, message, argptr); + vprintf(message, argptr); va_end(argptr); - - if (strlen(buffer) >= 80) - { - I_Error("Long debug message has overwritten memory"); - } - -#ifdef __WATCOMC__ - if (debugmode) - { - printf(buffer); - } -#else - printf(buffer); -#endif } //========================================================================== @@ -301,18 +286,10 @@ void ST_Message(char *message, ...) void ST_RealMessage(char *message, ...) { va_list argptr; - char buffer[80]; va_start(argptr, message); - vsprintf(buffer, message, argptr); + vprintf(message, argptr); va_end(argptr); - - if (strlen(buffer) >= 80) - { - I_Error("Long debug message has overwritten memory\n"); - } - - printf(buffer); // Always print these messages } |