diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-22 01:06:58 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-22 01:06:58 +0200 |
commit | 4a01fba3aafef53ac8015bd5f6028fc677d6d245 (patch) | |
tree | 24696676e7f52afabccdde4ebfc078d658a60949 /src/FurnaceRecipe.h | |
parent | Removed debugging code (diff) | |
download | cuberite-4a01fba3aafef53ac8015bd5f6028fc677d6d245.tar cuberite-4a01fba3aafef53ac8015bd5f6028fc677d6d245.tar.gz cuberite-4a01fba3aafef53ac8015bd5f6028fc677d6d245.tar.bz2 cuberite-4a01fba3aafef53ac8015bd5f6028fc677d6d245.tar.lz cuberite-4a01fba3aafef53ac8015bd5f6028fc677d6d245.tar.xz cuberite-4a01fba3aafef53ac8015bd5f6028fc677d6d245.tar.zst cuberite-4a01fba3aafef53ac8015bd5f6028fc677d6d245.zip |
Diffstat (limited to '')
-rw-r--r-- | src/FurnaceRecipe.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/FurnaceRecipe.h b/src/FurnaceRecipe.h index e0222f2fb..cddcc215f 100644 --- a/src/FurnaceRecipe.h +++ b/src/FurnaceRecipe.h @@ -41,15 +41,15 @@ public: private: void ClearRecipes(void); - /** PrintFs the line, position, and error into an error string */ - inline static void SetParseError(AString & a_ErrorString, unsigned int a_Line, size_t a_Position, const AString & a_CharactersMissing); + /** Calls LOGWARN with the line, position, and error */ + inline static void PrintParseError(unsigned int a_Line, size_t a_Position, const AString & a_CharactersMissing); /** Reads a number from a string given, starting at a given position and ending at a delimiter given Updates beginning position to the delimiter found + 1, and updates the value to the one read If it encounters a substring that is not fully numeric, it will call SetParseError() and return false; the caller should abort processing Otherwise, the function will return true */ - static bool ReadMandatoryNumber(AString::size_type & a_Begin, const AString & a_Delimiter, const AString & a_Text, AString & a_ErrorString, unsigned int a_Line, int & a_Value, bool a_IsLastValue = false); + static bool ReadMandatoryNumber(AString::size_type & a_Begin, const AString & a_Delimiter, const AString & a_Text, unsigned int a_Line, int & a_Value, bool a_IsLastValue = false); /** Reads two numbers from a string given, starting at a given position and ending at the first delimiter given, then again (with an updated position) until the second delimiter given Updates beginning position to the second delimiter found + 1, and updates the values to the ones read @@ -57,7 +57,7 @@ private: If this happens whilst reading the first value, it will call ReadMandatoryNumber() with the appropriate position, as this may legitimately occur with the optional value and AString::find_first_of finding the incorrect delimiter. It will return the result of ReadMandatoryNumber() True will be returned definitively for an optional value that is valid */ - static bool ReadOptionalNumbers(AString::size_type & a_Begin, const AString & a_DelimiterOne, const AString & a_DelimiterTwo, const AString & a_Text, AString & a_ErrorString, unsigned int a_Line, int & a_ValueOne, int & a_ValueTwo, bool a_IsLastValue = false); + static bool ReadOptionalNumbers(AString::size_type & a_Begin, const AString & a_DelimiterOne, const AString & a_DelimiterTwo, const AString & a_Text, unsigned int a_Line, int & a_ValueOne, int & a_ValueTwo, bool a_IsLastValue = false); /** Uses std::all_of to determine if a string contains only digits */ inline static bool DoesStringContainOnlyNumbers(const AString & a_String); |