From 928a5d18fc61986309ddbc91a866d11350c5d5d2 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 14 Jul 2015 15:44:46 +0000 Subject: [PATCH] EgtGeneral 1.6g3 : - LuaMgr con gestione chiamata funzioni e varie migliorie. --- EgtGeneral.rc | Bin 11630 -> 11630 bytes LuaManager.cpp | 12 +++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/EgtGeneral.rc b/EgtGeneral.rc index 295fa604fd938ab142c58a2ca33e9e521963ce5e..558fbf892ce7604745589d0d7a5499997cb6ee8d 100644 GIT binary patch delta 126 zcmaDC^)70|H#Syt1|0_D&FjTZGfjRctTQ=4kYn;MP8sHOpdh1AI^*UBZYO5AB6DV_ Y#7Y)Su}sFzLDCKg#kfqAQ4Zn)08||#8UO$Q delta 126 zcmaDC^)70|H#Sx?1|0^Y&FjTZGfjRctTQ=4kYn;MP8sGjpdh1AI^*UBZYO5AB6DV_ Y#7Y)Su}sFzLDCKg#kfqAQ4Zn)08kwx3IG5A diff --git a/LuaManager.cpp b/LuaManager.cpp index 13ce280..7cf4df9 100644 --- a/LuaManager.cpp +++ b/LuaManager.cpp @@ -15,7 +15,6 @@ #include "stdafx.h" #include "DllMain.h" #include "/EgtDev/Include/EGnLuaMgr.h" -#include "/EgtDev/Include/EGnLuaAux.h" #include "/EgtDev/Include/EgtILogger.h" #include "/EgtDev/Extern/Lua/Include/lua.hpp" @@ -136,7 +135,7 @@ LuaMgr::RegisterFunction( const string& sFunName, PFLUA pFun) //---------------------------------------------------------------------------- bool -LuaMgr::EvalNumExpr( const string& sExpr, double& dVal) +LuaMgr::EvalExpr( const string& sExpr, double& dVal) { // completo la stringa da valutare string sEval = "return " + sExpr ; @@ -163,7 +162,7 @@ LuaMgr::EvalNumExpr( const string& sExpr, double& dVal) //---------------------------------------------------------------------------- bool -LuaMgr::EvalStringExpr( const string& sExpr, string& sVal) +LuaMgr::EvalExpr( const string& sExpr, string& sVal) { // completo la stringa da valutare string sEval = "return " + sExpr ; @@ -233,3 +232,10 @@ LuaMgr::ExecFile( const string& sFile) return false ; } } + +//---------------------------------------------------------------------------- +void +LuaMgr::LogError( const string& sErr) +{ + LOG_ERROR( GetEGnLogger(), sErr.c_str()) +} \ No newline at end of file