mojotrollz/mojo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* more toNumber to toUint64 conversions, fixed ?{equal,X,ignore Y} - thx bLuma!

Browse Source
This commit is contained in:
false_genesis 2008-03-09 20:26:42 +00:00
parent 406f365ff7
commit 1e39771e5f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Client/DefScript/DefScriptFunctions.cpp
View File

@ -307,8 +307,8 @@ DefReturnResult DefScriptPackage::func_bitor(CmdSet& Set)
} }
std::string vname=_NormalizeVarName(Set.arg[0], Set.myname); std::string vname=_NormalizeVarName(Set.arg[0], Set.myname);
uint64 a=(uint64)toNumber(variables.Get(vname)); uint64 a=toUint64(variables.Get(vname));
uint64 b=(uint64)toNumber(Set.defaultarg); uint64 b=toUint64(Set.defaultarg);
a|=b; a|=b;
variables.Set(vname,toString(a)); variables.Set(vname,toString(a));
r.ret=toString(a); r.ret=toString(a);
@ -324,8 +324,8 @@ DefReturnResult DefScriptPackage::func_bitand(CmdSet& Set)
} }
std::string vname=_NormalizeVarName(Set.arg[0], Set.myname); std::string vname=_NormalizeVarName(Set.arg[0], Set.myname);
uint64 a=(uint64)toNumber(variables.Get(vname)); uint64 a=toUint64(variables.Get(vname));
uint64 b=(uint64)toNumber(Set.defaultarg); uint64 b=toUint64(Set.defaultarg);
a&=b; a&=b;
variables.Set(vname,toString(a)); variables.Set(vname,toString(a));
r.ret=toString(a); r.ret=toString(a);
@ -341,8 +341,8 @@ DefReturnResult DefScriptPackage::func_bitxor(CmdSet& Set)
} }
std::string vname=_NormalizeVarName(Set.arg[0], Set.myname); std::string vname=_NormalizeVarName(Set.arg[0], Set.myname);
uint64 a=(uint64)toNumber(variables.Get(vname)); uint64 a=toUint64(variables.Get(vname));
uint64 b=(uint64)toNumber(Set.defaultarg); uint64 b=toUint64(Set.defaultarg);
a^=b; a^=b;
variables.Set(vname,toString(a)); variables.Set(vname,toString(a));
r.ret=toString(a); r.ret=toString(a);
@ -375,7 +375,10 @@ DefReturnResult DefScriptPackage::func_equal(CmdSet& Set)
{ {
result=stringToLower(Set.defaultarg)==stringToLower(Set.arg[0]); result=stringToLower(Set.defaultarg)==stringToLower(Set.arg[0]);
} }
result=Set.defaultarg==Set.arg[0]; else
{
result=Set.defaultarg==Set.arg[0];
}
// for debugging // for debugging
_DEFSC_DEBUG _DEFSC_DEBUG