mirror of https://github.com/OpenTTD/OpenTTD.git
(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
This commit is contained in:
parent
e76e6efd17
commit
7a00d2e849
|
@ -89,9 +89,9 @@ struct SQClass;
|
||||||
struct SQInstance;
|
struct SQInstance;
|
||||||
struct SQDelegable;
|
struct SQDelegable;
|
||||||
|
|
||||||
#ifdef _UNICODE
|
//#ifdef _UNICODE
|
||||||
#define SQUNICODE
|
//#define SQUNICODE
|
||||||
#endif
|
//#endif
|
||||||
|
|
||||||
#ifdef SQUNICODE
|
#ifdef SQUNICODE
|
||||||
#if (defined(_MSC_VER) && _MSC_VER >= 1400) // 1400 = VS8
|
#if (defined(_MSC_VER) && _MSC_VER >= 1400) // 1400 = VS8
|
||||||
|
|
|
@ -31,7 +31,7 @@ void Squirrel::CompileError(HSQUIRRELVM vm, const SQChar *desc, const SQChar *so
|
||||||
{
|
{
|
||||||
SQChar buf[1024];
|
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 */
|
/* Check if we have a custom print function */
|
||||||
Squirrel *engine = (Squirrel *)sq_getforeignptr(vm);
|
Squirrel *engine = (Squirrel *)sq_getforeignptr(vm);
|
||||||
|
@ -70,7 +70,7 @@ void Squirrel::RunError(HSQUIRRELVM vm, const SQChar *error)
|
||||||
|
|
||||||
/* Check if we have a custom print function */
|
/* Check if we have a custom print function */
|
||||||
SQChar buf[1024];
|
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);
|
Squirrel *engine = (Squirrel *)sq_getforeignptr(vm);
|
||||||
SQPrintFunc *func = engine->print_func;
|
SQPrintFunc *func = engine->print_func;
|
||||||
if (func == NULL) {
|
if (func == NULL) {
|
||||||
|
|
|
@ -301,8 +301,8 @@
|
||||||
|
|
||||||
const char *FS2OTTD(const TCHAR *name);
|
const char *FS2OTTD(const TCHAR *name);
|
||||||
const TCHAR *OTTD2FS(const char *name, bool console_cp = false);
|
const TCHAR *OTTD2FS(const char *name, bool console_cp = false);
|
||||||
#define SQ2OTTD(name) FS2OTTD(name)
|
#define SQ2OTTD(name) (name)
|
||||||
#define OTTD2SQ(name) OTTD2FS(name)
|
#define OTTD2SQ(name) (name)
|
||||||
#else
|
#else
|
||||||
#define fopen(file, mode) fopen(OTTD2FS(file), mode)
|
#define fopen(file, mode) fopen(OTTD2FS(file), mode)
|
||||||
const char *FS2OTTD(const char *name);
|
const char *FS2OTTD(const char *name);
|
||||||
|
|
Loading…
Reference in New Issue