diff options
author | Simon Howard | 2010-05-03 17:07:45 +0000 |
---|---|---|
committer | Simon Howard | 2010-05-03 17:07:45 +0000 |
commit | 4767ddccafca1a1c50bc097284df1328d478882a (patch) | |
tree | 26846694ab4cb35dbea92bf1519dc3a4c9b33c52 /src/doom/st_stuff.c | |
parent | af48a6309cf1f03b5136e26a5fc27a38e490d808 (diff) | |
parent | aa35a71bd05536f82ce23887f7e84decc7f850a7 (diff) | |
download | chocolate-doom-4767ddccafca1a1c50bc097284df1328d478882a.tar.gz chocolate-doom-4767ddccafca1a1c50bc097284df1328d478882a.tar.bz2 chocolate-doom-4767ddccafca1a1c50bc097284df1328d478882a.zip |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1931
Diffstat (limited to 'src/doom/st_stuff.c')
-rw-r--r-- | src/doom/st_stuff.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/doom/st_stuff.c b/src/doom/st_stuff.c index 160244ce..7e5e225c 100644 --- a/src/doom/st_stuff.c +++ b/src/doom/st_stuff.c @@ -1085,10 +1085,10 @@ static void ST_loadUnloadGraphics(load_callback_t callback) // Load the numbers, tall and short for (i=0;i<10;i++) { - sprintf(namebuf, DEH_String("STTNUM%d"), i); + DEH_snprintf(namebuf, 9, "STTNUM%d", i); callback(namebuf, &tallnum[i]); - sprintf(namebuf, DEH_String("STYSNUM%d"), i); + DEH_snprintf(namebuf, 9, "STYSNUM%d", i); callback(namebuf, &shortnum[i]); } @@ -1100,7 +1100,7 @@ static void ST_loadUnloadGraphics(load_callback_t callback) // key cards for (i=0;i<NUMCARDS;i++) { - sprintf(namebuf, DEH_String("STKEYS%d"), i); + DEH_snprintf(namebuf, 9, "STKEYS%d", i); callback(namebuf, &keys[i]); } @@ -1110,7 +1110,7 @@ static void ST_loadUnloadGraphics(load_callback_t callback) // arms ownership widgets for (i=0; i<6; i++) { - sprintf(namebuf, DEH_String("STGNUM%d"), i+2); + DEH_snprintf(namebuf, 9, "STGNUM%d", i+2); // gray # callback(namebuf, &arms[i][0]); @@ -1120,7 +1120,7 @@ static void ST_loadUnloadGraphics(load_callback_t callback) } // face backgrounds for different color players - sprintf(namebuf, DEH_String("STFB%d"), consoleplayer); + DEH_snprintf(namebuf, 9, "STFB%d", consoleplayer); callback(namebuf, &faceback); // status bar background bits @@ -1132,23 +1132,23 @@ static void ST_loadUnloadGraphics(load_callback_t callback) { for (j=0; j<ST_NUMSTRAIGHTFACES; j++) { - sprintf(namebuf, DEH_String("STFST%d%d"), i, j); + DEH_snprintf(namebuf, 9, "STFST%d%d", i, j); callback(namebuf, &faces[facenum]); ++facenum; } - sprintf(namebuf, DEH_String("STFTR%d0"), i); // turn right + DEH_snprintf(namebuf, 9, "STFTR%d0", i); // turn right callback(namebuf, &faces[facenum]); ++facenum; - sprintf(namebuf, DEH_String("STFTL%d0"), i); // turn left + DEH_snprintf(namebuf, 9, "STFTL%d0", i); // turn left callback(namebuf, &faces[facenum]); ++facenum; - sprintf(namebuf, DEH_String("STFOUCH%d"), i); // ouch! + DEH_snprintf(namebuf, 9, "STFOUCH%d", i); // ouch! callback(namebuf, &faces[facenum]); ++facenum; - sprintf(namebuf, DEH_String("STFEVL%d"), i); // evil grin ;) + DEH_snprintf(namebuf, 9, "STFEVL%d", i); // evil grin ;) callback(namebuf, &faces[facenum]); ++facenum; - sprintf(namebuf, DEH_String("STFKILL%d"), i); // pissed off + DEH_snprintf(namebuf, 9, "STFKILL%d", i); // pissed off callback(namebuf, &faces[facenum]); ++facenum; } |