mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-11 13:10:45 +00:00
(svn r18639) -Update: Squirrel from 2.2.3 to 2.2.4
-Revert (r17273): this fix is included in Squirrel 2.2.4
This commit is contained in:
parent
28c7c49855
commit
9574371e53
2
src/3rdparty/squirrel/COMPILE
vendored
2
src/3rdparty/squirrel/COMPILE
vendored
@ -1,4 +1,4 @@
|
|||||||
Squirrel 2.2.3 stable
|
Squirrel 2.2.4 stable
|
||||||
--------------------------------------------------------
|
--------------------------------------------------------
|
||||||
What is in this distribution?
|
What is in this distribution?
|
||||||
|
|
||||||
|
4
src/3rdparty/squirrel/HISTORY
vendored
4
src/3rdparty/squirrel/HISTORY
vendored
@ -1,3 +1,7 @@
|
|||||||
|
***version 2.2.4 stable***
|
||||||
|
-fixed bug in functions with default parameters
|
||||||
|
|
||||||
|
***2009-06-30 ***
|
||||||
***version 2.2.3 stable***
|
***version 2.2.3 stable***
|
||||||
-added sq_getfunctioninfo
|
-added sq_getfunctioninfo
|
||||||
-added compile time flag SQUSEDOUBLE to use double precision floats
|
-added compile time flag SQUSEDOUBLE to use double precision floats
|
||||||
|
2
src/3rdparty/squirrel/README
vendored
2
src/3rdparty/squirrel/README
vendored
@ -1,4 +1,4 @@
|
|||||||
The programming language SQUIRREL 2.2.3 stable
|
The programming language SQUIRREL 2.2.4 stable
|
||||||
|
|
||||||
--------------------------------------------------
|
--------------------------------------------------
|
||||||
The project has been compiled and run on Windows(Windows XP/2000 on Intel x86 Windows XP Pro on AMD x64) and
|
The project has been compiled and run on Windows(Windows XP/2000 on Intel x86 Windows XP Pro on AMD x64) and
|
||||||
|
4
src/3rdparty/squirrel/doc/sqstdlib2.pdf
vendored
4
src/3rdparty/squirrel/doc/sqstdlib2.pdf
vendored
@ -8,7 +8,7 @@ endobj
|
|||||||
<< /Length 246 /Filter [ /ASCII85Decode /FlateDecode ]
|
<< /Length 246 /Filter [ /ASCII85Decode /FlateDecode ]
|
||||||
>>
|
>>
|
||||||
stream
|
stream
|
||||||
Gaqd[\IQJ1&-UA:?a4/j=Osr[Jq*pMi=8^1`.4Za_?id24lM2b[+uF7AnR]0Q4ej;k9Tg),:)c*7W;lXW&kJok9tubis9_(_4P/*D/T*8;Q*)>(=mXhjT`"b>?n0P<Pro!b>b;#0GGp)YQMZ:%Nr.,]Ee)267S5JJPh(qWc.2JUaBD$]k#7;O+_Nj2/Q4AiQp[&KcBNMUK-,KPb[[BBjHJC?@,=d"kc#.j8KbXf_i75B.qFL8(7~>
|
Gaqd[\IQJ1&-UA:?a4/j=Osr[Jq*pMi=8^1`.4Za_?id24lM2b[+uF7AnR]0Q4ej;k9Tg),:)c*7W;lXW&kJok9tubis9_(_4P/*D/T*8;Q*)>(=mXhjT`"b>?n0P<Pro!b>b;#0GGp)YQMZ:%Nr.,]Ee)267S5JJPh(qWc.2JUaBD$]k#7;O+_6b2/Q4AiQp[&KcBNMUK-,KPb[[BBjHJC?@,=d"kc#.j8KbXf_i75B.qGe8(@~>
|
||||||
endstream
|
endstream
|
||||||
endobj
|
endobj
|
||||||
6 0 obj
|
6 0 obj
|
||||||
@ -23,7 +23,7 @@ endobj
|
|||||||
<< /Length 1048 /Filter [ /ASCII85Decode /FlateDecode ]
|
<< /Length 1048 /Filter [ /ASCII85Decode /FlateDecode ]
|
||||||
>>
|
>>
|
||||||
stream
|
stream
|
||||||
Gasao966RV&AJ$CE(_tHW'$"nl)EoW-Cl43$+I>J!Q(cIL^7FUIpZW@C?=A3PF7AQ=m^\8qW.Nip#]36"WOi=Z>/KJqc2SMl7_XYcptg:pcB1EJX87NpZol_JI4]qNHZ<g#tfEr^q5&[\1Os6*T\*+$S4b;(S^EE;&kDU.<!Ol:ul;9M/u.(]UrO(=b2RG@)AbU\j3`=N7,WEIE-@P,bP"Qe&UbbUnL4O)"!<XZcft?^&4IGUS.Kfg?Uu?33Z<EqpDPBQWhr>"&?p]Mnle.MPES[cKaYGb!&6k'!()=-').>W,jOO_%3mu-.H5Zrg*7ZCT'<m=n=pG'lHMiP2DfQ^#PUj-ZINhl:+\("E*=WT^ne1;TkUR#LZ3\(Lp:-[?E-_'Pu`YarLRa@g<U@H<dPKEjIaK]#;k\nk?t`Pg"QlHd^[2@R5@pm]E2r]WmVk5mp$j"C=AE$=(l97a"ml!D6uU?\rH05As:8:=lm(IGRa?d;@;=4dZ#HZKEfBraqgl%lNtck>5qf<W@BQ68s^\pLF`[[07LA;_bC(Ggd4$:s=HV:<cjkV95lH6g'eV@?LU%<*m'Z84i[d9o^D3b_;=6k(<g(U(Xo%&2p[Wa+jL..=_S,IqJm6c58c,"/?W+74V-4hCTr[[O@T,"a[p1r_O:pXM>QJd2'fg4jP.uP/AOm9f)Fi8hC97%aAZ?aM\KtR]<jj_oRU73@brD%>9Gs"XcgV-%V@81=bFEAcul?:gNR,7N3+TWTHC;@TY<?%P==RHW1DY%YY%\JY?NBeFFh/jh<InpX5Hc/]O>]Pe7j1];NWPl6@B-o4]oa0%;'OU3=_aJ2%mKF?i!d=n?#rD`fJ8GplF9bD@Bon"3cP(p2tR-ibOaeq:3u`4Uc\WI\d:#Y_LJK$H(rcCq2-d[-:e3-iAcmY!6Kabd@=:<2^7/sU5XW;GI'+)bX^7M2S:<hK&C_U:>eHps3M2#I?[e,4&<4`?tiTG`&_m]>DK9q85sF']rpe[,60WII=9k:?6aVmER%Jp>i2gZgsa2r&:IFNNq]6B.Jh~>
|
Gasao966RV&AJ$CE(_tHW'$"nl)EoW-Cl43$+I>J!Q(cIL^7FUIpZW@C?=A3PF7AQ=m^\8qW.Nip#]36"WOi=Z>/KJqc2SMl7_XYcptg:pcB1EJX87NpZol_JI4]qNHZ<g#tfEr^q5&[\1Os6*T\*+$S4b;(S^EE;&kDU.<!Old)OK*''G5/GX&n.ZN;(m_1YI4Fb+GZ(o<&iqMsZ*83Zj+ViTFO84/<(0\RI9B:!f]Hhfhn7R?dV[+Be\EF>WipS1sc0=@h[#FpnE(4gB;'M""?S^l0mQ$nOa,Z`%Y8fk5[;!2#(JfeYt8uTA=r@RE?ekgRdZK?dm.bp%\,elE,HH/#^:>i!Ze;^9.$/EZ8601HAV3X2/%]#@B0#jP8CF<7I.+lB;Prf2M`XX1^ose*uj^rLuFbuUBjdCpK.%0sapS>:C`Idfjh-3;oG[i%`Jej(^#eYai'Y'YPNL$hc!gLu4^(Si?IbpSOS??X/qRiF]U>)IYH7nknA^=Sdr67Ja+):!QcCrgVWrD[+Kl.GBn&ZK@CC<%bVIE_/n>7A'TU5a5SXQ_`99iYpL<_I6_B].)W4[(>OHT;RRN+aEQjYDJbm+R/73ub)+`(D9NXbe;;?.*7rltdKS2#J7#"C25MH66F]j!rACf*#6$hSmBr1PNj=FhusU+MHWH_*<t-&5&eRV(c[Q!+ZN*1G8]OGOjr1f\J]LQN+NE`Okf)[Hhp$Vl_69*-\PA?*\hbm;h]Tt918N&E62;U'VT`NW`^**PT.p8Ah<*"!!A"%0ucWT?W>b'dcen"hgQ>)YPD.![O@G>F-*eOMf:k0mcL>c:((7.$:K!Fmh!k^[tQZf])ohKVpNo2(tRQ4lUgh`nN+0Nud-;#j/LXTr:tM0TEB;ZkLS&X[%t"J'$nS3p.8V(XKUE:S\Pg^.<tP7qSYSW;CN>UnD:;"q_-52O;FN$;*SX?PqdKr&YUpkg=#C%q^@Vto(XHJUj[5r8/Igf_UuRQ+;okI`ujX(VB@;ZDPPcWBIM:1mq)"S&MB\(,nMDReMqk`XaD9V\*4~>
|
||||||
endstream
|
endstream
|
||||||
endobj
|
endobj
|
||||||
8 0 obj
|
8 0 obj
|
||||||
|
1442
src/3rdparty/squirrel/doc/squirrel2.pdf
vendored
1442
src/3rdparty/squirrel/doc/squirrel2.pdf
vendored
File diff suppressed because it is too large
Load Diff
2
src/3rdparty/squirrel/include/squirrel.h
vendored
2
src/3rdparty/squirrel/include/squirrel.h
vendored
@ -176,7 +176,7 @@ typedef char SQChar;
|
|||||||
#define MAX_CHAR 0xFF
|
#define MAX_CHAR 0xFF
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define SQUIRREL_VERSION _SC("Squirrel 2.2.3 stable - With custom OpenTTD modifications")
|
#define SQUIRREL_VERSION _SC("Squirrel 2.2.4 stable - With custom OpenTTD modifications")
|
||||||
#define SQUIRREL_COPYRIGHT _SC("Copyright (C) 2003-2009 Alberto Demichelis")
|
#define SQUIRREL_COPYRIGHT _SC("Copyright (C) 2003-2009 Alberto Demichelis")
|
||||||
#define SQUIRREL_AUTHOR _SC("Alberto Demichelis")
|
#define SQUIRREL_AUTHOR _SC("Alberto Demichelis")
|
||||||
|
|
||||||
|
8
src/3rdparty/squirrel/squirrel/sqvm.cpp
vendored
8
src/3rdparty/squirrel/squirrel/sqvm.cpp
vendored
@ -334,12 +334,8 @@ bool SQVM::StartCall(SQClosure *closure,SQInteger target,SQInteger args,SQIntege
|
|||||||
SQInteger nargs = args;
|
SQInteger nargs = args;
|
||||||
if (paramssize != nargs) {
|
if (paramssize != nargs) {
|
||||||
SQInteger ndef = func->_ndefaultparams;
|
SQInteger ndef = func->_ndefaultparams;
|
||||||
if(ndef && nargs < paramssize) {
|
SQInteger diff;
|
||||||
SQInteger diff = paramssize - nargs;
|
if(ndef && nargs < paramssize && (diff = paramssize - nargs) <= ndef) {
|
||||||
if (diff > ndef) {
|
|
||||||
Raise_Error(_SC("wrong number of parameters"));
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
for(SQInteger n = ndef - diff; n < ndef; n++) {
|
for(SQInteger n = ndef - diff; n < ndef; n++) {
|
||||||
_stack._vals[stackbase + (nargs++)] = closure->_defaultparams[n];
|
_stack._vals[stackbase + (nargs++)] = closure->_defaultparams[n];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user