diff --git a/.hgignore b/.hgignore index a713c6bf..9964a09b 100644 --- a/.hgignore +++ b/.hgignore @@ -6,6 +6,7 @@ # Files generated by Visual Studio \.aps$ \.ncb$ +\.sdf$ \.suo$ \.user$ diff --git a/.hgtags b/.hgtags index bbc1693a..675107b2 100644 --- a/.hgtags +++ b/.hgtags @@ -7,3 +7,4 @@ a71318396392e3c6d0ff31e069a60fbde59e0cea sourcemod-1.3.0 3f33d01fcc28b509bed30f7be07ed215cc000538 sourcemod-1.3.1 a3e8f7a7fdf7f012dd02ad491a2e1ccdad151687 sourcemod-1.3.2 c5062ca8283033cf33f45da6f19e486ca10835ff sourcemod-1.3.3 +4d6afc42522c8f416dc45be7af7b145507b00630 sourcemod-1.3.4 diff --git a/changelog.txt b/changelog.txt index 43becd46..556cd6f0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,23 @@ SourceMod Changelog ---------------------------- +SourceMod 1.3.4 [2010-07-18] + +URL: http://wiki.alliedmods.net/SourceMod_1.3.4_Release_Notes + +User Changes: + + - Support for latest TF update (bug 4506). + - Support for latest L4D2 update (bug 4509). + +Developer Changes: + + - Added FindFlagChar native (bug 3776). + - Added GetConVarDefault native (bug 4502). + - Added forward for TF's GetHoliday function (bug 4462). + +---------------------------- + SourceMod 1.3.3 [2010-06-23] URL: http://wiki.alliedmods.net/SourceMod_1.3.3_Release_Notes diff --git a/core/smn_console.cpp b/core/smn_console.cpp index b2020e15..e89a1f9f 100644 --- a/core/smn_console.cpp +++ b/core/smn_console.cpp @@ -187,7 +187,7 @@ private: KTrie m_CmdFlags; } s_CommandFlagsHelper; -#if SOURCE_ENGINE >= SE_ORANGEBOX +#if SOURCE_ENGINE < SE_ORANGEBOX static void ReplicateConVar(ConVar *pConVar) { int maxClients = g_Players.GetMaxClients(); @@ -361,7 +361,7 @@ static cell_t sm_SetConVarNum(IPluginContext *pContext, const cell_t *params) pConVar->SetValue(params[2]); -#if SOURCE_ENGINE >= SE_ORANGEBOX +#if SOURCE_ENGINE < SE_ORANGEBOX /* Should we replicate it? */ if (params[3] && IsFlagSet(pConVar, FCVAR_REPLICATED)) { @@ -410,7 +410,7 @@ static cell_t sm_SetConVarFloat(IPluginContext *pContext, const cell_t *params) float value = sp_ctof(params[2]); pConVar->SetValue(value); -#if SOURCE_ENGINE >= SE_ORANGEBOX +#if SOURCE_ENGINE < SE_ORANGEBOX /* Should we replicate it? */ if (params[3] && IsFlagSet(pConVar, FCVAR_REPLICATED)) { @@ -461,7 +461,7 @@ static cell_t sm_SetConVarString(IPluginContext *pContext, const cell_t *params) pConVar->SetValue(value); -#if SOURCE_ENGINE >= SE_ORANGEBOX +#if SOURCE_ENGINE < SE_ORANGEBOX /* Should we replicate it? */ if (params[3] && IsFlagSet(pConVar, FCVAR_REPLICATED)) { @@ -492,7 +492,7 @@ static cell_t sm_ResetConVar(IPluginContext *pContext, const cell_t *params) pConVar->Revert(); -#if SOURCE_ENGINE >= SE_ORANGEBOX +#if SOURCE_ENGINE < SE_ORANGEBOX /* Should we replicate it? */ if (params[3] && IsFlagSet(pConVar, FCVAR_REPLICATED)) { diff --git a/extensions/tf2/AMBuilder b/extensions/tf2/AMBuilder index 88bc5787..8d0b53e9 100644 --- a/extensions/tf2/AMBuilder +++ b/extensions/tf2/AMBuilder @@ -16,6 +16,7 @@ binary.AddSourceFiles('extensions/tf2', [ 'RegNatives.cpp', 'util.cpp', 'criticals.cpp', + 'holiday.cpp', 'CDetour/detours.cpp', 'sdk/smsdk_ext.cpp', 'asm/asm.c' diff --git a/extensions/tf2/Makefile b/extensions/tf2/Makefile index b5bfc926..9c1df180 100644 --- a/extensions/tf2/Makefile +++ b/extensions/tf2/Makefile @@ -19,7 +19,7 @@ PROJECT = game.tf2 USEMETA = true OBJECTS = sdk/smsdk_ext.cpp extension.cpp natives.cpp RegNatives.cpp criticals.cpp \ - util.cpp CDetour/detours.cpp asm/asm.c + holiday.cpp util.cpp CDetour/detours.cpp asm/asm.c ############################################## ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ### diff --git a/extensions/tf2/criticals.cpp b/extensions/tf2/criticals.cpp index 447b8257..4c523a3d 100644 --- a/extensions/tf2/criticals.cpp +++ b/extensions/tf2/criticals.cpp @@ -188,7 +188,7 @@ DETOUR_DECL_MEMBER0(CalcIsAttackCriticalHelperBow, bool) } } -void InitialiseDetours() +void InitialiseCritDetours() { calcIsAttackCriticalDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelper, "CalcCritical"); calcIsAttackCriticalMeleeDetour = DETOUR_CREATE_MEMBER(CalcIsAttackCriticalHelperMelee, "CalcCriticalMelee"); @@ -222,7 +222,7 @@ void InitialiseDetours() } -void RemoveDetours() +void RemoveCritDetours() { calcIsAttackCriticalDetour->Destroy(); calcIsAttackCriticalMeleeDetour->Destroy(); diff --git a/extensions/tf2/criticals.h b/extensions/tf2/criticals.h index 7c0410a3..8aac6f48 100644 --- a/extensions/tf2/criticals.h +++ b/extensions/tf2/criticals.h @@ -37,8 +37,8 @@ #include #include "CDetour/detours.h" -void InitialiseDetours(); -void RemoveDetours(); +void InitialiseCritDetours(); +void RemoveCritDetours(); extern IForward *g_critForward; diff --git a/extensions/tf2/extension.cpp b/extensions/tf2/extension.cpp index 8add2636..ff71b55d 100644 --- a/extensions/tf2/extension.cpp +++ b/extensions/tf2/extension.cpp @@ -36,6 +36,7 @@ #include "iplayerinfo.h" #include "sm_trie_tpl.h" #include "criticals.h" +#include "holiday.h" #include "CDetour/detours.h" /** @@ -108,10 +109,12 @@ bool TF2Tools::SDK_OnLoad(char *error, size_t maxlength, bool late) playerhelpers->RegisterCommandTargetProcessor(this); g_critForward = forwards->CreateForward("TF2_CalcIsAttackCritical", ET_Hook, 4, NULL, Param_Cell, Param_Cell, Param_String, Param_CellByRef); + g_getHolidayForward = forwards->CreateForward("TF2_OnGetHoliday", ET_Event, 1, NULL, Param_CellByRef); g_pCVar = icvar; - m_DetoursEnabled = false; + m_CritDetoursEnabled = false; + m_GetHolidayDetourEnabled = false; return true; } @@ -155,6 +158,7 @@ void TF2Tools::SDK_OnUnload() plsys->RemovePluginsListener(this); forwards->ReleaseForward(g_critForward); + forwards->ReleaseForward(g_getHolidayForward); } void TF2Tools::SDK_OnAllLoaded() @@ -297,19 +301,29 @@ bool TF2Tools::ProcessCommandTarget(cmd_target_info_t *info) void TF2Tools::OnPluginLoaded(IPlugin *plugin) { - if (!m_DetoursEnabled && g_critForward->GetFunctionCount()) + if (!m_CritDetoursEnabled && g_critForward->GetFunctionCount()) { - InitialiseDetours(); - m_DetoursEnabled = true; + InitialiseCritDetours(); + m_CritDetoursEnabled = true; + } + if (!m_GetHolidayDetourEnabled && g_getHolidayForward->GetFunctionCount()) + { + InitialiseGetHolidayDetour(); + m_GetHolidayDetourEnabled = true; } } void TF2Tools::OnPluginUnloaded(IPlugin *plugin) { - if (m_DetoursEnabled && !g_critForward->GetFunctionCount()) + if (m_CritDetoursEnabled && !g_critForward->GetFunctionCount()) { - RemoveDetours(); - m_DetoursEnabled = false; + RemoveCritDetours(); + m_CritDetoursEnabled = false; + } + if (m_GetHolidayDetourEnabled && !g_getHolidayForward->GetFunctionCount()) + { + RemoveGetHolidayDetour(); + m_GetHolidayDetourEnabled = false; } } int FindResourceEntity() diff --git a/extensions/tf2/extension.h b/extensions/tf2/extension.h index d6878c8e..dd1d374c 100644 --- a/extensions/tf2/extension.h +++ b/extensions/tf2/extension.h @@ -112,7 +112,8 @@ public: virtual bool SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlength, bool late); #endif private: - bool m_DetoursEnabled; + bool m_CritDetoursEnabled; + bool m_GetHolidayDetourEnabled; }; enum TFClassType diff --git a/extensions/tf2/holiday.cpp b/extensions/tf2/holiday.cpp new file mode 100644 index 00000000..b358b742 --- /dev/null +++ b/extensions/tf2/holiday.cpp @@ -0,0 +1,46 @@ +#include "holiday.h" + +CDetour *getHolidayDetour = NULL; + +IForward *g_getHolidayForward = NULL; + +DETOUR_DECL_MEMBER0(GetHoliday, int) +{ + int actualres = DETOUR_MEMBER_CALL(GetHoliday)(); + if (!g_getHolidayForward) + { + g_pSM->LogMessage(myself, "Invalid Forward"); + return actualres; + } + + cell_t result = 0; + int newres = actualres; + + g_getHolidayForward->PushCellByRef(&newres); + g_getHolidayForward->Execute(&result); + + if (result == Pl_Changed) + { + return newres; + } + + return actualres; +} + +void InitialiseGetHolidayDetour() +{ + getHolidayDetour = DETOUR_CREATE_MEMBER(GetHoliday, "GetHoliday"); + + if (!getHolidayDetour) + { + g_pSM->LogError(myself, "GetHoliday detour failed"); + return; + } + + getHolidayDetour->EnableDetour(); +} + +void RemoveGetHolidayDetour() +{ + getHolidayDetour->Destroy(); +} diff --git a/extensions/tf2/holiday.h b/extensions/tf2/holiday.h new file mode 100644 index 00000000..ad20bf63 --- /dev/null +++ b/extensions/tf2/holiday.h @@ -0,0 +1,45 @@ +/** + * vim: set ts=4 : + * ============================================================================= + * SourceMod Team Fortress 2 Extension + * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. + * ============================================================================= + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License, version 3.0, as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + * + * As a special exception, AlliedModders LLC gives you permission to link the + * code of this program (as well as its derivative works) to "Half-Life 2," the + * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software + * by the Valve Corporation. You must obey the GNU General Public License in + * all respects for all other code used. Additionally, AlliedModders LLC grants + * this exception to all derivative works. AlliedModders LLC defines further + * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007), + * or . + * + * Version: $Id$ + */ + +#ifndef _INCLUDE_SOURCEMOD_HOLIDAY_H_ +#define _INCLUDE_SOURCEMOD_HOLIDAY_H_ + +#include "extension.h" +#include +#include +#include "CDetour/detours.h" + +void InitialiseGetHolidayDetour(); +void RemoveGetHolidayDetour(); + +extern IForward *g_getHolidayForward; + +#endif //_INCLUDE_SOURCEMOD_HOLIDAY_H_ diff --git a/extensions/tf2/msvc9/tf2.vcproj b/extensions/tf2/msvc9/tf2.vcproj index 2471153c..d9a1d677 100644 --- a/extensions/tf2/msvc9/tf2.vcproj +++ b/extensions/tf2/msvc9/tf2.vcproj @@ -194,6 +194,10 @@ RelativePath="..\extension.cpp" > + + @@ -220,6 +224,10 @@ RelativePath="..\extension.h" > + + diff --git a/gamedata/sm-tf2.games.txt b/gamedata/sm-tf2.games.txt index b6251dd7..465d72db 100644 --- a/gamedata/sm-tf2.games.txt +++ b/gamedata/sm-tf2.games.txt @@ -81,6 +81,12 @@ "windows" "\x51\xD9\x2A\x2A\x2A\x2A\x2A\x56\x83\xEC\x2A\xD9\x2A\x2A\x2A\x8B\xF1\xD9\xEE\xD9\x2A\x2A\x2A\xD9\xE8" "linux" "@_ZN15CTFPlayerShared10StunPlayerEffiP9CTFPlayer" } + "GetHoliday" + { + "library" "server" + "windows" "\x81\xEC\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A\x83\x2A\x2A\x2A\x56\x8B\xF1\x89\x2A\x2A\x2A\x74\x2A\xB8" + "linux" "@_ZN12CTFGameRules10GetHolidayEv" + } } "Offsets" { diff --git a/plugins/include/console.inc b/plugins/include/console.inc index dd28371c..ee40dc77 100644 --- a/plugins/include/console.inc +++ b/plugins/include/console.inc @@ -473,9 +473,8 @@ native bool:GetConVarBool(Handle:convar); /** * Sets the boolean value of a console variable. * - * Note: The replicate and notify params are ignored on the engines for Episode 2/Orange Box - * and Left 4 Dead. These engines automatically replicates and notifies as soon as the convar - * is changed. + * Note: The replicate and notify params are only relevant for the original, Dark Messiah, and + * Episode 1 engines. Newer engines automatically do these things when the convar value is changed. * * @param convar Handle to the convar. * @param value New boolean value. @@ -501,9 +500,8 @@ native GetConVarInt(Handle:convar); /** * Sets the integer value of a console variable. * - * Note: The replicate and notify params are ignored on the engines for Episode 2/Orange Box - * and Left 4 Dead. These engines automatically replicates and notifies as soon as the convar - * is changed. + * Note: The replicate and notify params are only relevant for the original, Dark Messiah, and + * Episode 1 engines. Newer engines automatically do these things when the convar value is changed. * * @param convar Handle to the convar. * @param value New integer value. @@ -529,9 +527,8 @@ native Float:GetConVarFloat(Handle:convar); /** * Sets the floating point value of a console variable. * - * Note: The replicate and notify params are ignored on the engines for Episode 2/Orange Box - * and Left 4 Dead. These engines automatically replicates and notifies as soon as the convar - * is changed. + * Note: The replicate and notify params are only relevant for the original, Dark Messiah, and + * Episode 1 engines. Newer engines automatically do these things when the convar value is changed. * * @param convar Handle to the convar. * @param value New floating point value. @@ -559,9 +556,8 @@ native GetConVarString(Handle:convar, String:value[], maxlength); /** * Sets the string value of a console variable. * - * Note: The replicate and notify params are ignored on the engines for Episode 2/Orange Box - * and Left 4 Dead. These engines automatically replicates and notifies as soon as the convar - * is changed. + * Note: The replicate and notify params are only relevant for the original, Dark Messiah, and + * Episode 1 engines. Newer engines automatically do these things when the convar value is changed. * * @param convar Handle to the convar. * @param value New string value. @@ -578,9 +574,8 @@ native SetConVarString(Handle:convar, const String:value[], bool:replicate=false /** * Resets the console variable to its default value. * - * Note: The replicate and notify params are ignored on the engines for Episode 2/Orange Box - * and Left 4 Dead. These engines automatically replicates and notifies as soon as the convar - * is changed. + * Note: The replicate and notify params are only relevant for the original, Dark Messiah, and + * Episode 1 engines. Newer engines automatically do these things when the convar value is changed. * * @param convar Handle to the convar. * @param replicate If set to true, the new convar value will be set on all clients. @@ -650,12 +645,12 @@ native SetConVarBounds(Handle:convar, ConVarBounds:type, bool:set, Float:value=0 * Retrieves the name of a console variable. * * @param convar Handle to the convar. - * @param value Buffer to store the name of the convar. + * @param name Buffer to store the name of the convar. * @param maxlength Maximum length of string buffer. * @noreturn * @error Invalid or corrupt Handle. */ -native GetConVarName(Handle:convar, const String:name[], maxlength); +native GetConVarName(Handle:convar, String:name[], maxlength); funcenum ConVarQueryFinished { diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc index f1ee526e..4b567424 100644 --- a/plugins/include/tf2.inc +++ b/plugins/include/tf2.inc @@ -97,7 +97,14 @@ enum TFCond TFCond_OnFire, TFCond_Overhealed, TFCond_Jarated -} +}; + +enum TFHoliday +{ + TFHoliday_None = 1, + TFHoliday_Halloween, + TFHoliday_Birthday +}; /** * Sets a client on fire for 10 seconds. @@ -224,6 +231,16 @@ native TFClassType:TF2_GetClass(const String:classname[]); */ forward Action:TF2_CalcIsAttackCritical(client, weapon, String:weaponname[], &bool:result); +/** + * Called when the game checks to see if the current day is one of its tracked holidays + * + * @note Change the value of holiday and return Plugin_Changed to override. + * Return Plugin_Continue for no change. + * + * @param holiday Current Holiday + */ +forward Action:TF2_OnGetHoliday(&TFHoliday:holiday); + /** * Do not edit below this line! */ diff --git a/plugins/include/version.inc b/plugins/include/version.inc index 46231cb8..1a4d8415 100644 --- a/plugins/include/version.inc +++ b/plugins/include/version.inc @@ -37,6 +37,6 @@ #define SOURCEMOD_V_MAJOR 1 /**< SourceMod Major version */ #define SOURCEMOD_V_MINOR 3 /**< SourceMod Minor version */ -#define SOURCEMOD_V_RELEASE 4 /**< SourceMod Release version */ +#define SOURCEMOD_V_RELEASE 5 /**< SourceMod Release version */ -#define SOURCEMOD_VERSION "1.3.4-dev" /**< SourceMod version string (major.minor.release.build) */ +#define SOURCEMOD_VERSION "1.3.5-dev" /**< SourceMod version string (major.minor.release.build) */ diff --git a/product.version b/product.version index 7285a062..0550534a 100644 --- a/product.version +++ b/product.version @@ -1 +1 @@ -1.3.4-dev +1.3.5-dev diff --git a/public/sample_ext/msvc10/sdk.sln b/public/sample_ext/msvc10/sdk.sln new file mode 100644 index 00000000..c9fc1c1a --- /dev/null +++ b/public/sample_ext/msvc10/sdk.sln @@ -0,0 +1,62 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdk", "sdk.vcxproj", "{B3E797CF-4E77-4C9D-B8A8-7589B6902206}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug - Dark Messiah|Win32 = Debug - Dark Messiah|Win32 + Debug - Episode 1|Win32 = Debug - Episode 1|Win32 + Debug - Left 4 Dead 2|Win32 = Debug - Left 4 Dead 2|Win32 + Debug - Left 4 Dead|Win32 = Debug - Left 4 Dead|Win32 + Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32 + Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32 + Debug - Orange Box|Win32 = Debug - Orange Box|Win32 + Debug|Win32 = Debug|Win32 + Release - Dark Messiah|Win32 = Release - Dark Messiah|Win32 + Release - Episode 1|Win32 = Release - Episode 1|Win32 + Release - Left 4 Dead 2|Win32 = Release - Left 4 Dead 2|Win32 + Release - Left 4 Dead|Win32 = Release - Left 4 Dead|Win32 + Release - Old Metamod|Win32 = Release - Old Metamod|Win32 + Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32 + Release - Orange Box|Win32 = Release - Orange Box|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Dark Messiah|Win32.ActiveCfg = Debug - Dark Messiah|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Dark Messiah|Win32.Build.0 = Debug - Dark Messiah|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode 1|Win32.ActiveCfg = Debug - Episode 1|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode 1|Win32.Build.0 = Debug - Episode 1|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Left 4 Dead 2|Win32.ActiveCfg = Debug - Left 4 Dead 2|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Left 4 Dead 2|Win32.Build.0 = Debug - Left 4 Dead 2|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Left 4 Dead|Win32.ActiveCfg = Debug - Left 4 Dead|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Left 4 Dead|Win32.Build.0 = Debug - Left 4 Dead|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug|Win32.ActiveCfg = Debug|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug|Win32.Build.0 = Debug|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Dark Messiah|Win32.ActiveCfg = Release - Dark Messiah|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Dark Messiah|Win32.Build.0 = Release - Dark Messiah|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.ActiveCfg = Release - Episode 1|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.Build.0 = Release - Episode 1|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Left 4 Dead 2|Win32.ActiveCfg = Release - Left 4 Dead 2|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Left 4 Dead 2|Win32.Build.0 = Release - Left 4 Dead 2|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Left 4 Dead|Win32.ActiveCfg = Release - Left 4 Dead|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Left 4 Dead|Win32.Build.0 = Release - Left 4 Dead|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box Valve|Win32.ActiveCfg = Release - Orange Box Valve|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box Valve|Win32.Build.0 = Release - Orange Box Valve|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release|Win32.ActiveCfg = Release|Win32 + {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/public/sample_ext/msvc10/sdk.vcxproj b/public/sample_ext/msvc10/sdk.vcxproj new file mode 100644 index 00000000..91dbd39c --- /dev/null +++ b/public/sample_ext/msvc10/sdk.vcxproj @@ -0,0 +1,722 @@ + + + + + Debug - Dark Messiah + Win32 + + + Debug - Episode 1 + Win32 + + + Debug - Left 4 Dead 2 + Win32 + + + Debug - Left 4 Dead + Win32 + + + Debug - Old Metamod + Win32 + + + Debug - Orange Box Valve + Win32 + + + Debug - Orange Box + Win32 + + + Debug + Win32 + + + Release - Dark Messiah + Win32 + + + Release - Episode 1 + Win32 + + + Release - Left 4 Dead 2 + Win32 + + + Release - Left 4 Dead + Win32 + + + Release - Old Metamod + Win32 + + + Release - Orange Box Valve + Win32 + + + Release - Orange Box + Win32 + + + Release + Win32 + + + + {B3E797CF-4E77-4C9D-B8A8-7589B6902206} + sdk + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + true + false + true + false + true + false + true + false + true + false + true + false + true + false + true + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + sample.ext.2.darkm + sample.ext.2.ep1 + sample.ext.2.l4d2 + sample.ext.2.l4d + sample.ext.1.ep1 + sample.ext.2.ep2v + sample.ext.2.ep2 + sample.ext + sample.ext.2.darkm + sample.ext.2.ep1 + sample.ext.2.l4d2 + sample.ext.2.l4d + sample.ext.1.ep1 + sample.ext.2.ep2v + sample.ext.2.ep2 + sample.ext + + + + Disabled + ..;..\sdk;..\..;..\..\sourcepawn;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotSet + false + + + Level3 + EditAndContinue + + + LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX86 + + + + + Speed + ..;..\sdk;..\..;..\..\sourcepawn;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;ORANGEBOX_BUILD;%(PreprocessorDefinitions) + MultiThreaded + NotSet + false + + + Level3 + ProgramDatabase + + + LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + false + + + MachineX86 + + + + + /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Disabled + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(MMSOURCE18)\core-legacy;$(MMSOURCE18)\core-legacy\sourcehook;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotSet + false + + + Level3 + EditAndContinue + + + $(HL2SDK)\lib\public\tier0.lib;$(HL2SDK)\lib\public\tier1.lib;$(HL2SDK)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX86 + + + + + /MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Speed + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(MMSOURCE18)\core-legacy;$(MMSOURCE18)\core-legacy\sourcehook;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=1;%(PreprocessorDefinitions) + MultiThreaded + NotSet + false + + + Level3 + ProgramDatabase + + + $(HL2SDK)\lib\public\tier0.lib;$(HL2SDK)\lib\public\tier1.lib;$(HL2SDK)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + false + + + MachineX86 + + + + + /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Disabled + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDK-DARKM)\public;$(HL2SDK-DARKM)\public\dlls;$(HL2SDK-DARKM)\public\engine;$(HL2SDK-DARKM)\public\tier0;$(HL2SDK-DARKM)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotSet + false + + + Level3 + EditAndContinue + + + $(HL2SDK-DARKM)\lib\public\tier0.lib;$(HL2SDK-DARKM)\lib\public\tier1.lib;$(HL2SDK-DARKM)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX86 + + + + + /MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Speed + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDK-DARKM)\public;$(HL2SDK-DARKM)\public\dlls;$(HL2SDK-DARKM)\public\engine;$(HL2SDK-DARKM)\public\tier0;$(HL2SDK-DARKM)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2;%(PreprocessorDefinitions) + MultiThreaded + NotSet + false + + + Level3 + ProgramDatabase + + + $(HL2SDK-DARKM)\lib\public\tier0.lib;$(HL2SDK-DARKM)\lib\public\tier1.lib;$(HL2SDK-DARKM)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + false + + + MachineX86 + + + + + /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Disabled + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDKOB)\public;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\game\server;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotSet + false + + + Level3 + EditAndContinue + + + $(HL2SDKOB)\lib\public\tier0.lib;$(HL2SDKOB)\lib\public\tier1.lib;$(HL2SDKOB)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX86 + + + + + /MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Speed + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDKOB)\public;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\game\server;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=3;%(PreprocessorDefinitions) + MultiThreaded + NotSet + false + + + Level3 + ProgramDatabase + + + $(HL2SDKOB)\lib\public\tier0.lib;$(HL2SDKOB)\lib\public\tier1.lib;$(HL2SDKOB)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + false + + + MachineX86 + + + + + /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Disabled + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDKOBVALVE)\public;$(HL2SDKOBVALVE)\public\engine;$(HL2SDKOBVALVE)\public\game\server;$(HL2SDKOBVALVE)\public\tier0;$(HL2SDKOBVALVE)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=4;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotSet + false + + + Level3 + EditAndContinue + + + $(HL2SDKOBVALVE)\lib\public\tier0.lib;$(HL2SDKOBVALVE)\lib\public\tier1.lib;$(HL2SDKOBVALVE)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX86 + + + + + /MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Speed + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDKOBVALVE)\public;$(HL2SDKOBVALVE)\public\engine;$(HL2SDKOBVALVE)\public\game\server;$(HL2SDKOBVALVE)\public\tier0;$(HL2SDKOBVALVE)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=4;%(PreprocessorDefinitions) + MultiThreaded + NotSet + false + + + Level3 + ProgramDatabase + + + $(HL2SDKOBVALVE)\lib\public\tier0.lib;$(HL2SDKOBVALVE)\lib\public\tier1.lib;$(HL2SDKOBVALVE)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + false + + + MachineX86 + + + + + /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Disabled + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDKL4D)\public;$(HL2SDKL4D)\public\engine;$(HL2SDKL4D)\public\game\server;$(HL2SDKL4D)\public\tier0;$(HL2SDKL4D)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotSet + false + + + Level3 + EditAndContinue + + + $(HL2SDKL4D)\lib\public\tier0.lib;$(HL2SDKL4D)\lib\public\tier1.lib;$(HL2SDKL4D)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX86 + + + + + /MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Speed + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDKL4D)\public;$(HL2SDKL4D)\public\engine;$(HL2SDKL4D)\public\game\server;$(HL2SDKL4D)\public\tier0;$(HL2SDKL4D)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=5;%(PreprocessorDefinitions) + MultiThreaded + NotSet + false + + + Level3 + ProgramDatabase + + + $(HL2SDKL4D)\lib\public\tier0.lib;$(HL2SDKL4D)\lib\public\tier1.lib;$(HL2SDKL4D)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + false + + + MachineX86 + + + + + /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Disabled + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDKL4D2)\public;$(HL2SDKL4D2)\public\engine;$(HL2SDKL4D2)\public\game\server;$(HL2SDKL4D2)\public\tier0;$(HL2SDKL4D2)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=6;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotSet + false + + + Level3 + EditAndContinue + + + $(HL2SDKL4D2)\lib\public\tier0.lib;$(HL2SDKL4D2)\lib\public\tier1.lib;$(HL2SDKL4D2)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX86 + + + + + /MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Speed + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDKL4D2)\public;$(HL2SDKL4D2)\public\engine;$(HL2SDKL4D2)\public\game\server;$(HL2SDKL4D2)\public\tier0;$(HL2SDKL4D2)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=6;%(PreprocessorDefinitions) + MultiThreaded + NotSet + false + + + Level3 + ProgramDatabase + + + $(HL2SDKL4D2)\lib\public\tier0.lib;$(HL2SDKL4D2)\lib\public\tier1.lib;$(HL2SDKL4D2)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + false + + + MachineX86 + + + + + /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Disabled + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotSet + false + + + Level3 + EditAndContinue + + + $(HL2SDK)\lib\public\tier0.lib;$(HL2SDK)\lib\public\tier1.lib;$(HL2SDK)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMT;%(IgnoreSpecificDefaultLibraries) + true + Windows + false + + + MachineX86 + + + + + /MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_ORANGEBOXVALVE=4 /D SE_LEFT4DEAD=5 /D SE_LEFT4DEAD2=6 %(AdditionalOptions) + Speed + ..;..\sdk;..\..;..\..\sourcepawn;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(MMSOURCE18)\core;$(MMSOURCE18)\core\sourcehook;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;SOURCE_ENGINE=2;%(PreprocessorDefinitions) + MultiThreaded + NotSet + false + + + Level3 + ProgramDatabase + + + $(HL2SDK)\lib\public\tier0.lib;$(HL2SDK)\lib\public\tier1.lib;$(HL2SDK)\lib\public\vstdlib.lib;%(AdditionalDependencies) + LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries) + true + Windows + true + true + false + + + MachineX86 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/sample_ext/msvc10/sdk.vcxproj.filters b/public/sample_ext/msvc10/sdk.vcxproj.filters new file mode 100644 index 00000000..69a7e8d6 --- /dev/null +++ b/public/sample_ext/msvc10/sdk.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + {31958233-BB2D-4e41-A8F9-CE8A4684F436} + + + + + Source Files + + + SourceMod SDK + + + + + Header Files + + + SourceMod SDK + + + SourceMod SDK + + + \ No newline at end of file diff --git a/pushbuild.txt b/pushbuild.txt index d8a6f0dc..d5ce395d 100644 --- a/pushbuild.txt +++ b/pushbuild.txt @@ -20,4 +20,5 @@ Invaders' blood marches through my veins, like GIANT RADIOACTIVE RUBBER PANTS! THE PANTS COMMAND COMMAND ME! DO NOT IGNORE MY VEINS. This text is written in invisible ink. -o \ No newline at end of file +o +Ye who reads this line of text shall cease to exist. \ No newline at end of file diff --git a/sourcepawn/compiler/sc1.c b/sourcepawn/compiler/sc1.c index 640d9de6..2b24aeb9 100644 --- a/sourcepawn/compiler/sc1.c +++ b/sourcepawn/compiler/sc1.c @@ -5437,7 +5437,7 @@ static constvalue *insert_constval(constvalue *prev,constvalue *next,const char error(123); /* insufficient memory (fatal error) */ memset(cur,0,sizeof(constvalue)); if (name!=NULL) { - assert(strlen(name)name,name); } /* if */ cur->value=val; diff --git a/sourcepawn/compiler/sc2.c b/sourcepawn/compiler/sc2.c index 21bcccd3..41b37bb6 100644 --- a/sourcepawn/compiler/sc2.c +++ b/sourcepawn/compiler/sc2.c @@ -237,7 +237,7 @@ static void check_empty(const unsigned char *lptr) static void doinclude(int silent) { char name[_MAX_PATH]; - char symname[sNAMEMAX]; + char symname[sNAMEMAX+1]; char *ptr; char c; int i, result; diff --git a/tools/buildbot/package.pl b/tools/buildbot/package.pl index 559eacf5..9a4a2fc3 100755 --- a/tools/buildbot/package.pl +++ b/tools/buildbot/package.pl @@ -35,6 +35,16 @@ $version = Build::ProductVersion(Build::PathFormat('../../build/product.version' $version =~ s/-dev//g; $version .= '-hg' . Build::HgRevNum('../../build'); +# Append OS to package version +if ($^O =~ /MSWin/) +{ + $version .= '-windows'; +} +else +{ + $version .= '-' . $^O; +} + my ($filename); $filename = 'sourcemod-' . $version; if ($^O eq "linux")