diff --git a/common/MiscFunctions.cpp b/common/MiscFunctions.cpp index 734a48fd5..d768da017 100644 --- a/common/MiscFunctions.cpp +++ b/common/MiscFunctions.cpp @@ -353,18 +353,6 @@ static unsigned int case_6 (void){ // end WELL RNG code -const char *ConvertArray(int input, char *returnchar) -{ - sprintf(returnchar, "%i" ,input); - return returnchar; -} - -const char *ConvertArrayF(float input, char *returnchar) -{ - sprintf(returnchar, "%0.2f", input); - return returnchar; -} - float EQ13toFloat(int d) { return ( float(d)/float(1<<2)); diff --git a/common/MiscFunctions.h b/common/MiscFunctions.h index cebc04d32..35207b95c 100644 --- a/common/MiscFunctions.h +++ b/common/MiscFunctions.h @@ -96,8 +96,7 @@ void CoutTimestamp(bool ms = true); int MakeRandomInt(int low, int high); double MakeRandomFloat(double low, double high); -const char *ConvertArray(int input, char *returnchar); -const char *ConvertArrayF(float input, char *returnchar); + float EQ13toFloat(int d); float NewEQ13toFloat(int d); float EQ19toFloat(int d); diff --git a/common/StringUtil.cpp b/common/StringUtil.cpp index bfe923487..530bf2f1d 100644 --- a/common/StringUtil.cpp +++ b/common/StringUtil.cpp @@ -320,3 +320,15 @@ char *RemoveApostrophes(const char *s) return NewString; } + +const char *ConvertArray(int input, char *returnchar) +{ + sprintf(returnchar, "%i" ,input); + return returnchar; +} + +const char *ConvertArrayF(float input, char *returnchar) +{ + sprintf(returnchar, "%0.2f", input); + return returnchar; +} diff --git a/common/StringUtil.h b/common/StringUtil.h index ef757e24f..b7e389e65 100644 --- a/common/StringUtil.h +++ b/common/StringUtil.h @@ -49,6 +49,9 @@ bool strn0cpyt(char* dest, const char* source, uint32 size); char *CleanMobName(const char *in, char *out); +const char *ConvertArray(int input, char *returnchar); +const char *ConvertArrayF(float input, char *returnchar); + void RemoveApostrophes(std::string &s); char *RemoveApostrophes(const char *s); diff --git a/zone/exp.cpp b/zone/exp.cpp index 2a9cdc6a0..97c19363e 100644 --- a/zone/exp.cpp +++ b/zone/exp.cpp @@ -19,7 +19,7 @@ #include "../common/features.h" #include "masterentity.h" #include "StringIDs.h" -#include "../common/MiscFunctions.h" +#include "../common/StringUtil.h" #include "../common/rulesys.h" #include "QuestParserCollection.h"