From 8c6d0b51c719e1817e308375d129b17ede3b82fc Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 7 Nov 2016 22:15:07 +0000 Subject: Use CMake's Android generators to crosscompile --- src/FurnaceRecipe.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/FurnaceRecipe.cpp') diff --git a/src/FurnaceRecipe.cpp b/src/FurnaceRecipe.cpp index 2c20eec0f..d1082b63f 100644 --- a/src/FurnaceRecipe.cpp +++ b/src/FurnaceRecipe.cpp @@ -6,7 +6,7 @@ #include -#define FURNACE_RECIPE_FILE "furnace.txt" +#define FURNACE_RECIPE_FILE FILE_IO_PREFIX "furnace.txt" @@ -70,6 +70,10 @@ void cFurnaceRecipe::ReloadRecipes(void) LineNum++; if (ParsingLine.empty()) { + // There is a problem here on Android. Text files transferred from another OS may have a newline representation Android's implementation of getline doesn't expect + // Thus, part of a newline may be left in ParsingLine. ::empty() thus thinks the string isn't empty, and the below code outputs interesting errors since it was passed a nearly empty string + // Ref: http://stackoverflow.com/questions/6089231/getting-std-ifstream-to-handle-lf-cr-and-crlf + // TODO: There is a solution in the above reference, but it isn't very pretty. Fix it somehow. continue; } -- cgit v1.2.3