(svn r18862) -Fix [FS#3544]: don't pass AI strings through iconv

1 files changed, 7 insertions, 7 deletions

diff --git a/src/ai/ai_scanner.cpp b/src/ai/ai_scanner.cpp
index dc3dd0d1b..6ae8c2e77 100644
--- a/src/ai/ai_scanner.cpp
+++ b/src/ai/ai_scanner.cpp
@@ -99,7 +99,7 @@ bool AIScanner::ImportLibrary(const char *library, const char *class_name, int v
 		} else {
 			snprintf(error, sizeof(error), "couldn't find library '%s' version %d. The latest version available is %d", library, version, (*iter).second->GetVersion());
 		}
-		sq_throwerror(vm, OTTD2FS(error));
+		sq_throwerror(vm, OTTD2SQ(error));
 		return false;
 	}
 
@@ -116,13 +116,13 @@ bool AIScanner::ImportLibrary(const char *library, const char *class_name, int v
 
 		/* Load the library in a 'fake' namespace, so we can link it to the name the user requested */
 		sq_pushroottable(vm);
-		sq_pushstring(vm, OTTD2FS(fake_class), -1);
+		sq_pushstring(vm, OTTD2SQ(fake_class), -1);
 		sq_newclass(vm, SQFalse);
 		/* Load the library */
 		if (!Squirrel::LoadScript(vm, (*iter).second->GetMainScript(), false)) {
 			char error[1024];
 			snprintf(error, sizeof(error), "there was a compile error when importing '%s' version %d", library, version);
-			sq_throwerror(vm, OTTD2FS(error));
+			sq_throwerror(vm, OTTD2SQ(error));
 			return false;
 		}
 		/* Create the fake class */
@@ -134,16 +134,16 @@ bool AIScanner::ImportLibrary(const char *library, const char *class_name, int v
 
 	/* Find the real class inside the fake class (like 'sets.Vector') */
 	sq_pushroottable(vm);
-	sq_pushstring(vm, OTTD2FS(fake_class), -1);
+	sq_pushstring(vm, OTTD2SQ(fake_class), -1);
 	if (SQ_FAILED(sq_get(vm, -2))) {
 		sq_throwerror(vm, _SC("internal error assigning library class"));
 		return false;
 	}
-	sq_pushstring(vm, OTTD2FS((*iter).second->GetInstanceName()), -1);
+	sq_pushstring(vm, OTTD2SQ((*iter).second->GetInstanceName()), -1);
 	if (SQ_FAILED(sq_get(vm, -2))) {
 		char error[1024];
 		snprintf(error, sizeof(error), "unable to find class '%s' in the library '%s' version %d", (*iter).second->GetInstanceName(), library, version);
-		sq_throwerror(vm, OTTD2FS(error));
+		sq_throwerror(vm, OTTD2SQ(error));
 		return false;
 	}
 	HSQOBJECT obj;
@@ -157,7 +157,7 @@ bool AIScanner::ImportLibrary(const char *library, const char *class_name, int v
 
 	/* Now link the name the user wanted to our 'fake' class */
 	sq_pushobject(vm, parent);
-	sq_pushstring(vm, OTTD2FS(class_name), -1);
+	sq_pushstring(vm, OTTD2SQ(class_name), -1);
 	sq_pushobject(vm, obj);
 	sq_newclass(vm, SQTrue);
 	sq_newslot(vm, -3, SQFalse);