From f2fa332cc15b731c80eb602b1c10da43857ce676 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 11 Oct 2025 10:03:53 +0200 Subject: [PATCH] EgtExecutor 2.7j2 : - modifiche per nuova gestione assemblaggi da BTL. --- EXE_BeamMgr.cpp | 8 ++++---- LUA_BeamMgr.cpp | 14 +++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/EXE_BeamMgr.cpp b/EXE_BeamMgr.cpp index f5e661c..fa69a4a 100644 --- a/EXE_BeamMgr.cpp +++ b/EXE_BeamMgr.cpp @@ -266,17 +266,17 @@ ExeBeamShowSolid( int nPartId, bool bShow) //----------------------------------------------------------------------------- bool -ExeBeamGetBuildingIsOn( void) +ExeBeamGetBuildingIsOn( int nAssGrpId) { IBeamMgr* pBeamMgr = GetCurrBeamMgr() ; VERIFY_BEAMMGR( pBeamMgr, false) // verifico se assemblaggio attivato - return pBeamMgr->GetBuildingIsOn() ; + return pBeamMgr->GetBuildingIsOn( nAssGrpId) ; } //----------------------------------------------------------------------------- bool -ExeBeamShowBuilding( bool bShow) +ExeBeamShowBuilding( int nAssGrpId, bool bShow) { IBeamMgr* pBeamMgr = GetCurrBeamMgr() ; VERIFY_BEAMMGR( pBeamMgr, false) @@ -285,7 +285,7 @@ ExeBeamShowBuilding( bool bShow) if ( bOldEnabModif) ExeDisableModified() ; // attivo o disattivo la visualizzazione l'assemblaggio - bool bOk = pBeamMgr->ShowBuilding( bShow) ; + bool bOk = pBeamMgr->ShowBuilding( nAssGrpId, bShow) ; // ripristino possibilità di alterare il flag di modifica if ( bOldEnabModif) ExeEnableModified() ; diff --git a/LUA_BeamMgr.cpp b/LUA_BeamMgr.cpp index 7ff6df6..a5888ce 100644 --- a/LUA_BeamMgr.cpp +++ b/LUA_BeamMgr.cpp @@ -347,10 +347,12 @@ LuaBeamShowSolid( lua_State* L) static int LuaBeamGetBuildingIsOn( lua_State* L) { - // Nessun parametro + // 1 o nessun parametro : [nAssGrpId] + int nAssGrpId = GDB_ID_NULL ; + LuaGetParam( L, 1, nAssGrpId) ; LuaClearStack( L) ; // restituisco identificativo del solido della trave - bool bOk = ExeBeamGetBuildingIsOn() ; + bool bOk = ExeBeamGetBuildingIsOn( nAssGrpId) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ; @@ -360,12 +362,14 @@ LuaBeamGetBuildingIsOn( lua_State* L) static int LuaBeamShowBuilding( lua_State* L) { - // 1 parametro : bShow + // 1 o 2 parametri : [nAssGrpId,] bShow + int nAssGrpId = GDB_ID_NULL ; + int nPar = ( LuaGetParam( L, 1, nAssGrpId) ? 2 : 1) ; bool bShow ; - LuaCheckParam( L, 1, bShow) + LuaCheckParam( L, nPar, bShow) LuaClearStack( L) ; // attivo o disattivo la visualizzazione l'assemblaggio - bool bOk = ExeBeamShowBuilding( bShow) ; + bool bOk = ExeBeamShowBuilding( nAssGrpId, bShow) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ;