Merge remote branch 'upstream/master' into t7g-ios

Conflicts:
	engines/groovie/script.cpp

1 files changed, 17 insertions, 3 deletions

diff --git a/engines/sword25/util/lua/llex.cpp b/engines/sword25/util/lua/llex.cpp
index fdde2b8e5f..4d73a6a600 100644
--- a/engines/sword25/util/lua/llex.cpp
+++ b/engines/sword25/util/lua/llex.cpp
@@ -6,7 +6,7 @@
 
 
 #include <ctype.h>
-#include <locale.h>
+#include <stdio.h>
 #include <string.h>
 
 #define llex_c
@@ -176,9 +176,23 @@ static void buffreplace (LexState *ls, char from, char to) {
 
 static void trydecpoint (LexState *ls, SemInfo *seminfo) {
   /* format error: try to update decimal point separator */
-  struct lconv *cv = localeconv();
+  // Normally we'd use localeconv() to get the decimal point separator, but
+  // annoyingly that is not available on some platforms, e.g. Android. Figure
+  // it out by formatting a known value and extract the separator from that
+  // instead. The result could be cached, but considering the game I doubt
+  // this will ever be a bottleneck. Note that the separator is assumed to fit
+  // in a char, but that was a limitation in the original code as well.
   char old = ls->decpoint;
-  ls->decpoint = (cv ? cv->decimal_point[0] : '.');
+  char buf[5];
+  int i;
+  sprintf(buf, "%.1f", 1.0);
+  ls->decpoint = '.';
+  for (i = 0; buf[i]; i++) {
+    if (!isspace(buf[i]) && !isdigit(buf[i])) {
+      ls->decpoint = buf[i];
+      break;
+    }
+  }
   buffreplace(ls, old, ls->decpoint);  /* try updated decimal separator */
   if (!luaO_str2d(luaZ_buffer(ls->buff), &seminfo->r)) {
     /* format error with correct decimal point: no more options */