diff --git a/extensions/cstrike/RegNatives.cpp b/extensions/cstrike/RegNatives.cpp index 9dc014e0..2f001b78 100644 --- a/extensions/cstrike/RegNatives.cpp +++ b/extensions/cstrike/RegNatives.cpp @@ -41,7 +41,7 @@ void RegNatives::Register(ICallWrapper *pWrapper) void RegNatives::UnregisterAll() { - List::iterator iter; + SourceHook::List::iterator iter; for (iter=m_List.begin(); iter!=m_List.end(); iter++) { diff --git a/extensions/cstrike/RegNatives.h b/extensions/cstrike/RegNatives.h index b66455dd..c92e5072 100644 --- a/extensions/cstrike/RegNatives.h +++ b/extensions/cstrike/RegNatives.h @@ -34,15 +34,13 @@ #include -using namespace SourceHook; - class RegNatives { public: void Register(ICallWrapper *pWrapper); void UnregisterAll(); private: - List m_List; + SourceHook::List m_List; }; extern RegNatives g_RegNatives; diff --git a/extensions/cstrike/extension.cpp b/extensions/cstrike/extension.cpp index 3c24e0e5..c2402f96 100644 --- a/extensions/cstrike/extension.cpp +++ b/extensions/cstrike/extension.cpp @@ -71,8 +71,8 @@ bool CStrike::SDK_OnLoad(char *error, size_t maxlength, bool late) bool CStrike::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late) { - GET_V_IFACE_CURRENT(engineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2); - GET_V_IFACE_CURRENT(engineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER); + GET_V_IFACE_CURRENT(GetEngineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2); + GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER); return true; } diff --git a/extensions/cstrike/msvc8/cstrike.vcproj b/extensions/cstrike/msvc8/cstrike.vcproj index 3280eea0..bdf9c936 100644 --- a/extensions/cstrike/msvc8/cstrike.vcproj +++ b/extensions/cstrike/msvc8/cstrike.vcproj @@ -200,7 +200,7 @@ #endif +#if !defined METAMOD_PLAPI_VERSION + #include +#endif + using namespace SourceMod; using namespace SourcePawn; diff --git a/extensions/cstrike/timeleft.cpp b/extensions/cstrike/timeleft.cpp index ce0c82b5..c465ca76 100644 --- a/extensions/cstrike/timeleft.cpp +++ b/extensions/cstrike/timeleft.cpp @@ -1,3 +1,34 @@ +/** + * vim: set ts=4 : + * ============================================================================= + * SourceMod Counter-Strike:Source Extension + * Copyright (C) 2004-2007 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$ + */ + #include "extension.h" #include "timeleft.h" diff --git a/extensions/cstrike/timeleft.h b/extensions/cstrike/timeleft.h index 7fa7b60c..0b7c4799 100644 --- a/extensions/cstrike/timeleft.h +++ b/extensions/cstrike/timeleft.h @@ -1,3 +1,34 @@ +/** + * vim: set ts=4 : + * ============================================================================= + * SourceMod Counter-Strike:Source Extension + * Copyright (C) 2004-2007 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_CSTRIKE_EVENTS_H_ #define _INCLUDE_SOURCEMOD_CSTRIKE_EVENTS_H_ diff --git a/public/metamod_wrappers.h b/public/metamod_wrappers.h index 279396fa..de686cfd 100644 --- a/public/metamod_wrappers.h +++ b/public/metamod_wrappers.h @@ -45,4 +45,6 @@ /* Valve interface wrappers */ #define CVAR_INTERFACE_VERSION VENGINE_CVAR_INTERFACE_VERSION +#define METAMOD_PLAPI_NAME PLAPI_NAME + #endif //_INCLUDE_METAMOD_WRAPPERS_H_