diff --git a/.gitignore b/.gitignore index 299d9b6c..52e30b57 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,8 @@ Debug Release JITDebug JITRelease +JITDebugBinLog +JITReleaseBinLog # Files generated by Mac OS X Finder .DS_Store diff --git a/amxmodx/msvc10/amxmodx_mm.sln b/amxmodx/msvc10/amxmodx_mm.sln index 83e9351f..0c6761cd 100644 --- a/amxmodx/msvc10/amxmodx_mm.sln +++ b/amxmodx/msvc10/amxmodx_mm.sln @@ -3,14 +3,64 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx_mm", "amxmodx_mm.vcxproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{1A75873D-E05D-4F07-A4E2-28DC1BB03226}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cstrike", "..\..\dlls\cstrike\cstrike\msvc10\cstrike.vcxproj", "{AB148B92-4F47-42E6-8268-AB4E588EC6A2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csx", "..\..\dlls\cstrike\csx\msvc10\csx.vcxproj", "{1DC4A99A-F23F-4AAE-881C-79D157C91155}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinCSX", "..\..\dlls\cstrike\csx\WinCSX\msvc10\WinCSX.vcxproj", "{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dodfun", "..\..\dlls\dod\dodfun\msvc10\dodfun.vcxproj", "{2742C607-9FAB-47B3-8A13-E999BC6FDB54}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dodx", "..\..\dlls\dod\dodx\msvc10\dodx.vcxproj", "{9008A886-2DD0-443C-B468-AD84868D89B0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "..\..\dlls\engine\msvc10\engine.vcxproj", "{B3F4467B-6148-4EBF-B897-168D81CF8D9B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fakemeta", "..\..\dlls\fakemeta\msvc10\fakemeta.vcxproj", "{5E393C37-22F2-4CA2-9022-6400DC582447}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fun", "..\..\dlls\fun\msvc10\fun.vcxproj", "{43B95C78-8D1A-4D12-B668-2520B38E1DA3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "geoip", "..\..\dlls\geoip\msvc10\geoip.vcxproj", "{036FA046-A6BF-4D80-8986-71FDD1528B55}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hamsandwich", "..\..\dlls\hamsandwich\msvc10\hamsandwich.vcxproj", "{A8B3717F-2663-4099-AE96-AF5B7266FDA8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlx", "..\..\dlls\mysqlx\msvc10\mysqlx.vcxproj", "{7877D370-E48E-4A85-8EE4-131863A5B09F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ns", "..\..\dlls\ns\msvc10\ns.vcxproj", "{5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvault", "..\..\dlls\nvault\msvc10\nvault.vcxproj", "{E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regex", "..\..\dlls\regex\msvc10\regex.vcxproj", "{1D4E991A-7EC1-43C5-90FC-DC9D713052D8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "..\..\dlls\sockets\msvc10\sockets.vcxproj", "{F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\..\dlls\sqlite\msvc10\sqlite.vcxproj", "{4FDFD106-7163-44F0-85C4-9FAFECD14973}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tfcx", "..\..\dlls\tfcx\msvc10\tfcx.vcxproj", "{87519113-8E9D-4C6F-BA1F-55F4D8829E83}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsfun", "..\..\dlls\ts\tsfun\msvc10\tsfun.vcxproj", "{9036672C-71DB-4DC9-90CC-B14C02465497}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsx", "..\..\dlls\ts\tsx\msvc10\tsx.vcxproj", "{7F18E00C-6271-4CAB-B18A-746BE3EC68E7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compiler", "Compiler", "{0BB61E37-4EA5-4B18-A164-6CB4810E50F4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxxpc", "..\..\compiler\amxxpc\amxxpc.vcxproj", "{39412290-D01C-472F-A439-AB5592A04C08}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpc300", "..\..\compiler\libpc300\libpc300.vcxproj", "{19B72687-080B-437A-917A-12AEB0031635}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 JITDebug|Win32 = JITDebug|Win32 JITDebugBinLog|Win32 = JITDebugBinLog|Win32 JITRelease|Win32 = JITRelease|Win32 JITReleaseBinLog|Win32 = JITReleaseBinLog|Win32 + Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug|Win32.ActiveCfg = JITDebugBinLog|Win32 + {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug|Win32.Build.0 = JITDebugBinLog|Win32 {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug|Win32.ActiveCfg = JITDebug|Win32 {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug|Win32.Build.0 = JITDebug|Win32 {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog|Win32.ActiveCfg = JITDebugBinLog|Win32 @@ -19,8 +69,285 @@ Global {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease|Win32.Build.0 = JITRelease|Win32 {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog|Win32.ActiveCfg = JITReleaseBinLog|Win32 {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog|Win32.Build.0 = JITReleaseBinLog|Win32 + {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release|Win32.ActiveCfg = JITReleaseBinLog|Win32 + {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release|Win32.Build.0 = JITReleaseBinLog|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug|Win32.ActiveCfg = Debug|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug|Win32.Build.0 = Debug|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.JITDebug|Win32.Build.0 = Debug|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.JITRelease|Win32.ActiveCfg = Release|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.JITRelease|Win32.Build.0 = Release|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Release|Win32.ActiveCfg = Release|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Release|Win32.Build.0 = Release|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug|Win32.ActiveCfg = Debug|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug|Win32.Build.0 = Debug|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.JITDebug|Win32.Build.0 = Debug|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.JITRelease|Win32.ActiveCfg = Release|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.JITRelease|Win32.Build.0 = Release|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release|Win32.ActiveCfg = Release|Win32 + {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release|Win32.Build.0 = Release|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Debug|Win32.ActiveCfg = Debug|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Debug|Win32.Build.0 = Debug|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.JITDebug|Win32.Build.0 = Debug|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.JITRelease|Win32.ActiveCfg = Release|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.JITRelease|Win32.Build.0 = Release|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Release|Win32.ActiveCfg = Release|Win32 + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Release|Win32.Build.0 = Release|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.Debug|Win32.ActiveCfg = Debug|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.Debug|Win32.Build.0 = Debug|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.JITDebug|Win32.Build.0 = Debug|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.JITRelease|Win32.ActiveCfg = Release|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.JITRelease|Win32.Build.0 = Release|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.Release|Win32.ActiveCfg = Release|Win32 + {2742C607-9FAB-47B3-8A13-E999BC6FDB54}.Release|Win32.Build.0 = Release|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.Debug|Win32.Build.0 = Debug|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.JITDebug|Win32.Build.0 = Debug|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.JITRelease|Win32.ActiveCfg = Release|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.JITRelease|Win32.Build.0 = Release|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.Release|Win32.ActiveCfg = Release|Win32 + {9008A886-2DD0-443C-B468-AD84868D89B0}.Release|Win32.Build.0 = Release|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.Debug|Win32.ActiveCfg = Debug|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.Debug|Win32.Build.0 = Debug|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.JITDebug|Win32.Build.0 = Debug|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.JITRelease|Win32.ActiveCfg = Release|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.JITRelease|Win32.Build.0 = Release|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.Release|Win32.ActiveCfg = Release|Win32 + {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.Release|Win32.Build.0 = Release|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.Debug|Win32.ActiveCfg = Debug|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.Debug|Win32.Build.0 = Debug|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.JITDebug|Win32.Build.0 = Debug|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.JITRelease|Win32.ActiveCfg = Release|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.JITRelease|Win32.Build.0 = Release|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.Release|Win32.ActiveCfg = Release|Win32 + {5E393C37-22F2-4CA2-9022-6400DC582447}.Release|Win32.Build.0 = Release|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.Debug|Win32.ActiveCfg = Debug|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.Debug|Win32.Build.0 = Debug|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.JITDebug|Win32.Build.0 = Debug|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.JITRelease|Win32.ActiveCfg = Release|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.JITRelease|Win32.Build.0 = Release|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.Release|Win32.ActiveCfg = Release|Win32 + {43B95C78-8D1A-4D12-B668-2520B38E1DA3}.Release|Win32.Build.0 = Release|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.Debug|Win32.ActiveCfg = Debug|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.Debug|Win32.Build.0 = Debug|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.JITDebug|Win32.Build.0 = Debug|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.JITRelease|Win32.ActiveCfg = Release|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.JITRelease|Win32.Build.0 = Release|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.Release|Win32.ActiveCfg = Release|Win32 + {036FA046-A6BF-4D80-8986-71FDD1528B55}.Release|Win32.Build.0 = Release|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.Debug|Win32.Build.0 = Debug|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.JITDebug|Win32.Build.0 = Debug|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.JITRelease|Win32.ActiveCfg = Release|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.JITRelease|Win32.Build.0 = Release|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.Release|Win32.ActiveCfg = Release|Win32 + {A8B3717F-2663-4099-AE96-AF5B7266FDA8}.Release|Win32.Build.0 = Release|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.Debug|Win32.ActiveCfg = Debug|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.Debug|Win32.Build.0 = Debug|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.JITDebug|Win32.Build.0 = Debug|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.JITRelease|Win32.ActiveCfg = Release|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.JITRelease|Win32.Build.0 = Release|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.Release|Win32.ActiveCfg = Release|Win32 + {7877D370-E48E-4A85-8EE4-131863A5B09F}.Release|Win32.Build.0 = Release|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.Debug|Win32.ActiveCfg = Debug|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.Debug|Win32.Build.0 = Debug|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.JITDebug|Win32.Build.0 = Debug|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.JITRelease|Win32.ActiveCfg = Release|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.JITRelease|Win32.Build.0 = Release|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.Release|Win32.ActiveCfg = Release|Win32 + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.Release|Win32.Build.0 = Release|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.Debug|Win32.ActiveCfg = Debug|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.Debug|Win32.Build.0 = Debug|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.JITDebug|Win32.Build.0 = Debug|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.JITRelease|Win32.ActiveCfg = Release|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.JITRelease|Win32.Build.0 = Release|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.Release|Win32.ActiveCfg = Release|Win32 + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328}.Release|Win32.Build.0 = Release|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.Debug|Win32.ActiveCfg = Debug|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.Debug|Win32.Build.0 = Debug|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.JITDebug|Win32.Build.0 = Debug|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.JITRelease|Win32.ActiveCfg = Release|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.JITRelease|Win32.Build.0 = Release|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.Release|Win32.ActiveCfg = Release|Win32 + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8}.Release|Win32.Build.0 = Release|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.Debug|Win32.ActiveCfg = Debug|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.Debug|Win32.Build.0 = Debug|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.JITDebug|Win32.Build.0 = Debug|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.JITRelease|Win32.ActiveCfg = Release|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.JITRelease|Win32.Build.0 = Release|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.Release|Win32.ActiveCfg = Release|Win32 + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.Release|Win32.Build.0 = Release|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.Debug|Win32.ActiveCfg = Debug|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.Debug|Win32.Build.0 = Debug|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.JITDebug|Win32.Build.0 = Debug|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.JITRelease|Win32.ActiveCfg = Release|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.JITRelease|Win32.Build.0 = Release|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.Release|Win32.ActiveCfg = Release|Win32 + {4FDFD106-7163-44F0-85C4-9FAFECD14973}.Release|Win32.Build.0 = Release|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.Debug|Win32.ActiveCfg = Debug|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.Debug|Win32.Build.0 = Debug|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.JITDebug|Win32.Build.0 = Debug|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.JITRelease|Win32.ActiveCfg = Release|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.JITRelease|Win32.Build.0 = Release|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.Release|Win32.ActiveCfg = Release|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.Release|Win32.Build.0 = Release|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.Debug|Win32.ActiveCfg = Debug|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.Debug|Win32.Build.0 = Debug|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.JITDebug|Win32.Build.0 = Debug|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.JITRelease|Win32.ActiveCfg = Release|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.JITRelease|Win32.Build.0 = Release|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.Release|Win32.ActiveCfg = Release|Win32 + {9036672C-71DB-4DC9-90CC-B14C02465497}.Release|Win32.Build.0 = Release|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.Debug|Win32.ActiveCfg = Debug|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.Debug|Win32.Build.0 = Debug|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.JITDebug|Win32.Build.0 = Debug|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.JITRelease|Win32.ActiveCfg = Release|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.JITRelease|Win32.Build.0 = Release|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.Release|Win32.ActiveCfg = Release|Win32 + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.Release|Win32.Build.0 = Release|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.Debug|Win32.ActiveCfg = Debug|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.Debug|Win32.Build.0 = Debug|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.JITDebug|Win32.Build.0 = Debug|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.JITRelease|Win32.ActiveCfg = Release|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.JITRelease|Win32.Build.0 = Release|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.Release|Win32.ActiveCfg = Release|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.Release|Win32.Build.0 = Release|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Debug|Win32.ActiveCfg = Debug|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Debug|Win32.Build.0 = Debug|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.JITDebug|Win32.ActiveCfg = Debug|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.JITDebug|Win32.Build.0 = Debug|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.JITDebugBinLog|Win32.Build.0 = Debug|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.JITRelease|Win32.ActiveCfg = Release|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.JITRelease|Win32.Build.0 = Release|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.JITReleaseBinLog|Win32.Build.0 = Release|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Release|Win32.ActiveCfg = Release|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {AB148B92-4F47-42E6-8268-AB4E588EC6A2} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {1DC4A99A-F23F-4AAE-881C-79D157C91155} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {39A1E5DD-81A1-441D-B99A-E50A01DB05D7} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {2742C607-9FAB-47B3-8A13-E999BC6FDB54} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {9008A886-2DD0-443C-B468-AD84868D89B0} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {B3F4467B-6148-4EBF-B897-168D81CF8D9B} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {5E393C37-22F2-4CA2-9022-6400DC582447} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {43B95C78-8D1A-4D12-B668-2520B38E1DA3} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {036FA046-A6BF-4D80-8986-71FDD1528B55} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {A8B3717F-2663-4099-AE96-AF5B7266FDA8} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {7877D370-E48E-4A85-8EE4-131863A5B09F} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {E2827EDF-F83F-4D54-8FD1-F47BA1E4D328} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {1D4E991A-7EC1-43C5-90FC-DC9D713052D8} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {4FDFD106-7163-44F0-85C4-9FAFECD14973} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {87519113-8E9D-4C6F-BA1F-55F4D8829E83} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {9036672C-71DB-4DC9-90CC-B14C02465497} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {7F18E00C-6271-4CAB-B18A-746BE3EC68E7} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226} + {39412290-D01C-472F-A439-AB5592A04C08} = {0BB61E37-4EA5-4B18-A164-6CB4810E50F4} + {19B72687-080B-437A-917A-12AEB0031635} = {0BB61E37-4EA5-4B18-A164-6CB4810E50F4} + EndGlobalSection EndGlobal diff --git a/amxmodx/sdk/amxxmodule.cpp b/amxmodx/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/amxmodx/sdk/amxxmodule.cpp +++ b/amxmodx/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/compiler/amxxpc/amxxpc.vcxproj b/compiler/amxxpc/amxxpc.vcxproj index 06fc914e..2340bddb 100644 --- a/compiler/amxxpc/amxxpc.vcxproj +++ b/compiler/amxxpc/amxxpc.vcxproj @@ -47,10 +47,13 @@ + + $(Configuration)\ + Disabled - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;AMX_ANSIONLY;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -59,6 +62,7 @@ Level3 EditAndContinue + ..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories) zlib.lib;%(AdditionalDependencies) @@ -71,7 +75,7 @@ - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;AMX_ANSIONLY;%(PreprocessorDefinitions) MultiThreaded Default false @@ -79,6 +83,7 @@ Level3 ProgramDatabase + ..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories) zlib.lib;%(AdditionalDependencies) diff --git a/dlls/cstrike/cstrike/sdk/amxxmodule.cpp b/dlls/cstrike/cstrike/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/cstrike/cstrike/sdk/amxxmodule.cpp +++ b/dlls/cstrike/cstrike/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/cstrike/csx/sdk/amxxmodule.cpp b/dlls/cstrike/csx/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/cstrike/csx/sdk/amxxmodule.cpp +++ b/dlls/cstrike/csx/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/dod/dodfun/sdk/amxxmodule.cpp b/dlls/dod/dodfun/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/dod/dodfun/sdk/amxxmodule.cpp +++ b/dlls/dod/dodfun/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/dod/dodx/sdk/amxxmodule.cpp b/dlls/dod/dodx/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/dod/dodx/sdk/amxxmodule.cpp +++ b/dlls/dod/dodx/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/engine/sdk/amxxmodule.cpp b/dlls/engine/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/engine/sdk/amxxmodule.cpp +++ b/dlls/engine/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/fakemeta/sdk/amxxmodule.cpp b/dlls/fakemeta/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/fakemeta/sdk/amxxmodule.cpp +++ b/dlls/fakemeta/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/fun/sdk/amxxmodule.cpp b/dlls/fun/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/fun/sdk/amxxmodule.cpp +++ b/dlls/fun/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/geoip/sdk/amxxmodule.cpp b/dlls/geoip/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/geoip/sdk/amxxmodule.cpp +++ b/dlls/geoip/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/hamsandwich/msvc10/hamsandwich.vcxproj b/dlls/hamsandwich/msvc10/hamsandwich.vcxproj index 32f6d5f5..4cfb4428 100644 --- a/dlls/hamsandwich/msvc10/hamsandwich.vcxproj +++ b/dlls/hamsandwich/msvc10/hamsandwich.vcxproj @@ -11,7 +11,7 @@ - {5E393C37-22F2-4CA2-9022-6400DC582447} + {A8B3717F-2663-4099-AE96-AF5B7266FDA8} hamsandwich Win32Proj @@ -52,8 +52,8 @@ Disabled - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\;..\sdk;..\..\..\public\amtl;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;HAMSANDWICH_EXPORTS; HAVE_STDINT_H;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -71,13 +71,14 @@ MachineX86 - copy $(OutDir)hamsandwich_amxx.dll c:\hlds\cstrike\addons\amxmodx\modules + + - ..\;..\sdk;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\;..\sdk;..\..\..\public\amtl;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;HAMSANDWICH_EXPORTS; HAVE_STDINT_H;%(PreprocessorDefinitions) MultiThreaded false diff --git a/dlls/hamsandwich/sdk/amxxmodule.cpp b/dlls/hamsandwich/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100644 --- a/dlls/hamsandwich/sdk/amxxmodule.cpp +++ b/dlls/hamsandwich/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/mysqlx/msvc10/mysqlx.vcxproj b/dlls/mysqlx/msvc10/mysqlx.vcxproj index 91917814..5b31016f 100644 --- a/dlls/mysqlx/msvc10/mysqlx.vcxproj +++ b/dlls/mysqlx/msvc10/mysqlx.vcxproj @@ -52,7 +52,7 @@ Disabled - ..\;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories) + ..\;..\..\..\..\mysql-5.0\include;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER;%(PreprocessorDefinitions) true EnableFastChecks @@ -64,7 +64,7 @@ ProgramDatabase - wsock32.lib;$(MYSQL5)\lib\opt\mysqlclient.lib;%(AdditionalDependencies) + wsock32.lib;..\..\..\..\mysql-5.0\lib\opt\mysqlclient.lib;%(AdditionalDependencies) LIBCMT;%(IgnoreSpecificDefaultLibraries) true $(OutDir)mysql2.pdb @@ -75,7 +75,7 @@ - ..\;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories) + ..\;..\..\..\..\mysql-5.0\include;..\mysql;..\sdk;..\thread;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\public;$(MYSQL5)\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER;%(PreprocessorDefinitions) MultiThreaded false @@ -85,7 +85,7 @@ ProgramDatabase - wsock32.lib;$(MYSQL5)\lib\opt\mysqlclient.lib;%(AdditionalDependencies) + wsock32.lib;..\..\..\..\mysql-5.0\lib\opt\mysqlclient.lib;%(AdditionalDependencies) %(IgnoreSpecificDefaultLibraries) true Windows diff --git a/dlls/mysqlx/sdk/amxxmodule.cpp b/dlls/mysqlx/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/mysqlx/sdk/amxxmodule.cpp +++ b/dlls/mysqlx/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/ns/sdk/amxxmodule.cpp b/dlls/ns/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/ns/sdk/amxxmodule.cpp +++ b/dlls/ns/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/nvault/sdk/amxxmodule.cpp b/dlls/nvault/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/nvault/sdk/amxxmodule.cpp +++ b/dlls/nvault/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/regex/sdk/amxxmodule.cpp b/dlls/regex/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/regex/sdk/amxxmodule.cpp +++ b/dlls/regex/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/sockets/sdk/amxxmodule.cpp b/dlls/sockets/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/sockets/sdk/amxxmodule.cpp +++ b/dlls/sockets/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/sqlite/sdk/amxxmodule.cpp b/dlls/sqlite/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/sqlite/sdk/amxxmodule.cpp +++ b/dlls/sqlite/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/tfcx/sdk/amxxmodule.cpp b/dlls/tfcx/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/tfcx/sdk/amxxmodule.cpp +++ b/dlls/tfcx/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/ts/tsfun/sdk/amxxmodule.cpp b/dlls/ts/tsfun/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/ts/tsfun/sdk/amxxmodule.cpp +++ b/dlls/ts/tsfun/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0); diff --git a/dlls/ts/tsx/sdk/amxxmodule.cpp b/dlls/ts/tsx/sdk/amxxmodule.cpp index 7de02e6e..367e064e 100755 --- a/dlls/ts/tsx/sdk/amxxmodule.cpp +++ b/dlls/ts/tsx/sdk/amxxmodule.cpp @@ -2712,6 +2712,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...) // Makes sure compiler reports errors when macros are invalid void ValidateMacros_DontCallThis_Smiley() { + const cell str[] = { 's', 't', 'r', '\0' }; MF_BuildPathname("str", "str", 0); MF_BuildPathnameR(NULL, 0, "%d", 0); MF_FormatAmxString(NULL, 0, 0, NULL); @@ -2724,7 +2725,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindScriptByName("str"); MF_SetAmxString(NULL, 0, "str", 0); MF_SetAmxStringUTF8Char(NULL, 0, "str", 0, 0); - MF_SetAmxStringUTF8Cell(NULL, 0, "str", 0, 0); + MF_SetAmxStringUTF8Cell(NULL, 0, str, 0, 0); MF_GetAmxString(NULL, 0, 0, 0); MF_GetAmxStringLen(NULL); MF_CopyAmxMemory(NULL, NULL, 0);