diff --git a/NOTICE.txt b/NOTICE.txt index 09e18fe7..480f0b5b 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,14 +1,16 @@ -We now use svn:keywords "Id" on all .c/.cpp/.h/.sp/.inc files. Please make sure your client is configured properly. +We now use svn:keywords "Id" on all .c/.cpp/.h/.inc/.sp/ files. +Please make sure your client is configured properly. WINDOWS: - Open your Application Data folder. - Windows XP/2000: C:\Documents and Settings\\Application Data - Windows Vista: C:\Users\\AppData\Roaming + - Open your Application Data directory. + Windows XP/2000: C:\Documents and Settings\\Application Data + Windows Vista: C:\Users\\AppData\Roaming - Now go to Subversion. Open the "config" file with a text editor. + - Now go to the Subversion directory. + - Open the "config" file with a text editor. LINUX: - Open ~/.subversion/config with your favorite text editor. + - Open ~/.subversion/config with your favorite text editor. Under [miscellany], uncomment this line: # enable-auto-props = yes @@ -17,5 +19,18 @@ Under [auto-props], add these lines: *.c = svn:keywords=Id *.cpp = svn:keywords=Id *.h = svn:keywords=Id -*.sp = svn:keywords=Id *.inc = svn:keywords=Id +*.sp = svn:keywords=Id + + +If you find a file with one of the above extensions that does not have the svn:keywords property... + +TORTOISE SVN: + - Right click on the file(s) that do not have the property. + - In the context menu that appears, select TortoiseSVN -> Properties. + - A properties window should appear. Click the Add button. + - Select "svn:keywords" from the "Property name" combo box and type "Id" in the "Property value" text area. + - Click OK on both windows and commit the change(s). + +CLI SVN CLIENT: + - Execute the following command: svn propset svn:keywords Id diff --git a/core/msvc9/sourcemod_mm.sln b/core/msvc9/sourcemod_mm.sln deleted file mode 100644 index 119c8a02..00000000 --- a/core/msvc9/sourcemod_mm.sln +++ /dev/null @@ -1,47 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sourcemod_mm", "sourcemod_mm.vcproj", "{E39527CD-7CAB-4420-97CC-DA1B93B260BC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - CrazyDebug - Old Metamod|Win32 = CrazyDebug - Old Metamod|Win32 - CrazyDebug - Orange Box|Win32 = CrazyDebug - Orange Box|Win32 - CrazyDebug|Win32 = CrazyDebug|Win32 - Debug - Episode 1|Win32 = Debug - Episode 1|Win32 - Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32 - Debug - Orange Box|Win32 = Debug - Orange Box|Win32 - Debug|Win32 = Debug|Win32 - Release - Episode 1|Win32 = Release - Episode 1|Win32 - Release - Old Metamod|Win32 = Release - Old Metamod|Win32 - Release - Orange Box|Win32 = Release - Orange Box|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Old Metamod|Win32.ActiveCfg = CrazyDebug - Old Metamod|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Old Metamod|Win32.Build.0 = CrazyDebug - Old Metamod|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Orange Box|Win32.ActiveCfg = CrazyDebug - Orange Box|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Orange Box|Win32.Build.0 = CrazyDebug - Orange Box|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug|Win32.ActiveCfg = CrazyDebug|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug|Win32.Build.0 = CrazyDebug|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Episode 1|Win32.ActiveCfg = Debug - Episode 1|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Episode 1|Win32.Build.0 = Debug - Episode 1|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug|Win32.ActiveCfg = CrazyDebug|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug|Win32.Build.0 = CrazyDebug|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Episode 1|Win32.ActiveCfg = Release - Episode 1|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Episode 1|Win32.Build.0 = Release - Episode 1|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release|Win32.ActiveCfg = Debug - Old Metamod|Win32 - {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release|Win32.Build.0 = Debug - Old Metamod|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/core/msvc9/sourcemod_mm.vcproj b/core/msvc9/sourcemod_mm.vcproj deleted file mode 100644 index ca59ee5d..00000000 --- a/core/msvc9/sourcemod_mm.vcproj +++ /dev/null @@ -1,1705 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/smn_timers.cpp b/core/smn_timers.cpp index 43ec3e5d..be8bc64f 100644 --- a/core/smn_timers.cpp +++ b/core/smn_timers.cpp @@ -343,3 +343,4 @@ REGISTER_NATIVES(timernatives) {"GetTickInterval", smn_GetTickInterval}, {NULL, NULL} }; + diff --git a/public/jit/x86/x86_macros.h b/public/jit/x86/x86_macros.h index 1cea3502..30335224 100644 --- a/public/jit/x86/x86_macros.h +++ b/public/jit/x86/x86_macros.h @@ -112,6 +112,7 @@ #define IA32_MOV_REG8_RM8 0x8A // encoding is /r #define IA32_MOV_RM8_REG8 0x88 // encoding is /r #define IA32_MOV_RM_IMM32 0xC7 // encoding is /0 +#define IA32_MOV_EAX_MEM 0xA1 // encoding is #define IA32_CMP_RM_IMM32 0x81 // encoding is /7 #define IA32_CMP_RM_IMM8 0x83 // encoding is /7 #define IA32_CMP_AL_IMM32 0x3C // no extra encoding @@ -784,6 +785,12 @@ inline void IA32_Push_Rm_Disp8_ESP(JitWriter *jit, jit_int8_t disp8) * Moving from REGISTER/MEMORY to REGISTER */ +inline void IA32_Mov_Eax_Mem(JitWriter *jit, jit_uint32_t mem) +{ + jit->write_ubyte(IA32_MOV_EAX_MEM); + jit->write_uint32(mem); +} + inline void IA32_Mov_Reg_Rm(JitWriter *jit, jit_uint8_t dest, jit_uint8_t src, jit_uint8_t mode) { jit->write_ubyte(IA32_MOV_REG_RM);