Changeset - r21637:c861d9b309f9
[Not reviewed]
master
0 3 0
rubidium - 10 years ago 2014-09-06 17:20:45
rubidium@openttd.org
(svn r26769) -Codechange [Squirrel]: remove the difference between some platforms having wchar for SQChar and others just char; always use char (and UTF-8) like in the rest of (internal) OpenTTD
3 files changed with 7 insertions and 7 deletions:
0 comments (0 inline, 0 general)
src/3rdparty/squirrel/include/squirrel.h
Show inline comments
 
@@ -89,9 +89,9 @@ struct SQClass;
 
struct SQInstance;
 
struct SQDelegable;
 

	
 
#ifdef _UNICODE
 
#define SQUNICODE
 
#endif
 
//#ifdef _UNICODE
 
//#define SQUNICODE
 
//#endif
 

	
 
#ifdef SQUNICODE
 
#if (defined(_MSC_VER) && _MSC_VER >= 1400) // 1400 = VS8
src/script/squirrel.cpp
Show inline comments
 
@@ -31,7 +31,7 @@ void Squirrel::CompileError(HSQUIRRELVM 
 
{
 
	SQChar buf[1024];
 

	
 
	scsnprintf(buf, lengthof(buf), _SC("Error %s:") SQ_PRINTF64 _SC("/") SQ_PRINTF64 _SC(": %s"), source, line, column, desc);
 
	seprintf(buf, lastof(buf), "Error %s:" SQ_PRINTF64 "/" SQ_PRINTF64 ": %s", source, line, column, desc);
 

	
 
	/* Check if we have a custom print function */
 
	Squirrel *engine = (Squirrel *)sq_getforeignptr(vm);
 
@@ -70,7 +70,7 @@ void Squirrel::RunError(HSQUIRRELVM vm, 
 

	
 
	/* Check if we have a custom print function */
 
	SQChar buf[1024];
 
	scsnprintf(buf, lengthof(buf), _SC("Your script made an error: %s\n"), error);
 
	seprintf(buf, lastof(buf), "Your script made an error: %s\n", error);
 
	Squirrel *engine = (Squirrel *)sq_getforeignptr(vm);
 
	SQPrintFunc *func = engine->print_func;
 
	if (func == NULL) {
src/stdafx.h
Show inline comments
 
@@ -301,8 +301,8 @@
 

	
 
		const char *FS2OTTD(const TCHAR *name);
 
		const TCHAR *OTTD2FS(const char *name, bool console_cp = false);
 
		#define SQ2OTTD(name) FS2OTTD(name)
 
		#define OTTD2SQ(name) OTTD2FS(name)
 
		#define SQ2OTTD(name) (name)
 
		#define OTTD2SQ(name) (name)
 
	#else
 
		#define fopen(file, mode) fopen(OTTD2FS(file), mode)
 
		const char *FS2OTTD(const char *name);
0 comments (0 inline, 0 general)