diff options
author | Simon Howard | 2014-03-29 21:25:55 -0400 |
---|---|---|
committer | Simon Howard | 2014-03-29 21:25:55 -0400 |
commit | 2e6e43c4a706e3670f131c7b2d5a5525f9bf0d7b (patch) | |
tree | 5779e2bb137ce8771b1c12f1f3fd234d16d997f6 /src/hexen/p_inter.c | |
parent | 5f9b4368a2adad65dcc960a76c45d12059ca7214 (diff) | |
download | chocolate-doom-2e6e43c4a706e3670f131c7b2d5a5525f9bf0d7b.tar.gz chocolate-doom-2e6e43c4a706e3670f131c7b2d5a5525f9bf0d7b.tar.bz2 chocolate-doom-2e6e43c4a706e3670f131c7b2d5a5525f9bf0d7b.zip |
heretic: Eliminate use of unsafe string functions.
Eliminate use of strcpy, strcat, strncpy, and use the new safe
alternatives.
Diffstat (limited to 'src/hexen/p_inter.c')
-rw-r--r-- | src/hexen/p_inter.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/hexen/p_inter.c b/src/hexen/p_inter.c index 063e3c64..4352b2c8 100644 --- a/src/hexen/p_inter.c +++ b/src/hexen/p_inter.c @@ -24,6 +24,7 @@ #include "h2def.h" +#include "m_misc.h" #include "m_random.h" #include "i_system.h" #include "p_local.h" @@ -76,15 +77,8 @@ void P_SetMessage(player_t * player, char *message, boolean ultmsg) { return; } - if (strlen(message) > 79) - { - strncpy(player->message, message, 80); - player->message[79] = 0; - } - else - { - strcpy(player->message, message); - } + + M_StringCopy(player->message, message, sizeof(player->message)); // strupr(player->message); player->messageTics = MESSAGETICS; player->yellowMessage = false; @@ -110,15 +104,7 @@ void P_SetYellowMessage(player_t * player, char *message, boolean ultmsg) { return; } - if (strlen(message) > 79) - { - strncpy(player->message, message, 80); - player->message[79] = 0; - } - else - { - strcpy(player->message, message); - } + M_StringCopy(player->message, message, sizeof(player->message)); player->messageTics = 5 * MESSAGETICS; // Bold messages last longer player->yellowMessage = true; if (ultmsg) |