diff --git a/EgtEngine.cpp b/EgtEngine.cpp index a3c3100..48f43cc 100644 --- a/EgtEngine.cpp +++ b/EgtEngine.cpp @@ -50,6 +50,7 @@ static char S_GEOMDB[] = "GeomDB" ; static char K_NFEFONTDIR[] = "NfeFontDir" ; static char K_DEFAULTFONT[] = "DefaultFont" ; static char S_SCENE[] = "Scene" ; +static char K_ENABLE[] = "Enable" ; static char K_MMUNITS[] = "MmUnits" ; static char S_IMPORT[] = "Import" ; static char K_BTLFLAG[] = "BtlFlag" ; @@ -119,8 +120,8 @@ wmain( int argc, wchar_t* argv[]) ExeSetLockId( sLockId) ; // Recupero livello e opzioni della chiave int nKeyLev ; unsigned int nKeyOptions ; - bool bKey = ExeGetKeyLevel( 9935, 2710, 1, nKeyLev) && - ExeGetKeyOptions( 9935, 2710, 1, nKeyOptions) ; + bool bKey = ExeGetKeyLevel( 9935, 2711, 1, nKeyLev) && + ExeGetKeyOptions( 9935, 2711, 1, nKeyOptions) ; // Recupero livello utente e livello di debug int nUserLev = min( GetPrivateProfileInt( S_GENERAL, K_USERLEVEL, 1, sFileIni.c_str()), nKeyLev) ; int nDebug = GetPrivateProfileInt( S_GENERAL, K_DEBUG, 0, sFileIni.c_str()) ; @@ -152,6 +153,9 @@ wmain( int argc, wchar_t* argv[]) // Imposto direttorio ausiliario per import/gestione BTL (sempre dopo impostazioni lua) string sBtlAuxDir = GetPrivateProfileStringUtf8( S_IMPORT, K_BTLAUXDIR, "", sFileIni.c_str()) ; ExeSetBtlAuxDir( sBtlAuxDir) ; + // Imposto abilitazione interfaccia (per dialoghi da script lua) + bool bEnableUi = ( GetPrivateProfileInt( S_SCENE, K_ENABLE, 0, sFileIni.c_str()) != 0) ; + ExeSetEnableUI( bEnableUi) ; // Imposto unità di misura di interfaccia (per generazione CN) bool bMM = ( GetPrivateProfileInt( S_SCENE, K_MMUNITS, 1, sFileIni.c_str()) != 0) ; ExeSetUiUnits( bMM) ; @@ -181,8 +185,6 @@ wmain( int argc, wchar_t* argv[]) return 2 ; } ExeInitTscExec() ; - // Disabilito utilizzo UI perchè non definita - ExeSetEnableUI( false) ; // Inizializzo gestore lavorazioni ExeInitMachMgr( sMachinesRoot, sToolMakersDir) ; // Eventuale inizializzazione gestore travi e pareti diff --git a/EgtEngine.rc b/EgtEngine.rc index 07385e0..a46aaba 100644 --- a/EgtEngine.rc +++ b/EgtEngine.rc @@ -56,7 +56,7 @@ VS_VERSION_INFO$(_DEB32) VERSIONINFO #else VS_VERSION_INFO VERSIONINFO #endif - FILEVERSION 2,7,10,1 + FILEVERSION 2,7,11,1 PRODUCTVERSION 2,7,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -74,7 +74,7 @@ BEGIN BEGIN VALUE "CompanyName", "Egalware s.r.l." VALUE "FileDescription", "EgtEngine Debug Version" - VALUE "FileVersion", "2.7j1" + VALUE "FileVersion", "2.7k1" VALUE "InternalName", "EgtEngine" VALUE "LegalCopyright", "Copyright (C) 2023-2025 by Egalware s.r.l." VALUE "OriginalFilename", "EgtEngineD32.exe" @@ -95,7 +95,7 @@ VS_VERSION_INFO$(NDEB32) VERSIONINFO #else VS_VERSION_INFO VERSIONINFO #endif - FILEVERSION 2,7,10,1 + FILEVERSION 2,7,11,1 PRODUCTVERSION 2,7,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -113,7 +113,7 @@ BEGIN BEGIN VALUE "CompanyName", "Egalware s.r.l." VALUE "FileDescription", "EgtEngine" - VALUE "FileVersion", "2.7j1" + VALUE "FileVersion", "2.7k1" VALUE "InternalName", "EgtEngine" VALUE "LegalCopyright", "Copyright (C) 2023-2025 by Egalware s.r.l." VALUE "OriginalFilename", "EgtEngineR32.exe" @@ -134,7 +134,7 @@ VS_VERSION_INFO$(_DEB64) VERSIONINFO #else VS_VERSION_INFO VERSIONINFO #endif - FILEVERSION 2,7,10,1 + FILEVERSION 2,7,11,1 PRODUCTVERSION 2,7,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -152,7 +152,7 @@ BEGIN BEGIN VALUE "CompanyName", "Egalware s.r.l." VALUE "FileDescription", "EgtEngine Debug Version" - VALUE "FileVersion", "2.7j1" + VALUE "FileVersion", "2.7k1" VALUE "InternalName", "EgtEngine" VALUE "LegalCopyright", "Copyright (C) 2023-2025 by Egalware s.r.l." VALUE "OriginalFilename", "EgtEngineD64.exe" @@ -173,7 +173,7 @@ VS_VERSION_INFO$(NDEB64) VERSIONINFO #else VS_VERSION_INFO VERSIONINFO #endif - FILEVERSION 2,7,10,1 + FILEVERSION 2,7,11,1 PRODUCTVERSION 2,7,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG @@ -191,7 +191,7 @@ BEGIN BEGIN VALUE "CompanyName", "Egalware s.r.l." VALUE "FileDescription", "EgtEngine" - VALUE "FileVersion", "2.7j1" + VALUE "FileVersion", "2.7k1" VALUE "InternalName", "EgtEngine" VALUE "LegalCopyright", "Copyright (C) 2023-2025 by Egalware s.r.l." VALUE "OriginalFilename", "EgtEngineR64.exe" diff --git a/EgtEngine.vcxproj b/EgtEngine.vcxproj index 0dbcf48..5d990e1 100644 --- a/EgtEngine.vcxproj +++ b/EgtEngine.vcxproj @@ -114,7 +114,7 @@ 4996 - stdcpp17 + stdcpp20 Console @@ -144,7 +144,7 @@ - stdcpp17 + stdcpp20 Console @@ -182,7 +182,7 @@ StreamingSIMDExtensions2 true false - stdcpp17 + stdcpp20 CompileAsCpp @@ -225,7 +225,7 @@ true - stdcpp17 + stdcpp20 true true