diff --git a/cs/3rd party/BugTrap.vcxproj b/cs/3rd party/BugTrap.vcxproj index e9ef84ee4..6a6f74fdd 100644 --- a/cs/3rd party/BugTrap.vcxproj +++ b/cs/3rd party/BugTrap.vcxproj @@ -31,39 +31,39 @@ BugTrap Win32Proj BugTrap - 8.1 + 10.0.19041.0 DynamicLibrary MultiByte - v140 + v142 DynamicLibrary MultiByte - v141 + v142 DynamicLibrary MultiByte - v140 + v142 DynamicLibrary MultiByte - v141 + v142 DynamicLibrary MultiByte - v140 + v142 true DynamicLibrary MultiByte - v140 + v142 true diff --git a/cs/3rd party/CxImage/cximage.vcxproj b/cs/3rd party/CxImage/cximage.vcxproj index 7f653d41b..0bcc7ecd3 100644 --- a/cs/3rd party/CxImage/cximage.vcxproj +++ b/cs/3rd party/CxImage/cximage.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Mixed + Win32 + Release Win32 @@ -14,12 +18,20 @@ CxImage {880CD250-BA77-4DAF-A8D4-552F12DD3AE4} MFCProj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 + false + MultiByte + false + false + + + DynamicLibrary + v142 false MultiByte false @@ -27,7 +39,7 @@ StaticLibrary - v140 + v142 false MultiByte false @@ -41,6 +53,11 @@ + + + + + @@ -50,6 +67,9 @@ false + + false + MaxSpeed @@ -122,6 +142,38 @@ Debug/cximage.bsc + + + Disabled + $(SolutionDir)3rd party;$(SolutionDir)engine;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;JAS_WIN_MSVC_BUILD;CXIMAGE_AS_SHARED_LIBRARY;_USRDLL;CXIMAGE_BUILD;%(PreprocessorDefinitions) + false + Sync + Default + MultiThreadedDLL + true + Fast + Level4 + true + ProgramDatabase + 4100;4611;4702;%(DisableSpecificWarnings) + NotUsing + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + $(OutDir)$(TargetName)$(TargetExt) + $(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) + $(OutDir)$(TargetName).pdb + true + + + true + Mixed/cximage.bsc + + diff --git a/cs/3rd party/LuaBind/luabind.beta7-devel.rc4.vcxproj b/cs/3rd party/LuaBind/luabind.beta7-devel.rc4.vcxproj index b38ae7167..3d34b1c3c 100644 --- a/cs/3rd party/LuaBind/luabind.beta7-devel.rc4.vcxproj +++ b/cs/3rd party/LuaBind/luabind.beta7-devel.rc4.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Mixed + Win32 + Release Win32 @@ -15,17 +19,22 @@ luabind Win32Proj LuaBind.beta7-Devel.RC4 - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 + MultiByte + + + DynamicLibrary + v142 MultiByte DynamicLibrary - v140 + v142 MultiByte true @@ -36,6 +45,10 @@ + + + + @@ -47,6 +60,9 @@ false + + false + MaxSpeed @@ -110,30 +126,64 @@ MachineX86 + + + Disabled + $(SolutionDir)sdk\include;$(SolutionDir)engine\include;%(AdditionalIncludeDirectories) + WIN32;DEBUG;LUABIND_BUILDING;_SECURE_SCL=0;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + false + true + Sync + EnableFastChecks + MultiThreadedDLL + true + Fast + Use + pch.h + Level4 + ProgramDatabase + 4100;%(DisableSpecificWarnings) + + + $(OutDir)$(TargetName)$(TargetExt) + $(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) + true + $(OutDir)$(TargetName).pdb + false + Windows + MachineX86 + + true + true true true + true true true + true true true + true true true + true true true + true true @@ -157,90 +207,112 @@ true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true true + true true + Create Create Create @@ -328,6 +400,7 @@ true + true true diff --git a/cs/3rd party/LuaJIT/lua.JIT.1.1.4.vcxproj b/cs/3rd party/LuaJIT/lua.JIT.1.1.4.vcxproj index 98c2a10f7..60b59a5f3 100644 --- a/cs/3rd party/LuaJIT/lua.JIT.1.1.4.vcxproj +++ b/cs/3rd party/LuaJIT/lua.JIT.1.1.4.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Mixed + Win32 + Release Win32 @@ -15,17 +19,22 @@ lua Win32Proj Lua.JIT.1.1.4 - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 + MultiByte + + + DynamicLibrary + v142 MultiByte DynamicLibrary - v140 + v142 MultiByte true @@ -36,6 +45,10 @@ + + + + @@ -47,6 +60,9 @@ false + + false + MaxSpeed @@ -105,6 +121,32 @@ MachineX86 + + + Disabled + $(SolutionDir)sdk\include;$(SolutionDir)engine\include;dynasm;%(AdditionalIncludeDirectories) + WIN32;DEBUG;%(PreprocessorDefinitions) + false + true + + EnableFastChecks + MultiThreadedDLL + true + Fast + + Level4 + ProgramDatabase + 4996;4127;4100;4055;%(DisableSpecificWarnings) + + + $(OutDir)$(TargetName)$(TargetExt) + true + $(OutDir)$(TargetName).pdb + false + Windows + MachineX86 + + @@ -208,10 +250,12 @@ true + true true true + true true @@ -219,6 +263,7 @@ true + true true diff --git a/cs/3rd party/NVTT/NVTT.vcxproj b/cs/3rd party/NVTT/NVTT.vcxproj index 9e080049c..0d3593cd7 100644 --- a/cs/3rd party/NVTT/NVTT.vcxproj +++ b/cs/3rd party/NVTT/NVTT.vcxproj @@ -29,40 +29,40 @@ {0EB257DC-5CFC-44B0-82C9-CE6B158BE473} nvtt - 8.1 + 10.0.19041.0 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary true MultiByte - v140 + v142 StaticLibrary true MultiByte - v140 + v142 diff --git a/cs/3rd party/ODE/contrib/ode_default.vcxproj b/cs/3rd party/ODE/contrib/ode_default.vcxproj index e1e186677..188dc5921 100644 --- a/cs/3rd party/ODE/contrib/ode_default.vcxproj +++ b/cs/3rd party/ODE/contrib/ode_default.vcxproj @@ -18,26 +18,26 @@ ODE {1BF75FEB-87DD-486C-880B-227987D191C2} AtlProj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 Static MultiByte false DynamicLibrary - v140 + v142 false MultiByte true DynamicLibrary - v140 + v142 Static MultiByte diff --git a/cs/3rd party/OpenAL/OpenAL-Windows/Router/Router.vcxproj b/cs/3rd party/OpenAL/OpenAL-Windows/Router/Router.vcxproj index f8e623f9a..c84f692b9 100644 --- a/cs/3rd party/OpenAL/OpenAL-Windows/Router/Router.vcxproj +++ b/cs/3rd party/OpenAL/OpenAL-Windows/Router/Router.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Mixed + Win32 + Release Win32 @@ -14,19 +18,25 @@ OpenAL32 {566551F4-4EF1-4CB4-A131-F982E7606907} openal32 - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 false MultiByte true DynamicLibrary - v140 + v142 + false + MultiByte + + + DynamicLibrary + v142 false MultiByte @@ -42,13 +52,62 @@ + + + + + false + + false + false + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + Debug/Router.tlb + + + + Disabled + WIN32;DEBUG;_WINDOWS;_USRDLL;ROUTER_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDLL + Fast + false + + + $(IntDir) + $(IntDir) + $(IntDir) + + Level3 + true + ProgramDatabase + CompileAsCpp + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + version.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + true + $(OutDir)$(TargetName).pdb + true + MachineX86 + + _DEBUG;%(PreprocessorDefinitions) @@ -141,6 +200,11 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS + EnableFastChecks + + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS EnableFastChecks @@ -152,6 +216,11 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS + EnableFastChecks + + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS EnableFastChecks @@ -163,6 +232,11 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS + EnableFastChecks + + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS EnableFastChecks @@ -174,6 +248,11 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS + EnableFastChecks + + Disabled WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ROUTER_EXPORTS EnableFastChecks diff --git a/cs/3rd party/crypto/crypto.vcxproj b/cs/3rd party/crypto/crypto.vcxproj index 99e3d0cf9..71674f074 100644 --- a/cs/3rd party/crypto/crypto.vcxproj +++ b/cs/3rd party/crypto/crypto.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Mixed + Win32 + Release Win32 @@ -13,18 +17,23 @@ {FA169092-EA3E-40C1-8E5A-A2B575700FE8} crypto - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 + MultiByte + + + DynamicLibrary + v142 MultiByte @@ -38,11 +47,17 @@ + + + + + + Disabled @@ -61,6 +76,24 @@ MachineX86 + + + Disabled + openssl;$(SolutionDir)sdk\include;$(SolutionDir)engine;$(SolutionDir)engine\include;%(AdditionalIncludeDirectories) + CRYPTO_BUILD;DEBUG;_CRT_SECURE_NO_WARNINGS;CRYPTO_AS_SHARED_LIBRARY;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDLL + Fast + Level4 + EditAndContinue + NotUsing + + + $(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) + true + MachineX86 + + openssl;$(SolutionDir)sdk\include;$(SolutionDir)engine;$(SolutionDir)engine\include;%(AdditionalIncludeDirectories) diff --git a/cs/3rd party/glew.vcxproj b/cs/3rd party/glew.vcxproj index 73efcc8ab..d1362a65d 100644 --- a/cs/3rd party/glew.vcxproj +++ b/cs/3rd party/glew.vcxproj @@ -9,6 +9,10 @@ Debug x64 + + Mixed + Win32 + Release Win32 @@ -22,32 +26,37 @@ {664E6F0D-6784-4760-9565-D54F8EB1EDF4} - 8.1 + 10.0.19041.0 StaticLibrary false MultiByte - v140 + v142 StaticLibrary false MultiByte - v141 + v142 + + + StaticLibrary + v142 + MultiByte StaticLibrary false MultiByte - v140 + v142 StaticLibrary false MultiByte - v141 + v142 @@ -58,6 +67,9 @@ + + + @@ -74,6 +86,9 @@ glew32 + + glew32 + glew32 @@ -154,6 +169,32 @@ MachineX86 + + + MultiThreadedDLL + Default + false + Disabled + true + Level3 + glew/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;WIN32_LEAN_AND_MEAN;GLEW_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + NotUsing + + + 0x0409 + _DEBUG;GLEW_STATIC;%(PreprocessorDefinitions) + + + true + + + true + $(OutDir)$(TargetName)$(TargetExt) + MachineX86 + + MultiThreadedDebugDLL diff --git a/cs/3rd party/jpeg.vcxproj b/cs/3rd party/jpeg.vcxproj index f1b7015e2..cafb24639 100644 --- a/cs/3rd party/jpeg.vcxproj +++ b/cs/3rd party/jpeg.vcxproj @@ -73,7 +73,7 @@ Win32Proj jpeg libjpeg - 8.1 + 10.0.19041.0 @@ -81,7 +81,7 @@ false true Unicode - v140 + v142 diff --git a/cs/3rd party/libogg_static.vcxproj b/cs/3rd party/libogg_static.vcxproj index 391fd3318..dc631d322 100644 --- a/cs/3rd party/libogg_static.vcxproj +++ b/cs/3rd party/libogg_static.vcxproj @@ -30,40 +30,40 @@ {15CBFEFF-7965-41F5-B4E2-21E8795C9159} libogg Win32Proj - 8.1 + 10.0.19041.0 StaticLibrary MultiByte true - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte true - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 diff --git a/cs/3rd party/libtheora_static.vcxproj b/cs/3rd party/libtheora_static.vcxproj index e963f562d..ce888a6c5 100644 --- a/cs/3rd party/libtheora_static.vcxproj +++ b/cs/3rd party/libtheora_static.vcxproj @@ -30,40 +30,40 @@ {653F3841-3F26-49B9-AFCF-091DB4B67031} libtheora Win32Proj - 8.1 + 10.0.19041.0 StaticLibrary MultiByte true - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte true - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 diff --git a/cs/3rd party/libvorbis_static.vcxproj b/cs/3rd party/libvorbis_static.vcxproj index 0acbe7aef..f9777c201 100644 --- a/cs/3rd party/libvorbis_static.vcxproj +++ b/cs/3rd party/libvorbis_static.vcxproj @@ -30,40 +30,40 @@ {3A214E06-B95E-4D61-A291-1F8DF2EC10FD} libvorbis Win32Proj - 8.1 + 10.0.19041.0 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte true - v140 + v142 StaticLibrary MultiByte true - v140 + v142 diff --git a/cs/3rd party/libvorbisfile_static.vcxproj b/cs/3rd party/libvorbisfile_static.vcxproj index d1b0bbcab..0633a0aaa 100644 --- a/cs/3rd party/libvorbisfile_static.vcxproj +++ b/cs/3rd party/libvorbisfile_static.vcxproj @@ -31,39 +31,39 @@ {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC} libvorbisfile Win32Proj - 8.1 + 10.0.19041.0 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 StaticLibrary MultiByte - v140 + v142 true StaticLibrary MultiByte - v140 + v142 true diff --git a/cs/3rd party/oalib.vcxproj b/cs/3rd party/oalib.vcxproj index 49ed662d4..d3c9c6239 100644 --- a/cs/3rd party/oalib.vcxproj +++ b/cs/3rd party/oalib.vcxproj @@ -14,18 +14,18 @@ {61D4856F-FA82-4F02-BB88-909DDFB1FE74} oalib Win32Proj - 8.1 + 10.0.19041.0 StaticLibrary - v140 + v142 Unicode true StaticLibrary - v140 + v142 Unicode diff --git a/cs/3rd party/zlib.vcxproj b/cs/3rd party/zlib.vcxproj index 4d5fd4625..6260aa373 100644 --- a/cs/3rd party/zlib.vcxproj +++ b/cs/3rd party/zlib.vcxproj @@ -28,38 +28,38 @@ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} - 8.1 + 10.0.19041.0 StaticLibrary - v140 + v142 MultiByte StaticLibrary - v141 + v142 MultiByte StaticLibrary - v140 + v142 MultiByte StaticLibrary - v141 + v142 MultiByte StaticLibrary - v140 + v142 MultiByte true StaticLibrary - v140 + v142 MultiByte true diff --git a/cs/engine.sln b/cs/engine.sln index 31bb2690d..98d8a4980 100644 --- a/cs/engine.sln +++ b/cs/engine.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.421 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.36107.64 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}" EndProject @@ -127,8 +127,8 @@ Global {566551F4-4EF1-4CB4-A131-F982E7606907}.Mixed_Dedicated|x86.ActiveCfg = Release|Win32 {566551F4-4EF1-4CB4-A131-F982E7606907}.Mixed|x64.ActiveCfg = Release|Win32 {566551F4-4EF1-4CB4-A131-F982E7606907}.Mixed|x64.Build.0 = Release|Win32 - {566551F4-4EF1-4CB4-A131-F982E7606907}.Mixed|x86.ActiveCfg = Release|Win32 - {566551F4-4EF1-4CB4-A131-F982E7606907}.Mixed|x86.Build.0 = Release|Win32 + {566551F4-4EF1-4CB4-A131-F982E7606907}.Mixed|x86.ActiveCfg = Mixed|Win32 + {566551F4-4EF1-4CB4-A131-F982E7606907}.Mixed|x86.Build.0 = Mixed|Win32 {566551F4-4EF1-4CB4-A131-F982E7606907}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {566551F4-4EF1-4CB4-A131-F982E7606907}.Release_Dedicated|x64.Build.0 = Release|Win32 {566551F4-4EF1-4CB4-A131-F982E7606907}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -146,8 +146,8 @@ Global {0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Mixed_Dedicated|x86.ActiveCfg = Release|Win32 {0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Mixed|x64.ActiveCfg = Debug|Win32 {0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Mixed|x64.Build.0 = Debug|Win32 - {0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Mixed|x86.ActiveCfg = Release|Win32 - {0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Mixed|x86.Build.0 = Release|Win32 + {0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Mixed|x86.ActiveCfg = Mixed|Win32 + {0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Mixed|x86.Build.0 = Mixed|Win32 {0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Release_Dedicated|x64.ActiveCfg = Debug|Win32 {0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Release_Dedicated|x64.Build.0 = Debug|Win32 {0899B131-F1D4-4876-9BA1-67AC821DB9E1}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -420,8 +420,8 @@ Global {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}.Mixed_Dedicated|x86.ActiveCfg = Release|Win32 {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}.Mixed|x64.ActiveCfg = Release|Win32 {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}.Mixed|x64.Build.0 = Release|Win32 - {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}.Mixed|x86.ActiveCfg = Debug|Win32 - {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}.Mixed|x86.Build.0 = Debug|Win32 + {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}.Mixed|x86.ActiveCfg = Mixed|Win32 + {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}.Mixed|x86.Build.0 = Mixed|Win32 {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}.Release_Dedicated|x64.Build.0 = Release|Win32 {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -603,8 +603,8 @@ Global {CC52E0B3-CC35-4934-9302-035B748F3F2C}.Mixed_Dedicated|x86.ActiveCfg = Debug|Win32 {CC52E0B3-CC35-4934-9302-035B748F3F2C}.Mixed|x64.ActiveCfg = Release|Win32 {CC52E0B3-CC35-4934-9302-035B748F3F2C}.Mixed|x64.Build.0 = Release|Win32 - {CC52E0B3-CC35-4934-9302-035B748F3F2C}.Mixed|x86.ActiveCfg = Debug|Win32 - {CC52E0B3-CC35-4934-9302-035B748F3F2C}.Mixed|x86.Build.0 = Debug|Win32 + {CC52E0B3-CC35-4934-9302-035B748F3F2C}.Mixed|x86.ActiveCfg = Mixed|Win32 + {CC52E0B3-CC35-4934-9302-035B748F3F2C}.Mixed|x86.Build.0 = Mixed|Win32 {CC52E0B3-CC35-4934-9302-035B748F3F2C}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {CC52E0B3-CC35-4934-9302-035B748F3F2C}.Release_Dedicated|x64.Build.0 = Release|Win32 {CC52E0B3-CC35-4934-9302-035B748F3F2C}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -622,8 +622,8 @@ Global {F6C4F74A-152C-4612-9E3B-D02346234855}.Mixed_Dedicated|x86.ActiveCfg = Debug|Win32 {F6C4F74A-152C-4612-9E3B-D02346234855}.Mixed|x64.ActiveCfg = Release|Win32 {F6C4F74A-152C-4612-9E3B-D02346234855}.Mixed|x64.Build.0 = Release|Win32 - {F6C4F74A-152C-4612-9E3B-D02346234855}.Mixed|x86.ActiveCfg = Debug|Win32 - {F6C4F74A-152C-4612-9E3B-D02346234855}.Mixed|x86.Build.0 = Debug|Win32 + {F6C4F74A-152C-4612-9E3B-D02346234855}.Mixed|x86.ActiveCfg = Mixed|Win32 + {F6C4F74A-152C-4612-9E3B-D02346234855}.Mixed|x86.Build.0 = Mixed|Win32 {F6C4F74A-152C-4612-9E3B-D02346234855}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {F6C4F74A-152C-4612-9E3B-D02346234855}.Release_Dedicated|x64.Build.0 = Release|Win32 {F6C4F74A-152C-4612-9E3B-D02346234855}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -661,8 +661,8 @@ Global {FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed_Dedicated|x86.Build.0 = Release|Win32 {FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed|x64.ActiveCfg = Release|Win32 {FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed|x64.Build.0 = Release|Win32 - {FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed|x86.ActiveCfg = Debug|Win32 - {FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed|x86.Build.0 = Debug|Win32 + {FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed|x86.ActiveCfg = Mixed|Win32 + {FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Mixed|x86.Build.0 = Mixed|Win32 {FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Release_Dedicated|x64.Build.0 = Release|Win32 {FA169092-EA3E-40C1-8E5A-A2B575700FE8}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -770,8 +770,8 @@ Global {880CD250-BA77-4DAF-A8D4-552F12DD3AE4}.Mixed_Dedicated|x86.Build.0 = Release|Win32 {880CD250-BA77-4DAF-A8D4-552F12DD3AE4}.Mixed|x64.ActiveCfg = Release|Win32 {880CD250-BA77-4DAF-A8D4-552F12DD3AE4}.Mixed|x64.Build.0 = Release|Win32 - {880CD250-BA77-4DAF-A8D4-552F12DD3AE4}.Mixed|x86.ActiveCfg = Release|Win32 - {880CD250-BA77-4DAF-A8D4-552F12DD3AE4}.Mixed|x86.Build.0 = Release|Win32 + {880CD250-BA77-4DAF-A8D4-552F12DD3AE4}.Mixed|x86.ActiveCfg = Mixed|Win32 + {880CD250-BA77-4DAF-A8D4-552F12DD3AE4}.Mixed|x86.Build.0 = Mixed|Win32 {880CD250-BA77-4DAF-A8D4-552F12DD3AE4}.Release_Dedicated|x64.ActiveCfg = Release|Win32 {880CD250-BA77-4DAF-A8D4-552F12DD3AE4}.Release_Dedicated|x64.Build.0 = Release|Win32 {880CD250-BA77-4DAF-A8D4-552F12DD3AE4}.Release_Dedicated|x86.ActiveCfg = Release|Win32 @@ -859,8 +859,8 @@ Global {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed_Dedicated|x86.Build.0 = Release|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|x64.ActiveCfg = Release|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|x64.Build.0 = Release|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|x86.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|x86.Build.0 = Release|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|x86.ActiveCfg = Mixed|Win32 + {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Mixed|x86.Build.0 = Mixed|Win32 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|x64.ActiveCfg = Release|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|x64.Build.0 = Release|x64 {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release_Dedicated|x86.ActiveCfg = Release|Win32 diff --git a/cs/engine/editor/editor.vcxproj b/cs/engine/editor/editor.vcxproj index e435869c8..90c8f2b79 100644 --- a/cs/engine/editor/editor.vcxproj +++ b/cs/engine/editor/editor.vcxproj @@ -14,19 +14,19 @@ {492D3DFE-9068-4E7E-A008-7C2420A651C0} editor ManagedCProj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte true true DynamicLibrary - v140 + v142 MultiByte true diff --git a/cs/engine/editor_controls/editor_controls.vcxproj b/cs/engine/editor_controls/editor_controls.vcxproj index 875be10a4..d9d5dc646 100644 --- a/cs/engine/editor_controls/editor_controls.vcxproj +++ b/cs/engine/editor_controls/editor_controls.vcxproj @@ -14,19 +14,19 @@ {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48} editor_controls ManagedCProj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 Unicode true true DynamicLibrary - v140 + v142 Unicode true diff --git a/cs/engine/layers/xrRender/r__dsgraph_types.h b/cs/engine/layers/xrRender/r__dsgraph_types.h index 4292043fd..2a48c7a82 100644 --- a/cs/engine/layers/xrRender/r__dsgraph_types.h +++ b/cs/engine/layers/xrRender/r__dsgraph_types.h @@ -34,8 +34,8 @@ char* __charalloc (size_type n) { return (char*)allocate(n); } void deallocate (pointer p, size_type n) const { dlfree (p); } void deallocate (void* p, size_type n) const { dlfree (p); } - void construct (pointer p, const T& _Val) { std::_Construct(p, _Val); } - void destroy (pointer p) { std::_Destroy(p); } + void construct (pointer p, const T& _Val) { new(p) T(_Val); } + void destroy (pointer p) { p->~T(); } size_type max_size () const { size_type _Count = (size_type)(-1) / sizeof (T); return (0 < _Count ? _Count : 1); } }; diff --git a/cs/engine/layers/xrRender/r__occlusion.cpp b/cs/engine/layers/xrRender/r__occlusion.cpp index cc2ee09a9..b08fa5f5c 100644 --- a/cs/engine/layers/xrRender/r__occlusion.cpp +++ b/cs/engine/layers/xrRender/r__occlusion.cpp @@ -42,13 +42,11 @@ u32 R_occlusion::occq_begin (u32& ID ) if (!enabled) return 0; // Igor: prevent release crash if we issue too many queries -//#ifndef DEBUG if (pool.empty()) { ID = iInvalidHandle; return 0; } -//#endif // DEBUG RImplementation.stats.o_queries ++; if (!fids.empty()) { @@ -71,12 +69,7 @@ u32 R_occlusion::occq_begin (u32& ID ) } void R_occlusion::occq_end (u32& ID ) { - if (!enabled) return; - - // Igor: prevent release crash if we issue too many queries -#ifndef DEBUG - if (ID == iInvalidHandle) return; -#endif // DEBUG + if (!enabled || ID == iInvalidHandle) return; // Msg ("end : [%2d] - %d", used[ID].order, ID); //CHK_DX (used[ID].Q->Issue (D3DISSUE_END)); @@ -84,12 +77,7 @@ void R_occlusion::occq_end (u32& ID ) } R_occlusion::occq_result R_occlusion::occq_get (u32& ID ) { - if (!enabled) return 0xffffffff; - - // Igor: prevent release crash if we issue too many queries -#ifndef DEBUG - if (ID == iInvalidHandle) return 0xFFFFFFFF; -#endif // DEBUG + if (!enabled || ID == iInvalidHandle) return 0xffffffff; occq_result fragments = 0; HRESULT hr; diff --git a/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj b/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj index 7c4d61dda..b604630f6 100644 --- a/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj +++ b/cs/engine/layers/xrRenderPC_GL/xrRender_GL.vcxproj @@ -18,23 +18,23 @@ {2C5AF8C8-96A6-45B2-860B-5E9C9911DDD6} xrRender_GL Win32Proj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 MultiByte diff --git a/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj b/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj index f6d4139f5..7a703d7d8 100644 --- a/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj +++ b/cs/engine/layers/xrRenderPC_R1/xrRender_R1.vcxproj @@ -18,23 +18,23 @@ {57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2} xrRender_R1 Win32Proj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 MultiByte diff --git a/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj b/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj index e4cffb8f7..bc5a38ed0 100644 --- a/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj +++ b/cs/engine/layers/xrRenderPC_R2/xrRender_R2.vcxproj @@ -18,23 +18,23 @@ {963BA4E5-499A-454D-B002-1D5ECE0527A6} xrRender_R2 Win32Proj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 MultiByte diff --git a/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj b/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj index 8f2c8fe80..9df2eda18 100644 --- a/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj +++ b/cs/engine/layers/xrRenderPC_R3/xrRender_R3.vcxproj @@ -18,23 +18,23 @@ {3F383D3C-FCD8-4170-990B-EB4833F09248} xrRender_R3 Win32Proj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 MultiByte diff --git a/cs/engine/utils/CompressionTest/CompressionTest.vcxproj b/cs/engine/utils/CompressionTest/CompressionTest.vcxproj index bd42e31f1..abd8f3617 100644 --- a/cs/engine/utils/CompressionTest/CompressionTest.vcxproj +++ b/cs/engine/utils/CompressionTest/CompressionTest.vcxproj @@ -14,17 +14,17 @@ {C961EA19-716C-4A6D-BB13-689F8FB78B01} CompressionTest Win32Proj - 8.1 + 10.0.19041.0 Application - v140 + v142 MultiByte Application - v140 + v142 MultiByte diff --git a/cs/engine/utils/ETools/ETools.vcxproj b/cs/engine/utils/ETools/ETools.vcxproj index ab5058d65..b662271bb 100644 --- a/cs/engine/utils/ETools/ETools.vcxproj +++ b/cs/engine/utils/ETools/ETools.vcxproj @@ -16,24 +16,24 @@ {65CBB9D0-FBC6-41A4-8316-F5E9B5D7FB33} - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 false MultiByte DynamicLibrary - v140 + v142 false MultiByte DynamicLibrary - v140 + v142 false MultiByte true diff --git a/cs/engine/utils/LWO/LWO.vcxproj b/cs/engine/utils/LWO/LWO.vcxproj index 0ffeabe0e..f4ba3ca48 100644 --- a/cs/engine/utils/LWO/LWO.vcxproj +++ b/cs/engine/utils/LWO/LWO.vcxproj @@ -12,18 +12,18 @@ {A6EBBBBB-5FEF-4C20-8460-DFAB11734DED} - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 false MultiByte DynamicLibrary - v140 + v142 false MultiByte diff --git a/cs/engine/utils/ctool/ctool.vcxproj b/cs/engine/utils/ctool/ctool.vcxproj index 34f165def..6de547b56 100644 --- a/cs/engine/utils/ctool/ctool.vcxproj +++ b/cs/engine/utils/ctool/ctool.vcxproj @@ -14,18 +14,18 @@ {2FAAC8BA-369F-465E-B465-2235963FD377} ctool Win32Proj - 8.1 + 10.0.19041.0 Application - v140 + v142 Unicode true Application - v140 + v142 Unicode diff --git a/cs/engine/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj b/cs/engine/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj index 8c334a0cf..ce8aef9c8 100644 --- a/cs/engine/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj +++ b/cs/engine/utils/mp_configs_verifyer/mp_configs_verifyer.vcxproj @@ -13,18 +13,18 @@ {1924EF23-A05E-40E5-93F2-6CCD64BE1F8B} mp_configs_info - 8.1 + 10.0.19041.0 Application - v140 + v142 MultiByte true Application - v140 + v142 MultiByte diff --git a/cs/engine/utils/mp_screenshots_info/mp_screenshots_info.vcxproj b/cs/engine/utils/mp_screenshots_info/mp_screenshots_info.vcxproj index 60b708ca1..af0fa451f 100644 --- a/cs/engine/utils/mp_screenshots_info/mp_screenshots_info.vcxproj +++ b/cs/engine/utils/mp_screenshots_info/mp_screenshots_info.vcxproj @@ -13,18 +13,18 @@ {032A10AB-E44C-4751-A290-001EF99E664A} mp_screenshots_info - 8.1 + 10.0.19041.0 Application - v140 + v142 MultiByte true Application - v140 + v142 MultiByte diff --git a/cs/engine/utils/xrAI/xrAI.vcxproj b/cs/engine/utils/xrAI/xrAI.vcxproj index 1c92ba6c7..505f05663 100644 --- a/cs/engine/utils/xrAI/xrAI.vcxproj +++ b/cs/engine/utils/xrAI/xrAI.vcxproj @@ -16,25 +16,25 @@ {EA5932F3-02FE-4AD3-89E8-7072DC465D25} - 8.1 + 10.0.19041.0 Application - v140 + v142 false MultiByte Application - v140 + v142 false MultiByte true Application - v140 + v142 false MultiByte diff --git a/cs/engine/utils/xrCompress/xrCompress.vcxproj b/cs/engine/utils/xrCompress/xrCompress.vcxproj index 6b38de15c..8c27f386a 100644 --- a/cs/engine/utils/xrCompress/xrCompress.vcxproj +++ b/cs/engine/utils/xrCompress/xrCompress.vcxproj @@ -16,25 +16,25 @@ {EF76867B-6EB8-4DC0-A1D6-E964FAD6FC7B} - 8.1 + 10.0.19041.0 Application - v140 + v142 false MultiByte false Application - v140 + v142 false MultiByte Application - v140 + v142 false MultiByte true diff --git a/cs/engine/utils/xrDO_Light/xrDO_Light.vcxproj b/cs/engine/utils/xrDO_Light/xrDO_Light.vcxproj index 6258c1e0b..c0404d5b0 100644 --- a/cs/engine/utils/xrDO_Light/xrDO_Light.vcxproj +++ b/cs/engine/utils/xrDO_Light/xrDO_Light.vcxproj @@ -16,25 +16,25 @@ {B730F54D-1199-481A-AAD0-5DB684E067C0} - 8.1 + 10.0.19041.0 Application - v140 + v142 false MultiByte Application - v140 + v142 false MultiByte true Application - v140 + v142 false MultiByte diff --git a/cs/engine/utils/xrDXT/DXT.vcxproj b/cs/engine/utils/xrDXT/DXT.vcxproj index 272b9c4d8..78134b51d 100644 --- a/cs/engine/utils/xrDXT/DXT.vcxproj +++ b/cs/engine/utils/xrDXT/DXT.vcxproj @@ -17,25 +17,25 @@ {EBF9B543-0830-4866-9B48-DC0740E87E8A} DXT - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 false MultiByte true DynamicLibrary - v140 + v142 false MultiByte DynamicLibrary - v140 + v142 false MultiByte true diff --git a/cs/engine/utils/xrLC/xrLC.vcxproj b/cs/engine/utils/xrLC/xrLC.vcxproj index 3a74ade2a..8966d4dc1 100644 --- a/cs/engine/utils/xrLC/xrLC.vcxproj +++ b/cs/engine/utils/xrLC/xrLC.vcxproj @@ -16,25 +16,25 @@ {A4ABD75E-825B-4D09-B3B2-2709682E40C8} - 8.1 + 10.0.19041.0 Application - v140 + v142 false false MultiByte Application - v140 + v142 false MultiByte Application - v140 + v142 false false MultiByte diff --git a/cs/engine/utils/xrLC_Light/xrLC_Light.vcxproj b/cs/engine/utils/xrLC_Light/xrLC_Light.vcxproj index 11e3d7588..dbf2a0f0b 100644 --- a/cs/engine/utils/xrLC_Light/xrLC_Light.vcxproj +++ b/cs/engine/utils/xrLC_Light/xrLC_Light.vcxproj @@ -18,23 +18,23 @@ {EFB76D6F-0092-439C-A783-C0BE10BD17C9} xrLC_Light Win32Proj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 MultiByte diff --git a/cs/engine/utils/xrQSlim/xrQSlim.vcxproj b/cs/engine/utils/xrQSlim/xrQSlim.vcxproj index 970b4c20d..ab2514354 100644 --- a/cs/engine/utils/xrQSlim/xrQSlim.vcxproj +++ b/cs/engine/utils/xrQSlim/xrQSlim.vcxproj @@ -18,22 +18,22 @@ {F1836CE2-59EF-4189-8B9C-D103A511CB27} xrQSlim Win32Proj - 8.1 + 10.0.19041.0 StaticLibrary - v140 + v142 MultiByte StaticLibrary - v140 + v142 MultiByte StaticLibrary - v140 + v142 MultiByte diff --git a/cs/engine/utils/xrSE_Factory/xrSE_Factory.vcxproj b/cs/engine/utils/xrSE_Factory/xrSE_Factory.vcxproj index 4721da336..65d31dbf3 100644 --- a/cs/engine/utils/xrSE_Factory/xrSE_Factory.vcxproj +++ b/cs/engine/utils/xrSE_Factory/xrSE_Factory.vcxproj @@ -18,24 +18,24 @@ {3AD26FD3-4F52-4E22-A4CF-AD4C49E74C61} xrSE_Factory Win32Proj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 false MultiByte DynamicLibrary - v140 + v142 MultiByte diff --git a/cs/engine/xrCDB/xrCDB.vcxproj b/cs/engine/xrCDB/xrCDB.vcxproj index c71446e35..3e50401e3 100644 --- a/cs/engine/xrCDB/xrCDB.vcxproj +++ b/cs/engine/xrCDB/xrCDB.vcxproj @@ -16,24 +16,24 @@ {A19B1DF2-82EC-4364-8BDF-85D13A1C89B5} - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 false MultiByte DynamicLibrary - v140 + v142 false MultiByte DynamicLibrary - v140 + v142 false MultiByte true diff --git a/cs/engine/xrCore/FS.cpp b/cs/engine/xrCore/FS.cpp index dc73e6bf2..30d29841e 100644 --- a/cs/engine/xrCore/FS.cpp +++ b/cs/engine/xrCore/FS.cpp @@ -335,7 +335,10 @@ IReader* IReader::open_chunk(u32 ID) } else return 0; }; void IReader::close() -{ xr_delete((IReader*)this); } +{ + IReader* self = this; + xr_delete(self); +} #include "FS_impl.h" diff --git a/cs/engine/xrCore/xrCore.h b/cs/engine/xrCore/xrCore.h index 8249aff63..c09c401cf 100644 --- a/cs/engine/xrCore/xrCore.h +++ b/cs/engine/xrCore/xrCore.h @@ -63,7 +63,11 @@ #include #include #include -#include +#if _MSC_VER < 1920 + #include +#else + #include +#endif //#include #ifndef DEBUG diff --git a/cs/engine/xrCore/xrCore.vcxproj b/cs/engine/xrCore/xrCore.vcxproj index 78a4a5738..73ae47cd0 100644 --- a/cs/engine/xrCore/xrCore.vcxproj +++ b/cs/engine/xrCore/xrCore.vcxproj @@ -18,23 +18,23 @@ {A0F7D1FB-59A7-4717-A7E4-96F37E91998E} xrCore Win32Proj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 MultiByte diff --git a/cs/engine/xrCore/xrCore_platform.h b/cs/engine/xrCore/xrCore_platform.h index 15d836d5c..ef1f7e489 100644 --- a/cs/engine/xrCore/xrCore_platform.h +++ b/cs/engine/xrCore/xrCore_platform.h @@ -9,7 +9,9 @@ #endif // STRICT #define IDIRECTPLAY2_OR_GREATER // ? #define DIRECTINPUT_VERSION 0x0800 // +#ifndef _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_DEPRECATE // vc8.0 stuff, don't deprecate several ANSI functions +#endif // windows.h #ifndef _WIN32_WINNT diff --git a/cs/engine/xrCore/xrMemory.h b/cs/engine/xrCore/xrMemory.h index ddf97fc5d..64e707e44 100644 --- a/cs/engine/xrCore/xrMemory.h +++ b/cs/engine/xrCore/xrMemory.h @@ -96,7 +96,11 @@ extern XRCORE_API xrMemory Memory; // generic "C"-like allocations/deallocations #ifdef DEBUG_MEMORY_NAME - #include "typeinfo.h" +#if _MSC_VER < 1920 + #include +#else + #include +#endif template IC T* xr_alloc (u32 count) { return (T*)Memory.mem_alloc(count*sizeof(T),typeid(T).name()); } diff --git a/cs/engine/xrD3D9-Null/xrD3D9-Null.vcxproj b/cs/engine/xrD3D9-Null/xrD3D9-Null.vcxproj index 6730b9714..8d40a1f51 100644 --- a/cs/engine/xrD3D9-Null/xrD3D9-Null.vcxproj +++ b/cs/engine/xrD3D9-Null/xrD3D9-Null.vcxproj @@ -1,6 +1,10 @@ + + Mixed + Win32 + Debug Win32 @@ -13,18 +17,23 @@ {0899B131-F1D4-4876-9BA1-67AC821DB9E1} Win32Proj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 + MultiByte + + + DynamicLibrary + v142 MultiByte @@ -40,10 +49,18 @@ + + + + + *.idb%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath) + + *.idb%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat%3b$(TargetPath) + false @@ -73,6 +90,32 @@ MachineX86 + + + Disabled + WIN32;DEBUG;_WINDOWS;_USRDLL;XRD3D9NULL_EXPORTS;DEBUG;_SECURE_SCL=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDLL + Fast + false + Use + $(IntDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + EditAndContinue + + + xrD3D9-Null.def + true + + Windows + true + MachineX86 + + MaxSpeed @@ -128,11 +171,13 @@ Create + Create Create Use + Use diff --git a/cs/engine/xrEngine/editor_environment_ambients_effect_id.cpp b/cs/engine/xrEngine/editor_environment_ambients_effect_id.cpp index b53390fe3..96c14c009 100644 --- a/cs/engine/xrEngine/editor_environment_ambients_effect_id.cpp +++ b/cs/engine/xrEngine/editor_environment_ambients_effect_id.cpp @@ -17,7 +17,7 @@ using editor::environment::ambients::effect_id; using editor::environment::effects::manager; effect_id::effect_id ( - manager const& manager, + effects::manager const& manager, shared_str const& id ) : m_manager (manager), diff --git a/cs/engine/xrEngine/xrEngine.vcxproj b/cs/engine/xrEngine/xrEngine.vcxproj index 65073da4b..33570ecc1 100644 --- a/cs/engine/xrEngine/xrEngine.vcxproj +++ b/cs/engine/xrEngine/xrEngine.vcxproj @@ -29,44 +29,44 @@ {2578C6D8-660D-48AE-9322-7422F8664F06} xrEngine - 8.1 + 10.0.19041.0 Application - v140 + v142 false MultiByte true Application - v140 + v142 false MultiByte Application - v140 + v142 false MultiByte Application - v140 + v142 false MultiByte true Application - v140 + v142 false MultiByte Application - v140 + v142 false MultiByte diff --git a/cs/engine/xrGame/CaptureBoneCallback.h b/cs/engine/xrGame/CaptureBoneCallback.h index dd50e993f..9dc6c30ca 100644 --- a/cs/engine/xrGame/CaptureBoneCallback.h +++ b/cs/engine/xrGame/CaptureBoneCallback.h @@ -1,4 +1,4 @@ -#pragma once; +#pragma once #include "physicsshell.h" diff --git a/cs/engine/xrGame/PHCharacter.h b/cs/engine/xrGame/PHCharacter.h index e3e21e06f..f0c716283 100644 --- a/cs/engine/xrGame/PHCharacter.h +++ b/cs/engine/xrGame/PHCharacter.h @@ -17,7 +17,7 @@ class CPHAICharacter; namespace ALife { enum EHitType; }; - static enum EEnvironment + enum EEnvironment { peOnGround, peAtWall, diff --git a/cs/engine/xrGame/PHItemList.h b/cs/engine/xrGame/PHItemList.h index ac857c4fb..43d755952 100644 --- a/cs/engine/xrGame/PHItemList.h +++ b/cs/engine/xrGame/PHItemList.h @@ -31,8 +31,7 @@ template public: - class iterator; - typedef class iterator + class iterator { T *my_ptr; diff --git a/cs/engine/xrGame/ai_object_location.h b/cs/engine/xrGame/ai_object_location.h index dcddedded..681b47aa2 100644 --- a/cs/engine/xrGame/ai_object_location.h +++ b/cs/engine/xrGame/ai_object_location.h @@ -32,9 +32,9 @@ class CAI_ObjectLocation { void game_vertex (_GRAPH_ID const &game_vertex_id); IC const CVertex *game_vertex () const; IC const _GRAPH_ID game_vertex_id () const; - IC void level_vertex (CLevelVertex const *level_vertex); + void level_vertex (CLevelVertex const *level_vertex); void level_vertex (u32 const &level_vertex_id); - IC const CLevelVertex *level_vertex () const; + const CLevelVertex *level_vertex () const; IC const u32 level_vertex_id () const; }; diff --git a/cs/engine/xrGame/ai_object_location_impl.h b/cs/engine/xrGame/ai_object_location_impl.h index 44f758a51..dbdae4a8c 100644 --- a/cs/engine/xrGame/ai_object_location_impl.h +++ b/cs/engine/xrGame/ai_object_location_impl.h @@ -44,7 +44,7 @@ IC const CGameGraph::CVertex *CAI_ObjectLocation::game_vertex () const return (ai().game_graph().vertex(m_game_vertex_id)); } -IC void CAI_ObjectLocation::level_vertex (CLevelVertex const *level_vertex) +void CAI_ObjectLocation::level_vertex (CLevelVertex const *level_vertex) { VERIFY (ai().level_graph().valid_vertex_id(ai().level_graph().vertex_id(level_vertex))); m_level_vertex_id = ai().level_graph().vertex_id(level_vertex); @@ -56,7 +56,7 @@ void CAI_ObjectLocation::level_vertex (u32 const &level_vertex_id) m_level_vertex_id = level_vertex_id; } -IC const CLevelGraph::CVertex *CAI_ObjectLocation::level_vertex() const +const CLevelGraph::CVertex *CAI_ObjectLocation::level_vertex() const { VERIFY (ai().level_graph().valid_vertex_id(m_level_vertex_id)); return (ai().level_graph().vertex(m_level_vertex_id)); diff --git a/cs/engine/xrGame/alife_monster_movement_manager.h b/cs/engine/xrGame/alife_monster_movement_manager.h index df4c4f978..15cd9ba6d 100644 --- a/cs/engine/xrGame/alife_monster_movement_manager.h +++ b/cs/engine/xrGame/alife_monster_movement_manager.h @@ -14,9 +14,7 @@ class CSE_ALifeMonsterAbstract; class CALifeMonsterDetailPathManager; class CALifeMonsterPatrolPathManager; -namespace MovementManager { - enum EPathType; -}; +#include "movement_manager_space.h" class CALifeMonsterMovementManager { public: diff --git a/cs/engine/xrGame/alife_monster_patrol_path_manager.h b/cs/engine/xrGame/alife_monster_patrol_path_manager.h index 156867320..fc3c165ac 100644 --- a/cs/engine/xrGame/alife_monster_patrol_path_manager.h +++ b/cs/engine/xrGame/alife_monster_patrol_path_manager.h @@ -15,8 +15,8 @@ class CSE_ALifeMonsterAbstract; class CPatrolPath; namespace PatrolPathManager { - enum EPatrolStartType; - enum EPatrolRouteType; + enum EPatrolStartType : u32; + enum EPatrolRouteType : u32; }; class CALifeMonsterPatrolPathManager { diff --git a/cs/engine/xrGame/console_commands.cpp b/cs/engine/xrGame/console_commands.cpp index 61fa250fd..3d053c125 100644 --- a/cs/engine/xrGame/console_commands.cpp +++ b/cs/engine/xrGame/console_commands.cpp @@ -1585,10 +1585,8 @@ void CCC_RegisterCommands() CMD3(CCC_Mask, "hud_weapon", &psHUD_Flags, HUD_WEAPON); CMD3(CCC_Mask, "hud_info", &psHUD_Flags, HUD_INFO); - -#ifndef MASTER_GOLD CMD3(CCC_Mask, "hud_draw", &psHUD_Flags, HUD_DRAW); -#endif // MASTER_GOLD + // hud psHUD_Flags.set(HUD_CROSSHAIR, true); psHUD_Flags.set(HUD_WEAPON, true); @@ -1598,10 +1596,8 @@ void CCC_RegisterCommands() CMD3(CCC_Mask, "hud_crosshair", &psHUD_Flags, HUD_CROSSHAIR); CMD3(CCC_Mask, "hud_crosshair_dist", &psHUD_Flags, HUD_CROSSHAIR_DIST); -#ifdef DEBUG CMD4(CCC_Float, "hud_fov", &psHUD_FOV, 0.1f, 1.0f); CMD4(CCC_Float, "fov", &g_fov, 5.0f, 180.0f); -#endif // DEBUG // Demo CMD1(CCC_DemoPlay, "demo_play" ); diff --git a/cs/engine/xrGame/debug_make_final.hpp b/cs/engine/xrGame/debug_make_final.hpp deleted file mode 100644 index 285bebbaf..000000000 --- a/cs/engine/xrGame/debug_make_final.hpp +++ /dev/null @@ -1,44 +0,0 @@ -//////////////////////////////////////////////////////////////////////////// -// Module : debug_make_final.hpp -// Created : 03.12.2007 -// Modified : 04.12.2007 -// Author : Dmitriy Iassenev -// Description : make_final class for debug purposes -//////////////////////////////////////////////////////////////////////////// - -#ifndef DEBUG_MAKE_FINAL_HPP_INCLUDED -#define DEBUG_MAKE_FINAL_HPP_INCLUDED - -#include - -namespace debug { - -#ifdef DEBUG - namespace detail { - - template - class make_final { - make_final () {} - friend T1; - friend T2; - }; // class make_final - - } // namespace detail - - template - struct make_final : - private virtual - detail::make_final< - T, - make_final - > - { - }; // class make_final -#else // DEBUG - template - class make_final {}; -#endif // DEBUG - -} // namespace debug - -#endif // DEBUG_MAKE_FINAL_HPP_INCLUDED \ No newline at end of file diff --git a/cs/engine/xrGame/debug_make_final_test.cpp b/cs/engine/xrGame/debug_make_final_test.cpp deleted file mode 100644 index 5331f5c96..000000000 --- a/cs/engine/xrGame/debug_make_final_test.cpp +++ /dev/null @@ -1,28 +0,0 @@ -//////////////////////////////////////////////////////////////////////////// -// Module : debug_make_final.cpp -// Created : 03.12.2007 -// Modified : 04.12.2007 -// Author : Dmitriy Iassenev -// Description : make_final class for debug purposes -//////////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#include "debug_make_final.hpp" - -struct A : private boost::noncopyable -{ -}; - -struct B : - public A, - private debug::make_final -{ -}; - -struct C : B {}; - -B b; - -// the next 2 lines won't compile -C *c0 = new C(); -C c1; \ No newline at end of file diff --git a/cs/engine/xrGame/detail_path_manager_space.h b/cs/engine/xrGame/detail_path_manager_space.h index f76527b79..adeb468c6 100644 --- a/cs/engine/xrGame/detail_path_manager_space.h +++ b/cs/engine/xrGame/detail_path_manager_space.h @@ -9,7 +9,7 @@ #pragma once namespace DetailPathManager { - enum EDetailPathType { + enum EDetailPathType : u32 { eDetailPathTypeSmooth, eDetailPathTypeSmoothDodge, eDetailPathTypeSmoothCriteria, diff --git a/cs/engine/xrGame/graph_abstract_inline.h b/cs/engine/xrGame/graph_abstract_inline.h index cef556ec8..8b3e3f251 100644 --- a/cs/engine/xrGame/graph_abstract_inline.h +++ b/cs/engine/xrGame/graph_abstract_inline.h @@ -244,17 +244,17 @@ IC void CAbstractGraph::save (IWriter &stream) stream.open_chunk (2); { - const_vertex_iterator I = vertices().begin(); - const_vertex_iterator E = vertices().end(); - for ( ; I != E; ++I) { + const_vertex_iterator it = vertices().begin(); + const_vertex_iterator it_e = vertices().end(); + for ( ; it != it_e; ++it) { if ((*I).second->edges().empty()) continue; - save_data ((*I).second->vertex_id(),stream); + save_data ((*it).second->vertex_id(),stream); - stream.w_u32 ((u32)(*I).second->edges().size()); - const_iterator i = (*I).second->edges().begin(); - const_iterator e = (*I).second->edges().end(); + stream.w_u32 ((u32)(*it).second->edges().size()); + const_iterator i = (*it).second->edges().begin(); + const_iterator e = (*it).second->edges().end(); for ( ; i != e; ++i) { save_data ((*i).vertex_id(),stream); save_data ((*i).weight(),stream); diff --git a/cs/engine/xrGame/map_spot.cpp b/cs/engine/xrGame/map_spot.cpp index 141817676..a83d3c12b 100644 --- a/cs/engine/xrGame/map_spot.cpp +++ b/cs/engine/xrGame/map_spot.cpp @@ -387,7 +387,7 @@ void CComplexMapSpot::SetWndSize( const Fvector2& size ) } float k = size.x / m_originSize.x; - for ( WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end() != it; ++it ) + for ( auto it = m_ChildWndList.begin(); m_ChildWndList.end() != it; ++it ) { CUIStaticOrig* static_orig = smart_cast( *it ); if ( static_orig ) diff --git a/cs/engine/xrGame/movement_manager.h b/cs/engine/xrGame/movement_manager.h index 189819902..f0a40cb1e 100644 --- a/cs/engine/xrGame/movement_manager.h +++ b/cs/engine/xrGame/movement_manager.h @@ -18,7 +18,7 @@ namespace MovementManager { }; namespace DetailPathManager { - enum EDetailPathType; + enum EDetailPathType : u32; }; template < diff --git a/cs/engine/xrGame/patrol_path_manager_space.h b/cs/engine/xrGame/patrol_path_manager_space.h index 98830abf6..4dec67d08 100644 --- a/cs/engine/xrGame/patrol_path_manager_space.h +++ b/cs/engine/xrGame/patrol_path_manager_space.h @@ -9,7 +9,7 @@ #pragma once namespace PatrolPathManager { - enum EPatrolStartType { + enum EPatrolStartType : u32 { ePatrolStartTypeFirst = u32(0), ePatrolStartTypeLast, ePatrolStartTypeNearest, @@ -17,7 +17,7 @@ namespace PatrolPathManager { ePatrolStartTypeNext, ePatrolStartTypeDummy = u32(-1), }; - enum EPatrolRouteType { + enum EPatrolRouteType : u32 { ePatrolRouteTypeStop = u32(0), ePatrolRouteTypeContinue, ePatrolRouteTypeDummy = u32(-1), diff --git a/cs/engine/xrGame/script_game_object.h b/cs/engine/xrGame/script_game_object.h index d6a4b53e4..4d94a51fc 100644 --- a/cs/engine/xrGame/script_game_object.h +++ b/cs/engine/xrGame/script_game_object.h @@ -21,16 +21,16 @@ enum ETaskState; namespace ALife { enum ERelationType; } namespace ScriptEntity { enum EActionType; } namespace MovementManager { enum EPathType; } -namespace DetailPathManager { enum EDetailPathType; } -namespace SightManager { enum ESightType; } +namespace DetailPathManager { enum EDetailPathType : u32; } +namespace SightManager { enum ESightType : u32; } namespace smart_cover { class object; } class NET_Packet; class CGameTask; namespace PatrolPathManager { - enum EPatrolStartType; - enum EPatrolRouteType; + enum EPatrolStartType : u32; + enum EPatrolRouteType : u32; }; namespace MemorySpace { @@ -114,10 +114,6 @@ class CArtefact; class CScriptGameObject; -namespace SightManager { - enum ESightType; -} - struct CSightParams { SightManager::ESightType m_sight_type; CScriptGameObject *m_object; diff --git a/cs/engine/xrGame/script_movement_action.h b/cs/engine/xrGame/script_movement_action.h index e61490043..3cb7ae922 100644 --- a/cs/engine/xrGame/script_movement_action.h +++ b/cs/engine/xrGame/script_movement_action.h @@ -12,7 +12,7 @@ #include "script_export_space.h" namespace DetailPathManager { - enum EDetailPathType; + enum EDetailPathType : u32; }; namespace MonsterSpace { @@ -23,8 +23,8 @@ namespace MonsterSpace { }; namespace PatrolPathManager { - enum EPatrolStartType; - enum EPatrolRouteType; + enum EPatrolStartType : u32; + enum EPatrolRouteType : u32; }; class CPatrolPath; diff --git a/cs/engine/xrGame/script_sound.cpp b/cs/engine/xrGame/script_sound.cpp index e4904e63b..8fbc84f43 100644 --- a/cs/engine/xrGame/script_sound.cpp +++ b/cs/engine/xrGame/script_sound.cpp @@ -26,7 +26,9 @@ CScriptSound::CScriptSound (LPCSTR caSoundName, ESoundTypes sound_type) CScriptSound::~CScriptSound () { - THROW3 (!m_sound._feedback(),"playing sound is not completed, but is destroying",m_sound._handle() ? m_sound._handle()->file_name() : "unknown"); + if (m_sound._feedback()) + ai().script_engine().script_log(ScriptStorage::eLuaMessageTypeError, "Playing sound is not completed, but is destroying \"%s\"!", + m_sound._handle() ? m_sound._handle()->file_name() : "unknown"); m_sound.destroy (); } diff --git a/cs/engine/xrGame/script_watch_action.h b/cs/engine/xrGame/script_watch_action.h index cfb5bb767..ffe2b3db7 100644 --- a/cs/engine/xrGame/script_watch_action.h +++ b/cs/engine/xrGame/script_watch_action.h @@ -12,7 +12,7 @@ #include "script_export_space.h" namespace SightManager { - enum ESightType; + enum ESightType : u32; }; class CScriptGameObject; diff --git a/cs/engine/xrGame/sight_manager_space.h b/cs/engine/xrGame/sight_manager_space.h index ed3c29636..da9f7497c 100644 --- a/cs/engine/xrGame/sight_manager_space.h +++ b/cs/engine/xrGame/sight_manager_space.h @@ -9,7 +9,7 @@ #pragma once namespace SightManager { - enum ESightType { + enum ESightType : u32 { eSightTypeCurrentDirection = u32(0), eSightTypePathDirection, eSightTypeDirection, diff --git a/cs/engine/xrGame/smart_cover.h b/cs/engine/xrGame/smart_cover.h index 46b709ef4..1d11305da 100644 --- a/cs/engine/xrGame/smart_cover.h +++ b/cs/engine/xrGame/smart_cover.h @@ -26,9 +26,8 @@ struct loophole_data { u32 m_level_vertex_id; }; -class cover : +class cover final : public CCoverPoint, - private debug::make_final, private boost::noncopyable { public: diff --git a/cs/engine/xrGame/smart_cover_action.h b/cs/engine/xrGame/smart_cover_action.h index f4fb906d2..f12740e9e 100644 --- a/cs/engine/xrGame/smart_cover_action.h +++ b/cs/engine/xrGame/smart_cover_action.h @@ -13,13 +13,10 @@ #include "script_space_forward.h" #include "ai_monster_space.h" #include "associative_vector.h" -#include "debug_make_final.hpp" namespace smart_cover{ -class action : - private debug::make_final, - private boost::noncopyable +class action final : private boost::noncopyable { private: class animation_predicate { diff --git a/cs/engine/xrGame/smart_cover_animation_planner.h b/cs/engine/xrGame/smart_cover_animation_planner.h index 057fa9967..73c712ba3 100644 --- a/cs/engine/xrGame/smart_cover_animation_planner.h +++ b/cs/engine/xrGame/smart_cover_animation_planner.h @@ -12,7 +12,6 @@ #include "smart_cover_detail.h" #include "action_planner_script.h" #include "stalker_decision_space.h" -#include "debug_make_final.hpp" class CAI_Stalker; struct SHit; @@ -23,10 +22,9 @@ namespace smart_cover { class cover; class target_selector; -class animation_planner : +class animation_planner final : public CActionPlannerScript, - private boost::noncopyable, - private debug::make_final + private boost::noncopyable { private: typedef CActionPlannerScript inherited; diff --git a/cs/engine/xrGame/smart_cover_animation_selector.h b/cs/engine/xrGame/smart_cover_animation_selector.h index 2c4e64e91..6adffde2f 100644 --- a/cs/engine/xrGame/smart_cover_animation_selector.h +++ b/cs/engine/xrGame/smart_cover_animation_selector.h @@ -24,9 +24,7 @@ namespace smart_cover { class action_base; class wait_after_exit; -class animation_selector : - private boost::noncopyable, - private debug::make_final +class animation_selector final : private boost::noncopyable { private: CPropertyStorage *m_storage; diff --git a/cs/engine/xrGame/smart_cover_default_behaviour_planner.hpp b/cs/engine/xrGame/smart_cover_default_behaviour_planner.hpp index 63d5bab7c..a810ad873 100644 --- a/cs/engine/xrGame/smart_cover_default_behaviour_planner.hpp +++ b/cs/engine/xrGame/smart_cover_default_behaviour_planner.hpp @@ -11,16 +11,14 @@ #include #include "smart_cover_detail.h" #include "action_planner_action.h" -#include "debug_make_final.hpp" namespace smart_cover { class animation_planner; -class default_behaviour_planner : +class default_behaviour_planner final : public CActionPlannerAction, - private boost::noncopyable, - private debug::make_final + private boost::noncopyable { private: typedef CActionPlannerAction inherited; diff --git a/cs/engine/xrGame/smart_cover_description.h b/cs/engine/xrGame/smart_cover_description.h index f8a660bd1..91b5afe2c 100644 --- a/cs/engine/xrGame/smart_cover_description.h +++ b/cs/engine/xrGame/smart_cover_description.h @@ -11,7 +11,6 @@ #include #include "smart_cover_detail.h" #include "graph_abstract.h" -#include "debug_make_final.hpp" namespace smart_cover { @@ -22,8 +21,7 @@ namespace transitions { class action; } -class description : - private debug::make_final, +class description final : private boost::noncopyable, public detail::intrusive_base_time { diff --git a/cs/engine/xrGame/smart_cover_loophole.h b/cs/engine/xrGame/smart_cover_loophole.h index 1a81f14de..6c4021f52 100644 --- a/cs/engine/xrGame/smart_cover_loophole.h +++ b/cs/engine/xrGame/smart_cover_loophole.h @@ -19,9 +19,7 @@ namespace smart_cover { class object; -class loophole : - private debug::make_final, - private boost::noncopyable +class loophole final : private boost::noncopyable { private: class action_predicate { diff --git a/cs/engine/xrGame/smart_cover_loophole_planner_actions.h b/cs/engine/xrGame/smart_cover_loophole_planner_actions.h index 7cc242425..682ab2ea1 100644 --- a/cs/engine/xrGame/smart_cover_loophole_planner_actions.h +++ b/cs/engine/xrGame/smart_cover_loophole_planner_actions.h @@ -74,9 +74,7 @@ class loophole_action_no_sight : public loophole_action { virtual void finalize (); }; // class loophole_action_no_sight -class loophole_lookout : - public loophole_action, - private debug::make_final +class loophole_lookout final : public loophole_action { private: typedef loophole_action inherited; @@ -88,9 +86,7 @@ class loophole_lookout : virtual void finalize (); }; -class loophole_fire : - public loophole_action, - private debug::make_final +class loophole_fire final : public loophole_action { private: typedef loophole_action inherited; @@ -110,9 +106,7 @@ class loophole_fire : virtual void on_no_mark (); }; -class loophole_reload : - public loophole_action_no_sight, - private debug::make_final +class loophole_reload final : public loophole_action_no_sight { private: typedef loophole_action_no_sight inherited; diff --git a/cs/engine/xrGame/smart_cover_planner_actions.h b/cs/engine/xrGame/smart_cover_planner_actions.h index 06e609733..e4689e49f 100644 --- a/cs/engine/xrGame/smart_cover_planner_actions.h +++ b/cs/engine/xrGame/smart_cover_planner_actions.h @@ -11,7 +11,6 @@ #include "smart_cover_detail.h" #include #include "stalker_combat_action_base.h" -#include "debug_make_final.hpp" class CAI_Stalker; @@ -44,9 +43,7 @@ class action_base : // change_loophole //////////////////////////////////////////////////////////////////////////// -class change_loophole : - public action_base, - private debug::make_final +class change_loophole final : public action_base { private: typedef action_base inherited; @@ -64,9 +61,7 @@ class change_loophole : // non_animated_change_loophole //////////////////////////////////////////////////////////////////////////// -class non_animated_change_loophole: - public action_base, - private debug::make_final +class non_animated_change_loophole final : public action_base { private: typedef action_base inherited; @@ -85,9 +80,7 @@ class non_animated_change_loophole: // exit //////////////////////////////////////////////////////////////////////////// -class exit : - public action_base, - private debug::make_final +class exit final : public action_base { private: typedef action_base inherited; diff --git a/cs/engine/xrGame/smart_cover_planner_target_provider.h b/cs/engine/xrGame/smart_cover_planner_target_provider.h index 17b603b70..9bc381910 100644 --- a/cs/engine/xrGame/smart_cover_planner_target_provider.h +++ b/cs/engine/xrGame/smart_cover_planner_target_provider.h @@ -16,7 +16,7 @@ namespace smart_cover { -class target_provider : +class target_provider : public CActionBase, private boost::noncopyable { @@ -34,9 +34,7 @@ class target_provider : u32 m_loophole_value; }; -class target_fire_no_lookout : - public target_provider, - private debug::make_final +class target_fire_no_lookout final : public target_provider { private: typedef target_provider inherited; diff --git a/cs/engine/xrGame/smart_cover_planner_target_selector.h b/cs/engine/xrGame/smart_cover_planner_target_selector.h index e9a5ceb49..31af83f75 100644 --- a/cs/engine/xrGame/smart_cover_planner_target_selector.h +++ b/cs/engine/xrGame/smart_cover_planner_target_selector.h @@ -12,16 +12,14 @@ #include "smart_cover_detail.h" #include "action_planner_action.h" #include "script_callback_ex.h" -#include "debug_make_final.hpp" namespace smart_cover { class animation_planner; -class target_selector : +class target_selector final : public CActionPlannerAction, - private boost::noncopyable, - private debug::make_final + private boost::noncopyable { private: typedef CActionPlannerAction inherited; diff --git a/cs/engine/xrGame/smart_cover_storage.h b/cs/engine/xrGame/smart_cover_storage.h index c019ec2a4..fda689165 100644 --- a/cs/engine/xrGame/smart_cover_storage.h +++ b/cs/engine/xrGame/smart_cover_storage.h @@ -13,9 +13,7 @@ namespace smart_cover { -class storage : - private debug::make_final, - private boost::noncopyable +class storage final : private boost::noncopyable { public: typedef xr_vector Descriptions; diff --git a/cs/engine/xrGame/smart_cover_transition.hpp b/cs/engine/xrGame/smart_cover_transition.hpp index 929eab013..89124100f 100644 --- a/cs/engine/xrGame/smart_cover_transition.hpp +++ b/cs/engine/xrGame/smart_cover_transition.hpp @@ -8,7 +8,7 @@ #ifndef SMART_COVER_TRANSITION_HPP_INCLUDED #define SMART_COVER_TRANSITION_HPP_INCLUDED -#include "debug_make_final.hpp" +#include namespace MonsterSpace { enum EBodyState; @@ -19,9 +19,7 @@ namespace transitions { class animation_action; -class action : - private debug::make_final, - private boost::noncopyable +class action final : private boost::noncopyable { public: diff --git a/cs/engine/xrGame/smart_cover_transition_animation.hpp b/cs/engine/xrGame/smart_cover_transition_animation.hpp index 79c4c3f67..b29b4b406 100644 --- a/cs/engine/xrGame/smart_cover_transition_animation.hpp +++ b/cs/engine/xrGame/smart_cover_transition_animation.hpp @@ -8,16 +8,14 @@ #ifndef SMART_COVER_TRANSITION_ANIMATION_HPP_INCLUDED #define SMART_COVER_TRANSITION_ANIMATION_HPP_INCLUDED -#include "debug_make_final.hpp" +#include #include "ai_monster_space.h" namespace smart_cover { namespace transitions { -class animation_action : - private debug::make_final, - private boost::noncopyable +class animation_action final : private boost::noncopyable { private: Fvector m_position; diff --git a/cs/engine/xrGame/space_restriction.cpp b/cs/engine/xrGame/space_restriction.cpp index c8ff34f9e..e19726e11 100644 --- a/cs/engine/xrGame/space_restriction.cpp +++ b/cs/engine/xrGame/space_restriction.cpp @@ -315,8 +315,12 @@ void CSpaceRestriction::remove_border () u32 CSpaceRestriction::accessible_nearest (const Fvector &position, Fvector &result) { - if (m_out_space_restriction) - return (m_out_space_restriction->accessible_nearest(this,position,result,true)); + if (m_out_space_restriction) + { + #pragma TODO("Xottab_DUTY: investigate temporary fix!") + CSpaceRestriction* mutable_this = const_cast (this); // Xottab_DUTY: temporary fix to allow compilation. Thanks to Giperion + return (m_out_space_restriction->accessible_nearest(mutable_this, position, result, true)); + } VERIFY (m_in_space_restriction); return (m_in_space_restriction->accessible_nearest(m_in_space_restriction,position,result,false)); diff --git a/cs/engine/xrGame/space_restriction_manager.cpp b/cs/engine/xrGame/space_restriction_manager.cpp index 18d3149c2..1c3984104 100644 --- a/cs/engine/xrGame/space_restriction_manager.cpp +++ b/cs/engine/xrGame/space_restriction_manager.cpp @@ -190,7 +190,7 @@ u32 CSpaceRestrictionManager::accessible_nearest (ALife::_OBJECT_ID id, const return (client_restriction->accessible_nearest(position,result)); } -IC bool CSpaceRestrictionManager::restriction_presented (shared_str restrictions, shared_str restriction) const +bool CSpaceRestrictionManager::restriction_presented (shared_str restrictions, shared_str restriction) const { string4096 m_temp; for (u32 i=0, n=_GetItemCount(*restrictions); i, - private boost::noncopyable + private boost::noncopyable { public: alignment (CAI_Rat const *object); diff --git a/cs/engine/xrGame/steering_behaviour_cohesion.h b/cs/engine/xrGame/steering_behaviour_cohesion.h index 0a69ca77e..859e41bc3 100644 --- a/cs/engine/xrGame/steering_behaviour_cohesion.h +++ b/cs/engine/xrGame/steering_behaviour_cohesion.h @@ -16,9 +16,8 @@ class CAI_Rat; namespace steering_behaviour { -class cohesion : +class cohesion final : public base, - private debug::make_final, private boost::noncopyable { public: diff --git a/cs/engine/xrGame/steering_behaviour_separation.h b/cs/engine/xrGame/steering_behaviour_separation.h index f382f1050..aa7a4f9c4 100644 --- a/cs/engine/xrGame/steering_behaviour_separation.h +++ b/cs/engine/xrGame/steering_behaviour_separation.h @@ -16,9 +16,8 @@ class CAI_Rat; namespace steering_behaviour { -class separation : +class separation final : public base, - private debug::make_final, private boost::noncopyable { public: diff --git a/cs/engine/xrGame/ui/UIDragDropListEx.cpp b/cs/engine/xrGame/ui/UIDragDropListEx.cpp index 19dd1eda1..44855b270 100644 --- a/cs/engine/xrGame/ui/UIDragDropListEx.cpp +++ b/cs/engine/xrGame/ui/UIDragDropListEx.cpp @@ -281,8 +281,8 @@ void CUIDragDropListEx::Compact() CUIWindow::WINDOW_LIST wl = m_container->GetChildWndList(); ClearAll (false); - CUIWindow::WINDOW_LIST_it it = wl.begin(); - CUIWindow::WINDOW_LIST_it it_e = wl.end(); + auto it = wl.begin(); + auto it_e = wl.end(); for(;it!=it_e;++it) { CUICellItem* itm = smart_cast(*it); @@ -469,7 +469,7 @@ bool CUIDragDropListEx::IsOwner(CUICellItem* itm){ CUICellItem* CUIDragDropListEx::GetItemIdx(u32 idx) { R_ASSERT(idxGetChildWndList().begin(); + auto it = m_container->GetChildWndList().begin(); std::advance (it, idx); return smart_cast(*it); } @@ -504,7 +504,7 @@ bool CUICellContainer::AddSimilar(CUICellItem* itm) CUICellItem* CUICellContainer::FindSimilar(CUICellItem* itm) { - for(WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) + for(auto it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) { #ifdef DEBUG CUICellItem* i = smart_cast(*it); @@ -543,7 +543,7 @@ void CUICellContainer::PlaceItemAtPos(CUICellItem* itm, Ivector2& cell_pos) CUICellItem* CUICellContainer::RemoveItem(CUICellItem* itm, bool force_root) { - for(WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) + for(auto it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) { CUICellItem* i = (CUICellItem*)(*it); diff --git a/cs/engine/xrGame/ui/UIGameLog.cpp b/cs/engine/xrGame/ui/UIGameLog.cpp index e84bca050..51e4ef0ac 100644 --- a/cs/engine/xrGame/ui/UIGameLog.cpp +++ b/cs/engine/xrGame/ui/UIGameLog.cpp @@ -100,10 +100,10 @@ void CUIGameLog::Update() // REMOVE ITEMS WITH COMPLETED ANIMATION - WINDOW_LIST_it end_it = m_pad->GetChildWndList().end(); - WINDOW_LIST_it begin_it = m_pad->GetChildWndList().begin(); + auto end_it = m_pad->GetChildWndList().end(); + auto begin_it = m_pad->GetChildWndList().begin(); - for(WINDOW_LIST_it it = begin_it; it!=end_it; ++it) + for(auto it = begin_it; it!=end_it; ++it) { CUIStatic* pItem = smart_cast(*it); VERIFY(pItem); @@ -127,7 +127,7 @@ void CUIGameLog::Update() toDelList.clear(); Frect visible_rect; GetAbsoluteRect(visible_rect); - for( WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); + for( auto it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) { diff --git a/cs/engine/xrGame/ui/UIGameTutorialSimpleItem.cpp b/cs/engine/xrGame/ui/UIGameTutorialSimpleItem.cpp index 9982cc53f..e6e56cbbe 100644 --- a/cs/engine/xrGame/ui/UIGameTutorialSimpleItem.cpp +++ b/cs/engine/xrGame/ui/UIGameTutorialSimpleItem.cpp @@ -39,9 +39,9 @@ bool CUISequenceSimpleItem::IsPlaying() CUIWindow* find_child_window(CUIWindow* parent, const shared_str& _name) { CUIWindow::WINDOW_LIST& wl = parent->GetChildWndList(); - CUIWindow::WINDOW_LIST_it _I = wl.begin(); - CUIWindow::WINDOW_LIST_it _E = wl.end(); - for(;_I!=_E;++_I) if((*_I)->WindowName()==_name) return (*_I); + auto it = wl.begin(); + auto it_e = wl.end(); + for(;it!=it_e;++it) if((*it)->WindowName()==_name) return (*it); return NULL; } diff --git a/cs/engine/xrGame/ui/UIListBox.cpp b/cs/engine/xrGame/ui/UIListBox.cpp index 579b48dfc..ba2ec2d75 100644 --- a/cs/engine/xrGame/ui/UIListBox.cpp +++ b/cs/engine/xrGame/ui/UIListBox.cpp @@ -110,7 +110,7 @@ u32 CUIListBox::GetSelectedIDX() u32 _idx = 0; CUIWindow* w = GetSelected(); - for(WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) + for(auto it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) { CUIListBoxItem* item = smart_cast(*it); if (item) @@ -162,14 +162,13 @@ void CUIListBox::MoveSelectedDown() CUIWindow* w = GetSelected(); if(!w) return; //. R_ASSERT(!m_flags.test(CUIScrollView::eMultiSelect)); - WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); - WINDOW_LIST_it it_e = m_pad->GetChildWndList().end(); - WINDOW_LIST_it it_next; + auto it = m_pad->GetChildWndList().begin(); + auto it_e = m_pad->GetChildWndList().end(); for(; it!=it_e; ++it) { if(*it==w){ - it_next = it; + auto it_next = it; ++it_next; if(it_next==it_e) break; @@ -197,7 +196,7 @@ void CUIListBox::SetSelectedText(LPCSTR txt) CUIListBoxItem* CUIListBox::GetItemByTAG(u32 tag_val) { - for(WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) + for(auto it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) { CUIListBoxItem* item = smart_cast(*it); if (item) @@ -213,7 +212,7 @@ CUIListBoxItem* CUIListBox::GetItemByTAG(u32 tag_val) CUIListBoxItem* CUIListBox::GetItemByIDX(u32 idx) { u32 _idx = 0; - for(WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) + for(auto it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) { CUIListBoxItem* item = smart_cast(*it); if (item) @@ -228,7 +227,7 @@ CUIListBoxItem* CUIListBox::GetItemByIDX(u32 idx) CUIListBoxItem* CUIListBox::GetItemByText(LPCSTR txt) { - for(WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) + for(auto it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) { CUIListBoxItem* item = smart_cast(*it); if (item) @@ -281,7 +280,7 @@ CGameFont* CUIListBox::GetFont() float CUIListBox::GetLongestLength() { float len = 0; - for(WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) + for(auto it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) { CUIListBoxItem* item = smart_cast(*it); if (item) diff --git a/cs/engine/xrGame/ui/UIListItemAdv.cpp b/cs/engine/xrGame/ui/UIListItemAdv.cpp index 6f36c8404..a2f482c4e 100644 --- a/cs/engine/xrGame/ui/UIListItemAdv.cpp +++ b/cs/engine/xrGame/ui/UIListItemAdv.cpp @@ -39,7 +39,7 @@ void CUIListItemAdv::AddWindow(CUIWindow* pWnd){ float CUIListItemAdv::GetNextLeftPos(){ float p = 0; - for(WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) + for(auto it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) p += (*it)->GetWidth(); return p; diff --git a/cs/engine/xrGame/ui/UIListWnd.cpp b/cs/engine/xrGame/ui/UIListWnd.cpp index b130e63ae..ffdbc43b6 100644 --- a/cs/engine/xrGame/ui/UIListWnd.cpp +++ b/cs/engine/xrGame/ui/UIListWnd.cpp @@ -282,7 +282,7 @@ void CUIListWnd::SendMessage(CUIWindow *pWnd, s16 msg, void *pData) if(BUTTON_CLICKED == msg) { - for (WINDOW_LIST_it it = m_ChildWndList.begin(); it != m_ChildWndList.end(); ++it) + for (auto it = m_ChildWndList.begin(); it != m_ChildWndList.end(); ++it) { pListItem2 = smart_cast(*it); if (!pListItem2) @@ -319,7 +319,7 @@ void CUIListWnd::SendMessage(CUIWindow *pWnd, s16 msg, void *pData) // prototype code - for (WINDOW_LIST_it it = m_ChildWndList.begin(); it != m_ChildWndList.end(); ++it) + for (auto it = m_ChildWndList.begin(); it != m_ChildWndList.end(); ++it) { pListItem2 = smart_cast(*it); if (!pListItem2) continue; @@ -341,7 +341,7 @@ void CUIListWnd::SendMessage(CUIWindow *pWnd, s16 msg, void *pData) { if(pListItem->GetIndex() == m_iFocusedItem && !m_bForceFocusedItem) m_iFocusedItem = -1; - for (WINDOW_LIST_it it = m_ChildWndList.begin(); it != m_ChildWndList.end(); ++it) + for (auto it = m_ChildWndList.begin(); it != m_ChildWndList.end(); ++it) { pListItem2 = smart_cast(*it); if (!pListItem2) continue; @@ -376,13 +376,11 @@ void CUIListWnd::DrawActiveBackFrame(const Frect& rect, CUIListItem * itm) void CUIListWnd::Draw() { - WINDOW_LIST_it it; - if(m_iFocusedItem != -1 && IsActiveBackgroundEnabled() ) { Frect rect; GetAbsoluteRect(rect); - for (it = m_ChildWndList.begin(); it != m_ChildWndList.end(); ++it) + for (auto it = m_ChildWndList.begin(); it != m_ChildWndList.end(); ++it) { CUIListItem *pListItem2 = smart_cast(*it); if (!pListItem2) continue; @@ -400,7 +398,7 @@ void CUIListWnd::Draw() { Frect rect; GetAbsoluteRect (rect); - for (it = m_ChildWndList.begin(); it != m_ChildWndList.end(); ++it) + for (auto it = m_ChildWndList.begin(); it != m_ChildWndList.end(); ++it) { CUIListItem *pListItem2 = smart_cast(*it); if (!pListItem2) continue; diff --git a/cs/engine/xrGame/ui/UIMap.cpp b/cs/engine/xrGame/ui/UIMap.cpp index 6cdccc933..d547e07e1 100644 --- a/cs/engine/xrGame/ui/UIMap.cpp +++ b/cs/engine/xrGame/ui/UIMap.cpp @@ -276,7 +276,7 @@ void CUIGlobalMap::Init_internal(const shared_str& name, CInifile& pLtx, const s void CUIGlobalMap::Update() { - for(WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it){ + for(auto it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it){ CUICustomMap* m = smart_cast(*it); if (!m) continue; m->DetachAll (); @@ -365,7 +365,7 @@ void CUILevelMap::Draw() { if(MapWnd()) { - for(WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end() != it; ++it) + for(auto it = m_ChildWndList.begin(); m_ChildWndList.end() != it; ++it) { CMapSpot* sp = smart_cast((*it)); if(sp && sp->m_bScale) diff --git a/cs/engine/xrGame/ui/UIScrollView.cpp b/cs/engine/xrGame/ui/UIScrollView.cpp index 0a8d25bce..7f8a5dea9 100644 --- a/cs/engine/xrGame/ui/UIScrollView.cpp +++ b/cs/engine/xrGame/ui/UIScrollView.cpp @@ -118,8 +118,8 @@ void CUIScrollView::RecalcSize () if(m_sort_function) { - m_pad->GetChildWndList().sort(m_sort_function); - //std::sort(m_pad->GetChildWndList().begin(), m_pad->GetChildWndList().end(), m_sort_function); + //m_pad->GetChildWndList().sort(m_sort_function); + std::sort(m_pad->GetChildWndList().begin(), m_pad->GetChildWndList().end(), m_sort_function); } if(GetVertFlip()){ @@ -134,7 +134,7 @@ void CUIScrollView::RecalcSize () } }else{ - for(WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end() != it; ++it) + for(auto it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end() != it; ++it) { (*it)->SetWndPos (item_pos); item_pos.y += (*it)->GetWndSize().y; @@ -189,8 +189,8 @@ void CUIScrollView::Draw () visible_rect.bottom -= m_downIndent; UI()->PushScissor (visible_rect); - WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); - WINDOW_LIST_it it_e = m_pad->GetChildWndList().end(); + auto it = m_pad->GetChildWndList().begin(); + auto it_e = m_pad->GetChildWndList().end(); if(!Empty() && m_visible_rgn.x!=-1) { @@ -344,7 +344,7 @@ CUIWindow* CUIScrollView::GetItem (u32 idx) if(m_pad->GetChildWndList().size()<=idx) return NULL; - WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); + auto it = m_pad->GetChildWndList().begin(); std::advance(it, idx); return (*it); } @@ -368,7 +368,7 @@ void CUIScrollView::SetSelected (CUIWindow* w) { if(!m_flags.test(eItemsSelectabe)) return; - for(WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) + for(auto it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) { smart_cast(*it)->SetSelected(*it==w); } @@ -378,7 +378,7 @@ CUIWindow* CUIScrollView::GetSelected(){ if(!m_flags.test(eItemsSelectabe)) return NULL; - for(WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) + for(auto it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) { if (smart_cast(*it)->GetSelected()) return *it; @@ -389,7 +389,7 @@ CUIWindow* CUIScrollView::GetSelected(){ void CUIScrollView::UpdateChildrenLenght(){ float len = GetDesiredChildWidth(); - for(WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) + for(auto it = m_pad->GetChildWndList().begin(); m_pad->GetChildWndList().end()!=it; ++it) { (*it)->SetWidth(len); } diff --git a/cs/engine/xrGame/ui/UIStatsPlayerList.cpp b/cs/engine/xrGame/ui/UIStatsPlayerList.cpp index fed799cfe..acc86b977 100644 --- a/cs/engine/xrGame/ui/UIStatsPlayerList.cpp +++ b/cs/engine/xrGame/ui/UIStatsPlayerList.cpp @@ -295,7 +295,7 @@ void CUIStatsPlayerList::Update() R_ASSERT(items.size() == m_pad->GetChildWndList().size()); - WINDOW_LIST_it it = m_pad->GetChildWndList().begin(); + auto it = m_pad->GetChildWndList().begin(); ItemIt itit = items.begin(); for (; it != m_pad->GetChildWndList().end(); it++, itit++) diff --git a/cs/engine/xrGame/ui/UIWindow.cpp b/cs/engine/xrGame/ui/UIWindow.cpp index f0c9c89a4..58c8a670d 100644 --- a/cs/engine/xrGame/ui/UIWindow.cpp +++ b/cs/engine/xrGame/ui/UIWindow.cpp @@ -9,8 +9,6 @@ #include #include "Include/xrRender/UIRender.h" -poolSS< _12b, 128> ui_allocator; - //#define LOG_ALL_WNDS #ifdef LOG_ALL_WNDS int ListWndCount = 0; @@ -160,7 +158,7 @@ CUIWindow::~CUIWindow() void CUIWindow::Draw() { - for(WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end() != it; ++it){ + for(auto it = m_ChildWndList.begin(); m_ChildWndList.end() != it; ++it){ if(!(*it)->IsShown()) continue; if((*it)->GetCustomDraw()) continue; (*it)->Draw (); @@ -200,7 +198,7 @@ void CUIWindow::Update() } } - for(WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it){ + for(auto it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it){ if(!(*it)->IsShown()) continue; (*it)->Update(); } @@ -504,7 +502,7 @@ void CUIWindow::SetKeyboardCapture(CUIWindow* pChildWindow, bool capture_status) void CUIWindow::SendMessage(CUIWindow *pWnd, s16 msg, void *pData) { //оповестить дочерние окна - for(WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) + for(auto it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) { if((*it)->IsEnabled()) (*it)->SendMessage(pWnd,msg,pData); @@ -545,7 +543,7 @@ CUIWindow* CUIWindow::GetChildMouseHandler(){ bool CUIWindow::BringToTop(CUIWindow* pChild) { //найти окно в списке -/* WINDOW_LIST_it it = std::find(m_ChildWndList.begin(), +/* auto it = std::find(m_ChildWndList.begin(), m_ChildWndList.end(), pChild); */ @@ -579,7 +577,7 @@ void CUIWindow::Reset() } void CUIWindow::ResetAll() { - for(WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) + for(auto it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) { (*it)->Reset(); } @@ -620,7 +618,7 @@ void CUIWindow::SetParent(CUIWindow* pNewParent) } void CUIWindow::ShowChildren(bool show){ - for(WINDOW_LIST_it it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) + for(auto it = m_ChildWndList.begin(); m_ChildWndList.end()!=it; ++it) (*it)->Show(show); } diff --git a/cs/engine/xrGame/ui/UIWindow.h b/cs/engine/xrGame/ui/UIWindow.h index fb018c4fa..5d885c04c 100644 --- a/cs/engine/xrGame/ui/UIWindow.h +++ b/cs/engine/xrGame/ui/UIWindow.h @@ -2,63 +2,6 @@ #include "xr_level_controller.h" class CUIWindow; -struct _12b { DWORD _[3]; }; -extern poolSS< _12b, 128> ui_allocator; - - -template -class uialloc { -public: - typedef size_t size_type; - typedef ptrdiff_t difference_type; - typedef T* pointer; - typedef const T* const_pointer; - typedef T& reference; - typedef const T& const_reference; - typedef T value_type; - -public: - template - struct rebind { typedef uialloc<_Other> other; }; -public: - pointer address (reference _Val) const { return (&_Val); } - const_pointer address (const_reference _Val) const { return (&_Val); } - uialloc () { } - uialloc (const uialloc&) { } - template uialloc (const uialloc<_Other>&) { } - template uialloc& operator= (const uialloc<_Other>&) { return (*this); } - pointer allocate (size_type n, const void* p=0) const - { VERIFY(1==n); - return (pointer) ui_allocator.create(); - }; - char* __charalloc (size_type n) - { VERIFY (1==n); - return (char*) ui_allocator.create(); - }; - void deallocate (pointer p, size_type n) const - { - VERIFY(1==n); - _12b* p_ = (_12b*)p; - ui_allocator.destroy (p_); - } - void deallocate (void* p, size_type n) const - { - VERIFY(1==n); - _12b* p_ = (_12b*)p; - ui_allocator.destroy (p_); - } - void construct (pointer p, const T& _Val) { std::_Construct(p, _Val); } - void destroy (pointer p) { std::_Destroy(p); } - size_type max_size () const { size_type _Count = (size_type)(-1) / sizeof (T); return (0 < _Count ? _Count : 1); } -}; -template inline bool operator==(const uialloc<_Ty>&, const uialloc<_Other>&) { return (true); } -template inline bool operator!=(const uialloc<_Ty>&, const uialloc<_Other>&) { return (false); } - -template -class ui_list : public std::list >{ public: u32 size() const {return (u32)__super::size(); } }; - -#define DEF_UILIST(N,T) typedef ui_list< T > N; typedef N::iterator N##_it; - ////////////////////////////////////////////////////////////////////////// #include "UIMessages.h" @@ -176,8 +119,7 @@ class CUIWindow : public CUISimpleWindow return m_pFont; else return m_pParentWnd->GetFont();} - - DEF_UILIST (WINDOW_LIST, CUIWindow*); + using WINDOW_LIST = xr_vector; WINDOW_LIST& GetChildWndList () {return m_ChildWndList; } @@ -199,7 +141,7 @@ class CUIWindow : public CUISimpleWindow IC void SetCustomDraw (bool b) {m_bCustomDraw = b;} protected: - IC void SafeRemoveChild(CUIWindow* child) {WINDOW_LIST_it it = std::find(m_ChildWndList.begin(),m_ChildWndList.end(),child); if(it!=m_ChildWndList.end())m_ChildWndList.erase(it);}; + IC void SafeRemoveChild(CUIWindow* child) {auto it = std::find(m_ChildWndList.begin(),m_ChildWndList.end(),child); if(it!=m_ChildWndList.end())m_ChildWndList.erase(it);}; shared_str m_windowName; //список дочерних окон diff --git a/cs/engine/xrGame/xrGame.vcxproj b/cs/engine/xrGame/xrGame.vcxproj index 6bda29d16..2d11022ee 100644 --- a/cs/engine/xrGame/xrGame.vcxproj +++ b/cs/engine/xrGame/xrGame.vcxproj @@ -17,25 +17,25 @@ {200652A6-043E-4634-8837-87983B3BD5E0} xrGame - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 false MultiByte false DynamicLibrary - v140 + v142 false MultiByte DynamicLibrary - v140 + v142 false MultiByte @@ -902,7 +902,6 @@ - @@ -3023,11 +3022,6 @@ - - true - true - true - @@ -5648,4 +5642,4 @@ - \ No newline at end of file + diff --git a/cs/engine/xrGame/xrGame.vcxproj.filters b/cs/engine/xrGame/xrGame.vcxproj.filters index 0dd88b106..5497970fd 100644 --- a/cs/engine/xrGame/xrGame.vcxproj.filters +++ b/cs/engine/xrGame/xrGame.vcxproj.filters @@ -2047,9 +2047,6 @@ {4b0e6b4d-213c-454c-81ad-e76d9ea663fc} - - {19b5c856-80c2-4ef7-9341-1dc80ed438c6} - {8aaca69b-d340-4e88-82fa-d525d10f3422} @@ -6003,9 +6000,6 @@ Core\Common\Registry - - Core\Common\debug\make_final - Core\Common\debug\static_cast_checked @@ -9710,9 +9704,6 @@ Core\Common\Registry - - Core\Common\debug\make_final - Core\Common\debug\static_cast_checked diff --git a/cs/engine/xrGameSpy/xrGameSpy.vcxproj b/cs/engine/xrGameSpy/xrGameSpy.vcxproj index 545510d6f..5de9a9b10 100644 --- a/cs/engine/xrGameSpy/xrGameSpy.vcxproj +++ b/cs/engine/xrGameSpy/xrGameSpy.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Mixed + Win32 + Release Win32 @@ -13,18 +17,23 @@ {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7} Win32Proj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 + MultiByte + + + DynamicLibrary + v142 MultiByte @@ -40,10 +49,18 @@ + + + + + false + + false + false @@ -76,6 +93,35 @@ MachineX86 + + + Disabled + $(SolutionDir)sdk\include;%(AdditionalIncludeDirectories) + WIN32;DEBUG;_WINDOWS;_USRDLL;XRGAMESPY_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDLL + false + Fast + false + Use + $(IntDir)$(ProjectName).pch + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + ProgramDatabase + 4996;%(DisableSpecificWarnings) + + + $(SolutionDir)sdk\libraries;$(SolutionDir)libraries\$(Configuration);%(AdditionalLibraryDirectories) + true + + Windows + true + MachineX86 + + MaxSpeed @@ -120,6 +166,9 @@ + + + TurnOffAllWarnings TurnOffAllWarnings @@ -128,12 +177,17 @@ TurnOffAllWarnings + + + true + + true @@ -142,18 +196,25 @@ + + + + + true + + true @@ -162,12 +223,17 @@ + + + true + + true @@ -177,6 +243,9 @@ + true + + true @@ -185,6 +254,9 @@ + true + + true @@ -193,6 +265,9 @@ + true + + true @@ -201,6 +276,9 @@ + true + + true @@ -209,42 +287,57 @@ + + + + + + + + + + + + + true + + true @@ -253,6 +346,9 @@ + true + + true @@ -261,72 +357,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + TurnOffAllWarnings TurnOffAllWarnings @@ -335,48 +456,64 @@ TurnOffAllWarnings + + + + + + + + + + + + + + + + @@ -384,6 +521,7 @@ Create + Create Create diff --git a/cs/engine/xrNetServer/xrNetServer.vcxproj b/cs/engine/xrNetServer/xrNetServer.vcxproj index b085af651..3e8f84efe 100644 --- a/cs/engine/xrNetServer/xrNetServer.vcxproj +++ b/cs/engine/xrNetServer/xrNetServer.vcxproj @@ -16,22 +16,22 @@ {435BAC9A-B225-457D-AB40-C9BD0CC8838C} - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 false DynamicLibrary - v140 + v142 false DynamicLibrary - v140 + v142 false MultiByte true diff --git a/cs/engine/xrParticles/xrParticles.vcxproj b/cs/engine/xrParticles/xrParticles.vcxproj index 71e4252c7..d75dccefa 100644 --- a/cs/engine/xrParticles/xrParticles.vcxproj +++ b/cs/engine/xrParticles/xrParticles.vcxproj @@ -16,22 +16,22 @@ {94A1C366-3D19-48E6-8170-4ADC2E70DF97} - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 false DynamicLibrary - v140 + v142 false DynamicLibrary - v140 + v142 false MultiByte true diff --git a/cs/engine/xrServerEntities/associative_vector_inline.h b/cs/engine/xrServerEntities/associative_vector_inline.h index 1b9a387cb..1daedec6b 100644 --- a/cs/engine/xrServerEntities/associative_vector_inline.h +++ b/cs/engine/xrServerEntities/associative_vector_inline.h @@ -37,7 +37,7 @@ IC _associative_vector::associative_vector (const key_compare &predi TEMPLATE_SPECIALIZATION template -IC _associative_vector::associative_vector (_iterator_type first, _iterator_type last, const key_compare &predicate = key_compare(), const allocator_type &allocator = allocator_type()) : +IC _associative_vector::associative_vector (_iterator_type first, _iterator_type last, const key_compare &predicate, const allocator_type &allocator) : // inherited (first,last,allocator), inherited (first,last), value_compare (predicate) diff --git a/cs/engine/xrServerEntities/xrServer_Object_Base.cpp b/cs/engine/xrServerEntities/xrServer_Object_Base.cpp index eb1ce2a18..5d9286856 100644 --- a/cs/engine/xrServerEntities/xrServer_Object_Base.cpp +++ b/cs/engine/xrServerEntities/xrServer_Object_Base.cpp @@ -37,7 +37,7 @@ LPCSTR script_section = "script"; LPCSTR current_version = "current_server_entity_version"; -IC u16 script_server_object_version () +u16 script_server_object_version () { static bool initialized = false; static u16 script_version = 0; diff --git a/cs/engine/xrSound/xrSound.vcxproj b/cs/engine/xrSound/xrSound.vcxproj index e8716472e..5b021900b 100644 --- a/cs/engine/xrSound/xrSound.vcxproj +++ b/cs/engine/xrSound/xrSound.vcxproj @@ -17,23 +17,23 @@ {CCCA7859-EB86-493E-9B53-C4235F45B3C5} Win32Proj - 8.1 + 10.0.19041.0 DynamicLibrary - v140 + v142 MultiByte DynamicLibrary - v140 + v142 MultiByte true DynamicLibrary - v140 + v142 MultiByte