summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-08-31 20:53:41 +0200
committerHowaner <franzi.moos@googlemail.com>2014-08-31 20:53:41 +0200
commit0d392f53ed5ef96886003afd90c6ce37c16dc7d3 (patch)
tree98bbc3d07ffdf070a43f47c62169a0a3bdf3b47e
parentFixed wrong doxy-comment. (diff)
downloadcuberite-0d392f53ed5ef96886003afd90c6ce37c16dc7d3.tar
cuberite-0d392f53ed5ef96886003afd90c6ce37c16dc7d3.tar.gz
cuberite-0d392f53ed5ef96886003afd90c6ce37c16dc7d3.tar.bz2
cuberite-0d392f53ed5ef96886003afd90c6ce37c16dc7d3.tar.lz
cuberite-0d392f53ed5ef96886003afd90c6ce37c16dc7d3.tar.xz
cuberite-0d392f53ed5ef96886003afd90c6ce37c16dc7d3.tar.zst
cuberite-0d392f53ed5ef96886003afd90c6ce37c16dc7d3.zip
Diffstat (limited to '')
-rw-r--r--src/FurnaceRecipe.cpp6
-rw-r--r--src/FurnaceRecipe.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/FurnaceRecipe.cpp b/src/FurnaceRecipe.cpp
index eb64e0a91..eec76fa4a 100644
--- a/src/FurnaceRecipe.cpp
+++ b/src/FurnaceRecipe.cpp
@@ -77,7 +77,7 @@ void cFurnaceRecipe::ReloadRecipes(void)
size_t FirstCommentSymbol = ParsingLine.find('#');
if ((FirstCommentSymbol != AString::npos) && (FirstCommentSymbol != 0))
{
- ParsingLine.erase(ParsingLine.begin() + FirstCommentSymbol, ParsingLine.end());
+ ParsingLine.erase(ParsingLine.begin() + (const long)FirstCommentSymbol, ParsingLine.end());
}
switch (ParsingLine[0])
@@ -109,7 +109,7 @@ void cFurnaceRecipe::ReloadRecipes(void)
-void cFurnaceRecipe::AddFuelFromLine(const AString & a_Line, int a_LineNum)
+void cFurnaceRecipe::AddFuelFromLine(const AString & a_Line, unsigned int a_LineNum)
{
AString Line(a_Line);
Line.erase(Line.begin()); // Remove the beginning "!"
@@ -151,7 +151,7 @@ void cFurnaceRecipe::AddFuelFromLine(const AString & a_Line, int a_LineNum)
-void cFurnaceRecipe::AddRecipeFromLine(const AString & a_Line, int a_LineNum)
+void cFurnaceRecipe::AddRecipeFromLine(const AString & a_Line, unsigned int a_LineNum)
{
AString Line(a_Line);
Line.erase(std::remove_if(Line.begin(), Line.end(), isspace), Line.end());
diff --git a/src/FurnaceRecipe.h b/src/FurnaceRecipe.h
index e3840d0d9..207480fa9 100644
--- a/src/FurnaceRecipe.h
+++ b/src/FurnaceRecipe.h
@@ -43,11 +43,11 @@ private:
/** Parses the fuel contained in the line, adds it to m_pState's fuels.
Logs a warning to the console on input error. */
- void AddFuelFromLine(const AString & a_Line, int a_LineNum);
+ void AddFuelFromLine(const AString & a_Line, unsigned int a_LineNum);
/** Parses the recipe contained in the line, adds it to m_pState's recipes.
Logs a warning to the console on input error. */
- void AddRecipeFromLine(const AString & a_Line, int a_LineNum);
+ void AddRecipeFromLine(const AString & a_Line, unsigned int a_LineNum);
/** Parses an item string in the format "<ItemType>[:<Damage>][,<Amount>]", returns true if successful. */
bool ParseItem(const AString & a_String, cItem & a_Item);