From 1e39771e5fdcfdd3128692d9f5036fdea7a6cff8 Mon Sep 17 00:00:00 2001 From: false_genesis Date: Sun, 9 Mar 2008 20:26:42 +0000 Subject: [PATCH] * more toNumber to toUint64 conversions, fixed ?{equal,X,ignore Y} - thx bLuma! --- src/Client/DefScript/DefScriptFunctions.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Client/DefScript/DefScriptFunctions.cpp b/src/Client/DefScript/DefScriptFunctions.cpp index 9776022..f081a11 100644 --- a/src/Client/DefScript/DefScriptFunctions.cpp +++ b/src/Client/DefScript/DefScriptFunctions.cpp @@ -307,8 +307,8 @@ DefReturnResult DefScriptPackage::func_bitor(CmdSet& Set) } std::string vname=_NormalizeVarName(Set.arg[0], Set.myname); - uint64 a=(uint64)toNumber(variables.Get(vname)); - uint64 b=(uint64)toNumber(Set.defaultarg); + uint64 a=toUint64(variables.Get(vname)); + uint64 b=toUint64(Set.defaultarg); a|=b; variables.Set(vname,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); - uint64 a=(uint64)toNumber(variables.Get(vname)); - uint64 b=(uint64)toNumber(Set.defaultarg); + uint64 a=toUint64(variables.Get(vname)); + uint64 b=toUint64(Set.defaultarg); a&=b; variables.Set(vname,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); - uint64 a=(uint64)toNumber(variables.Get(vname)); - uint64 b=(uint64)toNumber(Set.defaultarg); + uint64 a=toUint64(variables.Get(vname)); + uint64 b=toUint64(Set.defaultarg); a^=b; variables.Set(vname,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=Set.defaultarg==Set.arg[0]; + else + { + result=Set.defaultarg==Set.arg[0]; + } // for debugging _DEFSC_DEBUG @@ -536,4 +539,4 @@ DefReturnResult DefScriptPackage::func_funcexists(CmdSet& Set) return true; } return false; -} \ No newline at end of file +}