mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #7966: SQInteger is 64-bit, print it as 64-bit

pull/7968/head
glx 2020-02-01 01:31:23 +01:00 committed by Charles Pigott
parent be9ca4689e
commit 196157b29e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp vendored
View File

@ -38,7 +38,7 @@ void sqstd_printcallstack(HSQUIRRELVM v)
src = si.source; src = si.source;
} }
} }
pf(v,"*FUNCTION [%s()] %s line [%d]\n",fn,src,si.line); pf(v,"*FUNCTION [%s()] %s line [" OTTD_PRINTF64 "]\n",fn,src,si.line);
level++; level++;
} }
level=0; level=0;
@ -56,7 +56,7 @@ void sqstd_printcallstack(HSQUIRRELVM v)
break; break;
case OT_INTEGER: case OT_INTEGER:
sq_getinteger(v,-1,&i); sq_getinteger(v,-1,&i);
pf(v,"[%s] %d\n",name,i); pf(v,"[%s] " OTTD_PRINTF64 "\n",name,i);
break; break;
case OT_FLOAT: case OT_FLOAT:
sq_getfloat(v,-1,&f); sq_getfloat(v,-1,&f);
@ -134,7 +134,7 @@ void _sqstd_compiler_error(HSQUIRRELVM v,const SQChar *sErr,const SQChar *sSourc
{ {
SQPRINTFUNCTION pf = sq_getprintfunc(v); SQPRINTFUNCTION pf = sq_getprintfunc(v);
if(pf) { if(pf) {
pf(v,"%s line = (%d) column = (%d) : error %s\n",sSource,line,column,sErr); pf(v,"%s line = (" OTTD_PRINTF64 ") column = (" OTTD_PRINTF64 ") : error %s\n",sSource,line,column,sErr);
} }
} }

2
src/3rdparty/squirrel/squirrel/sqbaselib.cpp vendored
View File

@ -219,7 +219,7 @@ static SQInteger base_array(HSQUIRRELVM v)
SQInteger nInitialSize = tointeger(stack_get(v,2)); SQInteger nInitialSize = tointeger(stack_get(v,2));
SQInteger ret = 1; SQInteger ret = 1;
if (nInitialSize < 0) { if (nInitialSize < 0) {
v->Raise_Error("can't create/resize array with/to size %d", nInitialSize); v->Raise_Error("can't create/resize array with/to size " OTTD_PRINTF64, nInitialSize);
nInitialSize = 0; nInitialSize = 0;
ret = -1; ret = -1;
} }

2
src/3rdparty/squirrel/squirrel/sqdebug.cpp vendored
View File

@ -122,5 +122,5 @@ void SQVM::Raise_ParamTypeError(SQInteger nparam,SQInteger typemask,SQInteger ty
StringCat(exptypes,SQString::Create(_ss(this), IdType2Name((SQObjectType)mask), -1), exptypes); StringCat(exptypes,SQString::Create(_ss(this), IdType2Name((SQObjectType)mask), -1), exptypes);
} }
} }
Raise_Error("parameter %d has an invalid type '%s' ; expected: '%s'", nparam, IdType2Name((SQObjectType)type), _stringval(exptypes)); Raise_Error("parameter " OTTD_PRINTF64 " has an invalid type '%s' ; expected: '%s'", nparam, IdType2Name((SQObjectType)type), _stringval(exptypes));
} }