From 9fad44bab2c4d3fe627c61b415f502180260afab Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sun, 25 Jul 2021 19:44:07 +1000 Subject: [PATCH] - Blood: Replace use of non-standard `strupr()` from 754554a4939965ed264c6a6ad906011cfecb22d6 with an FString object. --- source/games/blood/src/nnexts.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp index 7a64e1870..7188c8e42 100644 --- a/source/games/blood/src/nnexts.cpp +++ b/source/games/blood/src/nnexts.cpp @@ -3239,15 +3239,15 @@ bool condCmp(int val, int arg1, int arg2, int comOp) { void condError(XSPRITE* pXCond, const char* pzFormat, ...) { - char buffer[256]; char buffer2[512]; char condType[32] = "Unknown"; + char buffer[256]; char buffer2[512]; FString condType = "Unknown"; for (int i = 0; i < 7; i++) { if (pXCond->data1 < gCondTypeNames[i].rng1 || pXCond->data1 >= gCondTypeNames[i].rng2) continue; - sprintf(condType, gCondTypeNames[i].name); - strupr(condType); + condType = gCondTypeNames[i].name; + condType.ToUpper(); break; } - sprintf(buffer, "\n\n%s CONDITION RX: %d, TX: %d, SPRITE: #%d RETURNS:\n", condType, pXCond->rxID, pXCond->txID, pXCond->reference); + sprintf(buffer, "\n\n%s CONDITION RX: %d, TX: %d, SPRITE: #%d RETURNS:\n", condType.GetChars(), pXCond->rxID, pXCond->txID, pXCond->reference); va_list args; va_start(args, pzFormat); vsprintf(buffer2, pzFormat, args);