GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2025-04-24 07:23:42 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into menu_handler

Browse Source
This commit is contained in:
Karol Szuster 2017-04-15 00:54:25 +02:00 committed by GitHub
commit 3f6074eac7
86 changed files with 4807 additions and 3389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
amxmodx/AMBuilder
View File

@ -93,6 +93,7 @@ binary.sources = [
'../public/memtools/MemoryUtils.cpp', '../public/memtools/MemoryUtils.cpp',
'../public/memtools/CDetour/detours.cpp', '../public/memtools/CDetour/detours.cpp',
'../public/memtools/CDetour/asm/asm.c', '../public/memtools/CDetour/asm/asm.c',
'../public/resdk/mod_rehlds_api.cpp',
'CLibrarySys.cpp', 'CLibrarySys.cpp',
'CGameConfigs.cpp', 'CGameConfigs.cpp',
'gameconfigs.cpp', 'gameconfigs.cpp',

68
amxmodx/CEvent.cpp
View File

@ -204,16 +204,16 @@ int EventsMngr::registerEvent(CPluginMngr::CPlugin* plugin, int func, int flags,
return 0; return 0;
} }
auto event = new ClEvent(plugin, func, flags); auto event = ke::AutoPtr<ClEvent>(new ClEvent(plugin, func, flags));
int handle = EventHandles.create(event); int handle = EventHandles.create(event.get());
if (!handle) if (!handle)
{ {
return 0; return 0;
} }
m_Events[msgid].put(event); m_Events[msgid].append(ke::Move(event));
return handle; return handle;
} }
@ -226,40 +226,40 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
m_ParseNotDone = false; m_ParseNotDone = false;
// don't parse if nothing to do // don't parse if nothing to do
if (!m_Events[msg_type].size()) if (!m_Events[msg_type].length())
return; return;
m_ParseMsgType = msg_type; m_ParseMsgType = msg_type;
m_Timer = timer; m_Timer = timer;
for (ClEventVecIter iter = m_Events[msg_type].begin(); iter; ++iter) for (auto &event : m_Events[msg_type])
{ {
if ((*iter).m_Done) if (event->m_Done)
continue; continue;
if (!(*iter).m_Plugin->isExecutable((*iter).m_Func)) if (!event->m_Plugin->isExecutable(event->m_Func))
{ {
(*iter).m_Done = true; event->m_Done = true;
continue; continue;
} }
if (pPlayer) if (pPlayer)
{ {
if (!(*iter).m_FlagClient || (pPlayer->IsBot() ? !(*iter).m_FlagBot : !(*iter).m_FlagPlayer) || (pPlayer->IsAlive() ? !(*iter).m_FlagAlive : !(*iter).m_FlagDead)) if (!event->m_FlagClient || (pPlayer->IsBot() ? !event->m_FlagBot : !event->m_FlagPlayer) || (pPlayer->IsAlive() ? !event->m_FlagAlive : !event->m_FlagDead))
{ {
(*iter).m_Done = true; event->m_Done = true;
continue; continue;
} }
} }
else if (!(*iter).m_FlagWorld) else if (!event->m_FlagWorld)
{ {
(*iter).m_Done = true; event->m_Done = true;
continue; continue;
} }
if ((*iter).m_FlagOnce && (*iter).m_Stamp == (float)(*timer)) if (event->m_FlagOnce && event->m_Stamp == *timer)
{ {
(*iter).m_Done = true; event->m_Done = true;
continue; continue;
} }
@ -292,16 +292,16 @@ void EventsMngr::parseValue(int iValue)
// loop through the registered funcs, and decide whether they have to be called or not // loop through the registered funcs, and decide whether they have to be called or not
// if they shouldnt, their m_Done is set to true // if they shouldnt, their m_Done is set to true
for (ClEventVecIter iter = m_ParseFun->begin(); iter; ++iter) for (auto &event : *m_ParseFun)
{ {
if ((*iter).m_Done) if (event->m_Done)
continue; // already skipped; don't bother with parsing continue; // already skipped; don't bother with parsing
// loop through conditions // loop through conditions
bool execute = false; bool execute = false;
bool anyConditions = false; bool anyConditions = false;
for (ClEvent::cond_t *condIter = (*iter).m_Conditions; condIter; condIter = condIter->next) for (auto condIter = event->m_Conditions; condIter; condIter = condIter->next)
{ {
if (condIter->paramId == m_ParsePos) if (condIter->paramId == m_ParsePos)
{ {
@ -320,7 +320,7 @@ void EventsMngr::parseValue(int iValue)
} }
if (anyConditions && !execute) if (anyConditions && !execute)
(*iter).m_Done = true; // don't execute event->m_Done = true; // don't execute
} }
} }
@ -339,16 +339,16 @@ void EventsMngr::parseValue(float fValue)
// loop through the registered funcs, and decide whether they have to be called or not // loop through the registered funcs, and decide whether they have to be called or not
// if they shouldnt, their m_Done is set to true // if they shouldnt, their m_Done is set to true
for (ClEventVecIter iter = m_ParseFun->begin(); iter; ++iter) for (auto &event : *m_ParseFun)
{ {
if ((*iter).m_Done) if (event->m_Done)
continue; // already skipped; don't bother with parsing continue; // already skipped; don't bother with parsing
// loop through conditions // loop through conditions
bool execute = false; bool execute = false;
bool anyConditions = false; bool anyConditions = false;
for (ClEvent::cond_t *condIter = (*iter).m_Conditions; condIter; condIter = condIter->next) for (auto condIter = event->m_Conditions; condIter; condIter = condIter->next)
{ {
if (condIter->paramId == m_ParsePos) if (condIter->paramId == m_ParsePos)
{ {
@ -367,7 +367,7 @@ void EventsMngr::parseValue(float fValue)
} }
if (anyConditions && !execute) if (anyConditions && !execute)
(*iter).m_Done = true; // don't execute event->m_Done = true; // don't execute
} }
} }
@ -386,16 +386,16 @@ void EventsMngr::parseValue(const char *sz)
// loop through the registered funcs, and decide whether they have to be called or not // loop through the registered funcs, and decide whether they have to be called or not
// if they shouldnt, their m_Done is set to true // if they shouldnt, their m_Done is set to true
for (ClEventVecIter iter = m_ParseFun->begin(); iter; ++iter) for (auto &event : *m_ParseFun)
{ {
if ((*iter).m_Done) if (event->m_Done)
continue; // already skipped; don't bother with parsing continue; // already skipped; don't bother with parsing
// loop through conditions // loop through conditions
bool execute = false; bool execute = false;
bool anyConditions = false; bool anyConditions = false;
for (ClEvent::cond_t *condIter = (*iter).m_Conditions; condIter; condIter = condIter->next) for (auto condIter = event->m_Conditions; condIter; condIter = condIter->next)
{ {
if (condIter->paramId == m_ParsePos) if (condIter->paramId == m_ParsePos)
{ {
@ -413,7 +413,7 @@ void EventsMngr::parseValue(const char *sz)
} }
if (anyConditions && !execute) if (anyConditions && !execute)
(*iter).m_Done = true; // don't execute event->m_Done = true; // don't execute
} }
} }
@ -455,22 +455,22 @@ void EventsMngr::executeEvents()
} }
// Reset this here so we don't trigger re-entrancy for unregistered messages // Reset this here so we don't trigger re-entrancy for unregistered messages
ClEventVec *parseFun = m_ParseFun; auto parseFun = m_ParseFun;
m_ParseFun = NULL; m_ParseFun = nullptr;
for (ClEventVecIter iter = parseFun->begin(); iter; ++iter) for (auto &event : *parseFun)
{ {
if ((*iter).m_Done) if (event->m_Done)
{ {
(*iter).m_Done = false; event->m_Done = false;
continue; continue;
} }
(*iter).m_Stamp = (float)*m_Timer; event->m_Stamp = *m_Timer;
if ((*iter).m_State == FSTATE_ACTIVE) if (event->m_State == FSTATE_ACTIVE)
{ {
executeForwards((*iter).m_Func, static_cast<cell>(m_ReadVault ? m_ReadVault[0].iValue : 0)); executeForwards(event->m_Func, static_cast<cell>(m_ReadVault ? m_ReadVault[0].iValue : 0));
} }
} }

7
amxmodx/CEvent.h
View File

@ -108,11 +108,8 @@ private:
int m_ReadVaultSize; int m_ReadVaultSize;
void NextParam(); // make sure a new parameter can be added void NextParam(); // make sure a new parameter can be added
typedef CList<ClEvent> ClEventVec; ke::Vector<ke::AutoPtr<ClEvent>> m_Events[MAX_AMX_REG_MSG];
typedef ClEventVec::iterator ClEventVecIter; ke::Vector<ke::AutoPtr<ClEvent>> *m_ParseFun; // current Event vector
ClEventVec m_Events[MAX_AMX_REG_MSG];
ClEventVec *m_ParseFun; // current Event vector
bool m_ParseNotDone; bool m_ParseNotDone;
int m_ParsePos; // is args. num. - 1 int m_ParsePos; // is args. num. - 1

2
amxmodx/CLang.cpp
View File

@ -589,7 +589,7 @@ const char *CLangMngr::GetLangName(int langId)
{ {
for (size_t iter = 0; iter < m_Languages.length(); ++iter) for (size_t iter = 0; iter < m_Languages.length(); ++iter)
{ {
if (iter == langId) if ((int)iter == langId)
{ {
return m_Languages[iter]->GetName(); return m_Languages[iter]->GetName();
} }

82
amxmodx/CLibrarySys.h
View File

@ -11,67 +11,9 @@
#define _INCLUDE_LIBRARY_SYS_H_ #define _INCLUDE_LIBRARY_SYS_H_
#include "amx.h" // cell #include "amx.h" // cell
#include <interface.h> // Interface (HLSDK) #include <platform_helpers.h>
#include <amtl/am-utility.h> // AutoPtr
#include <amtl/os/am-shared-library.h> #include <amtl/os/am-shared-library.h>
#define PLATFORM_WINDOWNS_NAME "windows"
#define PLATFORM_LINUX_NAME "linux"
#define PLATFORM_MAC_NAME "mac"
#if defined(WIN32)
# ifndef PLATFORM_WINDOWS
# define PLATFORM_WINDOWS 1
# endif
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# include <windows.h>
# include <direct.h>
# include <io.h>
# define PLATFORM_LIB_EXT "dll"
# define PLATFORM_NAME PLATFORM_WINDOWNS_NAME
# define PLATFORM_SEP_CHAR '\\'
# define PLATFORM_SEP_ALTCHAR '/'
# define PLATFORM_EXTERN_C extern "C" __declspec(dllexport)
#elif defined(__linux__) || defined(__APPLE__)
# if defined(__linux__)
# define PLATFORM_LINUX 1
# define PLATFORM_LIB_EXT "so"
# define PLATFORM_NAME PLATFORM_LINUX_NAME
# define PLATFORM_COMPAT_ALT PLATFORM_MAC_NAME
# elif defined(__APPLE__)
# define PLATFORM_APPLE 1
# define PLATFORM_LIB_EXT "dylib"
# define PLATFORM_NAME PLATFORM_MAC_NAME
# define PLATFORM_COMPAT_ALT PLATFORM_LINUX_NAME
# endif
# ifndef PLATFORM_POSIX
# define PLATFORM_POSIX 1
# endif
# include <stdio.h>
# include <sys/types.h>
# include <sys/stat.h>
# include <errno.h>
# include <unistd.h>
# include <dirent.h>
# include <dlfcn.h>
# if defined(PLATFORM_APPLE)
# include <sys/syslimits.h>
# endif
# define PLATFORM_SEP_CHAR '/'
# define PLATFORM_SEP_ALTCHAR '\\'
# define PLATFORM_EXTERN_C extern "C" __attribute__((visibility("default")))
# define WINAPI
#endif
#define PLATFORM_MAX_PATH 260
#if defined PLATFORM_WINDOWS
typedef HANDLE DirHandle;
#elif defined PLATFORM_POSIX
typedef DIR* DirHandle;
#endif
enum FileTimeType enum FileTimeType
{ {
FileTime_LastAccess = 0, /* Last access (not available on FAT) */ FileTime_LastAccess = 0, /* Last access (not available on FAT) */
@ -162,26 +104,4 @@ class LibrarySystem
extern LibrarySystem g_LibSys; extern LibrarySystem g_LibSys;
template <typename T>
bool GET_IFACE(const char* library, T*& var, const char* version)
{
const char* path = g_LibSys.PathFormat("%s.%s", library, PLATFORM_LIB_EXT);
ke::AutoPtr<CLibrary> lib(g_LibSys.OpenLibrary(path));
if (lib)
{
CreateInterfaceFn factory = reinterpret_cast<CreateInterfaceFn>(lib->GetSymbolAddress(CREATEINTERFACE_PROCNAME));
if (factory)
{
var = reinterpret_cast<T*>(factory(version, nullptr));
return true;
}
}
var = nullptr;
return false;
}
#endif // _INCLUDE_LIBRARY_SYS_H_ #endif // _INCLUDE_LIBRARY_SYS_H_

307
amxmodx/CList.h
View File

@ -1,307 +0,0 @@
// vim: set ts=4 sw=4 tw=99 noet:
//
// AMX Mod X, based on AMX Mod by Aleksander Naszko ("OLO").
// Copyright (C) The AMX Mod X Development Team.
//
// This software is licensed under the GNU General Public License, version 3 or higher.
// Additional exceptions apply. For full license details, see LICENSE.txt or visit:
// https://alliedmods.net/amxmodx-license
#ifndef CLIST_H
#define CLIST_H
// *****************************************************
// class CList
// *****************************************************
// Linked list
template <typename T, typename F = char* >
class CList
{
private:
// One list element
class CElement
{
T *m_pObject; // pointer to the object
CElement *m_pNext; // pointer to the next element
CElement *m_pPrev; // pointer to the previous element
public:
// dereference operator
T& operator* ()
{
return *m_pObject;
}
// constructor
CElement(T *pObj)
{
m_pObject = pObj;
m_pNext = NULL;
m_pPrev = NULL;
}
// destructor
~CElement()
{
delete m_pObject;
if (m_pNext)
m_pNext->m_pPrev = m_pPrev;
if (m_pPrev)
m_pPrev->m_pNext = m_pNext;
}
// returns object pointer
T *GetObj()
{
return m_pObject;
}
// returns next element pointer
CElement *GetNext()
{
return m_pNext;
}
// sets next element
void SetNext(CElement *newNext)
{
m_pNext = newNext;
}
// returns previous element pointer
CElement *GetPrev()
{
return m_pPrev;
}
// sets previous element
void SetPrev(CElement *newPrev)
{
m_pPrev = newPrev;
}
};
// CList<T, F> class
CElement *m_pHead; // head of the linked list
CElement *m_pTail; // tail of the linked list
public:
// iterator class
class iterator
{
friend class CList<T, F>;
CList<T, F> *m_pList; // The list that created this iterator
CElement *m_CurPos; // Current position in the list
public:
iterator()
{
m_pList = NULL;
m_CurPos = NULL;
}
// constructor based on list, element
iterator(CList<T, F> *pList, CElement *startPos)
{
m_pList = pList;
m_CurPos = startPos;
}
// constructor based on other iterator
iterator(const iterator &other)
{
m_pList = other.m_pList;
m_CurPos = other.m_CurPos;
}
// dereference operator
T & operator* () const
{
return *m_CurPos->GetObj();
}
T * operator-> () const
{
return m_CurPos->GetObj();
}
// validity check operator
inline operator bool () const
{
return m_pList != NULL && m_CurPos != NULL && m_CurPos->GetObj() != NULL;
}
// pre increment operator
inline iterator& operator ++ ()
{
m_CurPos = m_CurPos->GetNext();
return *this;
}
// post increment operator
inline iterator operator++(int)
{
iterator tmp(*this);
m_CurPos = m_CurPos->next;
return tmp;
}
// returns iterator that points to next element
iterator GetNext()
{
iterator tmp(*this);
return ++tmp;
}
iterator remove()
{
return m_pList->remove(*this);
}
iterator put(T *obj)
{
return m_pList->put(obj, *this);
}
};
CList<T, F>()
{
m_pHead = NULL;
m_pTail = NULL;
}
~CList<T, F>()
{
clear();
}
// removes the object referenced by where
// sets where to the next object
// returns an iterator pointing to the next object
iterator remove(iterator &where)
{
iterator tmp(where.GetNext());
if (where.m_CurPos == m_pHead)
m_pHead = where.m_CurPos->GetNext();
if (where.m_CurPos == m_pTail)
m_pTail = where.m_CurPos->GetPrev();
delete where.m_CurPos;
where = tmp;
return tmp;
}
// puts an element to the end of the list
// returns an iterator pointing to it
iterator put_back(T *pObj)
{
CElement *pTmp = new CElement(pObj);
if (!m_pHead)
{
m_pHead = pTmp;
m_pTail = pTmp;
} else {
pTmp->SetNext(NULL);
pTmp->SetPrev(m_pTail);
m_pTail->SetNext(pTmp);
m_pTail = pTmp;
}
return iterator(this, pTmp);
}
iterator put_front(T *pObj)
{
CElement *pTmp = new CElement(pObj);
if (!m_pHead)
{
m_pHead = pTmp;
m_pTail = pTmp;
} else {
pTmp->SetNext(m_pHead);
pTmp->SetPrev(NULL);
m_pHead->SetPrev(pTmp);
m_pHead = pTmp;
}
return iterator(this, pTmp);
}
// alias for put_back
iterator put(T *pObj)
{
return put_back(pObj);
}
// puts an element after where
// alters where to point to the new element
// returns an iterator pointing to the new element
iterator put(T *pObj, iterator &where)
{
CElement *pTmp = new CElement(pObj);
if (where.m_CurPos->GetNext())
where.m_CurPos->GetNext()->SetPrev(pTmp);
else // where = tail
m_pTail = pTmp;
pTmp->SetPrev(where.m_CurPos);
pTmp->SetNext(where.m_CurPos->GetNext());
where.m_CurPos->SetNext(pTmp);
return ++where;
}
iterator begin()
{
return iterator(this, m_pHead);
}
void clear()
{
iterator iter = begin();
while (iter) iter.remove();
}
iterator find(iterator startOn, const F &desc)
{
iterator iter = startOn;
while (iter)
{
if (*iter == desc)
break;
++iter;
}
return iter;
}
iterator find(const F &desc)
{
return find(begin(), desc);
}
int size()
{
iterator iter = begin();
int i = 0;
while (iter)
{
++i;
++iter;
}
return i;
}
};
#endif //CLIST_H

4
amxmodx/CMisc.h
View File

@ -10,7 +10,6 @@
#ifndef CMISC_H #ifndef CMISC_H
#define CMISC_H #define CMISC_H
#include "CList.h"
#include "sh_list.h" #include "sh_list.h"
// ***************************************************** // *****************************************************
@ -202,7 +201,7 @@ public:
// class CScript // class CScript
// ***************************************************** // *****************************************************
class CScript class CScript : public ke::InlineListNode<CScript>
{ {
ke::AString filename; ke::AString filename;
AMX* amx; AMX* amx;
@ -212,7 +211,6 @@ public:
inline AMX* getAMX() { return amx; } inline AMX* getAMX() { return amx; }
inline const char* getName() { return filename.chars(); } inline const char* getName() { return filename.chars(); }
inline bool operator==(void* a) { return (amx == (AMX*)a); }
inline void* getCode() { return code; } inline void* getCode() { return code; }
}; };

3
amxmodx/CModule.h
View File

@ -52,7 +52,7 @@ struct amxx_module_info_s
#define AMXX_INTERFACE_VERSION 4 #define AMXX_INTERFACE_VERSION 4
class CModule class CModule : public ke::InlineListNode<CModule>
{ {
ke::AString m_Filename; // Filename ke::AString m_Filename; // Filename
@ -87,7 +87,6 @@ public:
inline const char* getName() const { return m_InfoNew.name; } inline const char* getName() const { return m_InfoNew.name; }
inline const amxx_module_info_s* getInfoNew() const { return &m_InfoNew; } // new inline const amxx_module_info_s* getInfoNew() const { return &m_InfoNew; } // new
inline int getStatusValue() { return m_Status; } inline int getStatusValue() { return m_Status; }
inline bool operator==(const char* fname) { return !strcmp(m_Filename.chars(), fname); }
inline bool isReloadable() { return ((m_Status == MODULE_LOADED) && (m_InfoNew.reload != 0)); } inline bool isReloadable() { return ((m_Status == MODULE_LOADED) && (m_InfoNew.reload != 0)); }
inline bool isAmxx() const { return m_Amxx; } inline bool isAmxx() const { return m_Amxx; }
inline const char *getMissingFunc() const { return m_MissingFunc; } inline const char *getMissingFunc() const { return m_MissingFunc; }

14
amxmodx/CPlugin.cpp
View File

@ -61,8 +61,8 @@ void CPluginMngr::Finalize()
int CPluginMngr::loadPluginsFromFile(const char* filename, bool warn) int CPluginMngr::loadPluginsFromFile(const char* filename, bool warn)
{ {
char file[256]; char file[PLATFORM_MAX_PATH];
FILE *fp = fopen(build_pathname_r(file, sizeof(file) - 1, "%s", filename), "rt"); FILE *fp = fopen(build_pathname_r(file, sizeof(file), "%s", filename), "rt");
if (!fp) if (!fp)
{ {
@ -276,8 +276,8 @@ CPluginMngr::CPlugin::CPlugin(int i, const char* p, const char* n, char* e, int
author = unk; author = unk;
version = unk; version = unk;
char file[256]; char file[PLATFORM_MAX_PATH];
char* path = build_pathname_r(file, sizeof(file) - 1, "%s/%s", p, n); char* path = build_pathname_r(file, sizeof(file), "%s/%s", p, n);
code = 0; code = 0;
memset(&amx, 0, sizeof(AMX)); memset(&amx, 0, sizeof(AMX));
int err = load_amxscript(&amx, &code, path, e, d); int err = load_amxscript(&amx, &code, path, e, d);
@ -688,8 +688,8 @@ void CPluginMngr::CacheAndLoadModules(const char *plugin)
void CPluginMngr::CALMFromFile(const char *file) void CPluginMngr::CALMFromFile(const char *file)
{ {
char filename[256]; char filename[PLATFORM_MAX_PATH];
FILE *fp = fopen(build_pathname_r(filename, sizeof(filename) - 1, "%s", file), "rt"); FILE *fp = fopen(build_pathname_r(filename, sizeof(filename), "%s", file), "rt");
if (!fp) if (!fp)
{ {
@ -751,7 +751,7 @@ void CPluginMngr::CALMFromFile(const char *file)
continue; continue;
} }
build_pathname_r(filename, sizeof(filename)-1, "%s/%s", get_localinfo("amxx_pluginsdir", "addons/amxmodx/plugins"), pluginName); build_pathname_r(filename, sizeof(filename), "%s/%s", get_localinfo("amxx_pluginsdir", "addons/amxmodx/plugins"), pluginName);
CacheAndLoadModules(filename); CacheAndLoadModules(filename);
} }

107
amxmodx/CQueue.h
View File

@ -1,107 +0,0 @@
// vim: set ts=4 sw=4 tw=99 noet:
//
// AMX Mod X, based on AMX Mod by Aleksander Naszko ("OLO").
// Copyright (C) The AMX Mod X Development Team.
//
// This software is licensed under the GNU General Public License, version 3 or higher.
// Additional exceptions apply. For full license details, see LICENSE.txt or visit:
// https://alliedmods.net/amxmodx-license
//by David "BAILOPAN" Anderson
#ifndef _INCLUDE_CQUEUE_H
#define _INCLUDE_CQUEUE_H
template <class T>
class CQueue
{
public:
class CQueueItem
{
public:
CQueueItem(const T &i, CQueueItem *n)
{
item = i;
next = n;
}
CQueueItem *GetNext()
{
return next;
}
T & GetItem()
{
return item;
}
void SetNext(CQueueItem *n)
{
next = n;
}
private:
T item;
CQueueItem *next;
};
public:
CQueue()
{
mSize = 0;
mFirst = NULL;
mLast = NULL;
}
bool empty()
{
return ((mSize == 0) ? true : false);
}
void push(const T &v)
{
CQueueItem *p = new CQueueItem(v, NULL);
if (empty())
{
mFirst = p;
} else {
mLast->SetNext(p);
}
mLast = p;
mSize++;
}
void pop()
{
if (mFirst == mLast)
{
delete mFirst;
mFirst = NULL;
mLast = NULL;
} else {
CQueueItem *p = mFirst->GetNext();
delete mFirst;
mFirst = p;
}
mSize--;
}
T & front()
{
return mFirst->GetItem();
}
T & back()
{
return mLast->GetItem();
}
unsigned int size()
{
return mSize;
}
private:
CQueueItem *mFirst;
CQueueItem *mLast;
unsigned int mSize;
};
#endif //_INCLUDE_CQUEUE_H

68
amxmodx/CTask.cpp
View File

@ -203,35 +203,36 @@ void CTaskMngr::registerTimers(float *pCurrentTime, float *pTimeLimit, float *pT
void CTaskMngr::registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat) void CTaskMngr::registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat)
{ {
// first, search for free tasks // first, search for free tasks
TaskListIter iter = m_Tasks.find(CTaskDescriptor(0, NULL, true)); for (auto &task : m_Tasks)
if (iter)
{ {
// found: reuse it if (task->isFree() && !task->inExecute())
iter->set(pPlugin, iFunc, iFlags, iId, fBase, iParamsLen, pParams, iRepeat, *m_pTmr_CurrentTime); {
} else { // found: reuse it
// not found: make a new one task->set(pPlugin, iFunc, iFlags, iId, fBase, iParamsLen, pParams, iRepeat, *m_pTmr_CurrentTime);
CTask *pTmp = new CTask;
if (!pTmp)
return; return;
}
pTmp->set(pPlugin, iFunc, iFlags, iId, fBase, iParamsLen, pParams, iRepeat, *m_pTmr_CurrentTime);
m_Tasks.put(pTmp);
} }
// not found: make a new one
auto task = ke::AutoPtr<CTask>(new CTask);
if (!task)
return;
task->set(pPlugin, iFunc, iFlags, iId, fBase, iParamsLen, pParams, iRepeat, *m_pTmr_CurrentTime);
m_Tasks.append(ke::Move(task));
} }
int CTaskMngr::removeTasks(int iId, AMX *pAmx) int CTaskMngr::removeTasks(int iId, AMX *pAmx)
{ {
CTaskDescriptor descriptor(iId, pAmx);
TaskListIter iter = m_Tasks.find(descriptor);
int i = 0; int i = 0;
while (iter) for (auto &task : m_Tasks)
{ {
iter->clear(); if (task->match(iId, pAmx))
++i; {
iter = m_Tasks.find(++iter, descriptor); task->clear();
++i;
}
} }
return i; return i;
@ -239,16 +240,16 @@ int CTaskMngr::removeTasks(int iId, AMX *pAmx)
int CTaskMngr::changeTasks(int iId, AMX *pAmx, float fNewBase) int CTaskMngr::changeTasks(int iId, AMX *pAmx, float fNewBase)
{ {
CTaskDescriptor descriptor(iId, pAmx);
TaskListIter iter = m_Tasks.find(descriptor);
int i = 0; int i = 0;
while (iter) for (auto &task : m_Tasks)
{ {
iter->changeBase(fNewBase); if (task->match(iId, pAmx))
iter->resetNextExecTime(*m_pTmr_CurrentTime); {
++i; task->changeBase(fNewBase);
iter = m_Tasks.find(++iter, descriptor); task->resetNextExecTime(*m_pTmr_CurrentTime);
++i;
}
} }
return i; return i;
@ -256,16 +257,23 @@ int CTaskMngr::changeTasks(int iId, AMX *pAmx, float fNewBase)
bool CTaskMngr::taskExists(int iId, AMX *pAmx) bool CTaskMngr::taskExists(int iId, AMX *pAmx)
{ {
return m_Tasks.find(CTaskDescriptor(iId, pAmx)); for (auto &task : m_Tasks)
{
if (task->match(iId, pAmx))
{
return true;
}
}
return false;
} }
void CTaskMngr::startFrame() void CTaskMngr::startFrame()
{ {
for (TaskListIter iter = m_Tasks.begin(); iter; ++iter) for (auto &task : m_Tasks)
{ {
if (iter->isFree()) if (task->isFree())
continue; continue;
iter->executeIfRequired(*m_pTmr_CurrentTime, *m_pTmr_TimeLimit, *m_pTmr_TimeLeft); task->executeIfRequired(*m_pTmr_CurrentTime, *m_pTmr_TimeLimit, *m_pTmr_TimeLeft);
} }
} }

35
amxmodx/CTask.h
View File

@ -52,40 +52,17 @@ private:
bool shouldRepeat(); bool shouldRepeat();
inline bool match(int id, AMX *amx)
{
return (!m_bFree) && (amx ? getAMX() == amx : true) && (m_iId == id);
}
CTask(); CTask();
~CTask(); ~CTask();
}; };
class CTaskDescriptor
{
public:
cell m_iId;
AMX *m_pAmx;
bool m_bFree;
CTaskDescriptor(int iId, AMX *pAmx, bool bFree = false)
{
m_iId = iId;
m_pAmx = pAmx;
m_bFree = bFree;
}
friend bool operator == (const CTask &left, const CTaskDescriptor &right)
{
if (right.m_bFree)
return (left.isFree() && !left.inExecute());
return (!left.isFree()) &&
(right.m_pAmx ? left.getAMX() == right.m_pAmx : true) &&
(left.getTaskId() == right.m_iId);
}
};
/*** CTaskMngr priv members ***/ /*** CTaskMngr priv members ***/
typedef CList<CTask, CTaskDescriptor> TaskList; ke::Vector<ke::AutoPtr<CTask>> m_Tasks;
typedef TaskList::iterator TaskListIter;
TaskList m_Tasks;
float *m_pTmr_CurrentTime; float *m_pTmr_CurrentTime;
float *m_pTmr_TimeLimit; float *m_pTmr_TimeLimit;

2
amxmodx/CVault.h
View File

@ -10,8 +10,6 @@
#ifndef VAULT_CUSTOM_H #ifndef VAULT_CUSTOM_H
#define VAULT_CUSTOM_H #define VAULT_CUSTOM_H
#include "CList.h"
// ***************************************************** // *****************************************************
// class Vault // class Vault
// ***************************************************** // *****************************************************

125
amxmodx/CvarManager.cpp
View File

@ -11,10 +11,13 @@
#include "amxmodx.h" #include "amxmodx.h"
#include <CDetour/detours.h> #include <CDetour/detours.h>
#include <auto-string.h> #include <auto-string.h>
#include <resdk/mod_rehlds_api.h>
CvarManager g_CvarManager; CvarManager g_CvarManager;
DETOUR_DECL_STATIC2(Cvar_DirectSet, void, struct cvar_s*, var, const char*, value) void (*Cvar_DirectSet_Actual)(struct cvar_s* var, const char *value) = nullptr;
void Cvar_DirectSet_Custom(struct cvar_s *var, const char *value, IRehldsHook_Cvar_DirectSet *chain = nullptr)
{ {
CvarInfo* info = nullptr; CvarInfo* info = nullptr;
@ -22,7 +25,7 @@ DETOUR_DECL_STATIC2(Cvar_DirectSet, void, struct cvar_s*, var, const char*, valu
|| strcmp(var->string, value) == 0 // Make sure old and new values are different to not trigger callbacks. || strcmp(var->string, value) == 0 // Make sure old and new values are different to not trigger callbacks.
|| !g_CvarManager.CacheLookup(var->name, &info)) // No data in cache, nothing to do. || !g_CvarManager.CacheLookup(var->name, &info)) // No data in cache, nothing to do.
{ {
DETOUR_STATIC_CALL(Cvar_DirectSet)(var, value); chain ? chain->callNext(var, value) : Cvar_DirectSet_Actual(var, value);
return; return;
} }
@ -56,7 +59,7 @@ DETOUR_DECL_STATIC2(Cvar_DirectSet, void, struct cvar_s*, var, const char*, valu
oldValue = var->string; oldValue = var->string;
} }
DETOUR_STATIC_CALL(Cvar_DirectSet)(var, value); chain ? chain->callNext(var, value) : Cvar_DirectSet_Actual(var, value);
if (!info->binds.empty()) if (!info->binds.empty())
{ {
@ -100,7 +103,18 @@ DETOUR_DECL_STATIC2(Cvar_DirectSet, void, struct cvar_s*, var, const char*, valu
} }
} }
CvarManager::CvarManager() : m_AmxmodxCvars(0), m_HookDetour(nullptr) void Cvar_DirectSet(struct cvar_s *var, const char *value)
{
Cvar_DirectSet_Custom(var, value);
}
void Cvar_DirectSet_RH(IRehldsHook_Cvar_DirectSet *chain, cvar_t *var, const char *value)
{
Cvar_DirectSet_Custom(var, value, chain);
}
CvarManager::CvarManager() : m_AmxmodxCvars(0), m_HookDetour(nullptr), m_ReHookEnabled(false)
{ {
} }
@ -116,16 +130,61 @@ void CvarManager::CreateCvarHook(void)
// Cvar_DirectSet(var, value); // <- We want to hook this. // Cvar_DirectSet(var, value); // <- We want to hook this.
// } // }
void *functionAddress = nullptr; if (!RehldsHookchains)
{
void *functionAddress = nullptr;
if (CommonConfig && CommonConfig->GetMemSig("Cvar_DirectSet", &functionAddress) && functionAddress) if (CommonConfig && CommonConfig->GetMemSig("Cvar_DirectSet", &functionAddress) && functionAddress)
{ {
// Disabled by default. // Disabled by default.
m_HookDetour = DETOUR_CREATE_STATIC_FIXED(Cvar_DirectSet, functionAddress); m_HookDetour = DETOUR_CREATE_STATIC_FIXED(Cvar_DirectSet, functionAddress);
}
else
{
AMXXLOG_Log("Binding/Hooking cvars have been disabled - %s.", RehldsApi ? "update ReHLDS" : "check your gamedata files");
}
} }
else }
void CvarManager::EnableHook()
{
if (RehldsHookchains)
{ {
AMXXLOG_Log("Binding/Hooking cvars have been disabled - check your gamedata files."); if (!m_ReHookEnabled)
{
RehldsHookchains->Cvar_DirectSet()->registerHook(Cvar_DirectSet_RH);
m_ReHookEnabled = true;
}
}
else if (m_HookDetour)
{
m_HookDetour->EnableDetour();
}
}
void CvarManager::DisableHook()
{
if (RehldsHookchains)
{
if (m_ReHookEnabled)
{
RehldsHookchains->Cvar_DirectSet()->unregisterHook(Cvar_DirectSet_RH);
m_ReHookEnabled = false;
}
}
else if (m_HookDetour)
{
m_HookDetour->DisableDetour();
}
}
void CvarManager::DestroyHook()
{
DisableHook();
if (m_HookDetour)
{
m_HookDetour->Destroy();
} }
} }
@ -205,9 +264,9 @@ CvarInfo* CvarManager::CreateCvar(const char* name, const char* value, const cha
// Detour is disabled on map change. // Detour is disabled on map change.
// Don't enable it unless there are things to do. // Don't enable it unless there are things to do.
if ((info->bound.hasMin || info->bound.hasMax) && m_HookDetour) if ((info->bound.hasMin || info->bound.hasMax))
{ {
m_HookDetour->EnableDetour(); EnableHook();
} }
return info; return info;
@ -295,11 +354,8 @@ AutoForward* CvarManager::HookCvarChange(cvar_t* var, AMX* amx, cell param, cons
return nullptr; return nullptr;
} }
// Detour is disabled on map change. // Hook is disabled on map change.
if (m_HookDetour) EnableHook();
{
m_HookDetour->EnableDetour();
}
AutoForward* forward = new AutoForward(forwardId, *callback); AutoForward* forward = new AutoForward(forwardId, *callback);
info->hooks.append(new CvarHook(g_plugins.findPlugin(amx)->getId(), forward)); info->hooks.append(new CvarHook(g_plugins.findPlugin(amx)->getId(), forward));
@ -351,11 +407,8 @@ bool CvarManager::BindCvar(CvarInfo* info, CvarBind::CvarType type, AMX* amx, ce
break; break;
} }
// Detour is disabled on map change. // Hook is disabled on map change.
if (m_HookDetour) EnableHook();
{
m_HookDetour->EnableDetour();
}
return true; return true;
} }
@ -367,11 +420,8 @@ void CvarManager::SetCvarMin(CvarInfo* info, bool set, float value, int pluginId
if (set) if (set)
{ {
// Detour is disabled on map change. // Hook is disabled on map change.
if (m_HookDetour) EnableHook();
{
m_HookDetour->EnableDetour();
}
info->bound.minVal = value; info->bound.minVal = value;
@ -393,11 +443,8 @@ void CvarManager::SetCvarMax(CvarInfo* info, bool set, float value, int pluginId
if (set) if (set)
{ {
// Detour is disabled on map change. // Hook is disabled on map change.
if (m_HookDetour) EnableHook();
{
m_HookDetour->EnableDetour();
}
info->bound.maxVal = value; info->bound.maxVal = value;
@ -584,12 +631,9 @@ void CvarManager::OnPluginUnloaded()
(*cvar)->hooks.clear(); (*cvar)->hooks.clear();
} }
// There is no point to enable detour if at next map change // There is no point to enable hook if at next map change
// no plugins hook cvars. // no plugins hook cvars.
if (m_HookDetour) DisableHook();
{
m_HookDetour->DisableDetour();
}
} }
void CvarManager::OnAmxxShutdown() void CvarManager::OnAmxxShutdown()
@ -619,8 +663,5 @@ void CvarManager::OnAmxxShutdown()
m_Cache.clear(); m_Cache.clear();
if (m_HookDetour) DestroyHook();
{
m_HookDetour->Destroy();
}
} }

4
amxmodx/CvarManager.h
View File

@ -142,6 +142,9 @@ class CvarManager
public: public:
void CreateCvarHook(); void CreateCvarHook();
void EnableHook();
void DisableHook();
void DestroyHook();
CvarInfo* CreateCvar(const char* name, const char* value, const char* plugin, int pluginId, int flags = 0, const char* helpText = ""); CvarInfo* CreateCvar(const char* name, const char* value, const char* plugin, int pluginId, int flags = 0, const char* helpText = "");
CvarInfo* FindCvar(const char* name); CvarInfo* FindCvar(const char* name);
@ -166,6 +169,7 @@ class CvarManager
CvarsList m_Cvars; CvarsList m_Cvars;
size_t m_AmxmodxCvars; size_t m_AmxmodxCvars;
CDetour* m_HookDetour; CDetour* m_HookDetour;
bool m_ReHookEnabled;
}; };
extern CvarManager g_CvarManager; extern CvarManager g_CvarManager;

114
amxmodx/amxmodx.cpp
View File

@ -1468,9 +1468,9 @@ static cell AMX_NATIVE_CALL amx_md5_file(AMX *amx, cell *params)
{ {
int len; int len;
char *str = get_amxstring(amx, params[1], 0, len); char *str = get_amxstring(amx, params[1], 0, len);
char file[255]; char file[PLATFORM_MAX_PATH];
build_pathname_r(file, sizeof(file)-1, "%s", str); build_pathname_r(file, sizeof(file), "%s", str);
const char *hash = hashFile((const char *)file, Hash_Md5); const char *hash = hashFile((const char *)file, Hash_Md5);
if (!hash) if (!hash)
@ -1502,8 +1502,8 @@ static cell AMX_NATIVE_CALL amx_hash_file(AMX *amx, cell *params)
{ {
int len; int len;
char *str = get_amxstring(amx, params[1], 0, len); char *str = get_amxstring(amx, params[1], 0, len);
char file[255]; char file[PLATFORM_MAX_PATH];
build_pathname_r(file, sizeof(file)-1, "%s", str); build_pathname_r(file, sizeof(file), "%s", str);
HashType type = (HashType)params[2]; HashType type = (HashType)params[2];
@ -2016,13 +2016,13 @@ static cell AMX_NATIVE_CALL log_to_file(AMX *amx, cell *params) /* 1 param */
int ilen; int ilen;
char* szFile = get_amxstring(amx, params[1], 0, ilen); char* szFile = get_amxstring(amx, params[1], 0, ilen);
FILE*fp; FILE*fp;
char file[256]; char file[PLATFORM_MAX_PATH];
if (strchr(szFile, '/') || strchr(szFile, '\\')) if (strchr(szFile, '/') || strchr(szFile, '\\'))
{ {
build_pathname_r(file, sizeof(file) - 1, "%s", szFile); build_pathname_r(file, sizeof(file), "%s", szFile);
} else { } else {
build_pathname_r(file, sizeof(file) - 1, "%s/%s", g_log_dir.chars(), szFile); build_pathname_r(file, sizeof(file), "%s/%s", g_log_dir.chars(), szFile);
} }
bool first_time = true; bool first_time = true;
@ -3026,16 +3026,18 @@ static cell AMX_NATIVE_CALL force_unmodified(AMX *amx, cell *params)
char* filename = get_amxstring(amx, params[4], 0, a); char* filename = get_amxstring(amx, params[4], 0, a);
ForceObject* aaa = new ForceObject(filename, (FORCE_TYPE)((int)(params[1])), vec1, vec2, amx); auto object = ke::AutoPtr<ForceObject>(new ForceObject(filename, (FORCE_TYPE)((int)(params[1])), vec1, vec2, amx));
if (aaa) if (object)
{ {
auto forceObjVec = &g_forcegeneric;
if (stristr(filename, ".wav")) if (stristr(filename, ".wav"))
g_forcesounds.put(aaa); forceObjVec = &g_forcesounds;
else if (stristr(filename, ".mdl")) else if (stristr(filename, ".mdl"))
g_forcemodels.put(aaa); forceObjVec = &g_forcemodels;
else
g_forcegeneric.put(aaa); forceObjVec->append(ke::Move(object));
return 1; return 1;
} }
@ -3166,7 +3168,7 @@ static cell AMX_NATIVE_CALL register_logevent(AMX *amx, cell *params)
auto logevent = LogEventHandles.lookup(handle)->m_logevent; auto logevent = LogEventHandles.lookup(handle)->m_logevent;
auto numparam = *params / sizeof(cell); auto numparam = *params / sizeof(cell);
for (auto i = 3; i <= numparam; ++i) for (auto i = 3U; i <= numparam; ++i)
{ {
logevent->registerFilter(get_amxstring(amx, params[i], 0, length)); logevent->registerFilter(get_amxstring(amx, params[i], 0, length));
} }
@ -3214,9 +3216,9 @@ static cell AMX_NATIVE_CALL is_module_loaded(AMX *amx, cell *params)
char *name = get_amxstring(amx, params[1], 0, len); char *name = get_amxstring(amx, params[1], 0, len);
int id = 0; int id = 0;
for (CList<CModule, const char *>::iterator iter = g_modules.begin(); iter; ++iter) for (auto module : g_modules)
{ {
if (stricmp((*iter).getName(), name) == 0) if (!stricmp(module->getName(), name))
return id; return id;
++id; ++id;
@ -3363,50 +3365,50 @@ static cell AMX_NATIVE_CALL register_byval(AMX *amx, cell *params)
// native get_module(id, name[], nameLen, author[], authorLen, version[], versionLen, &status); // native get_module(id, name[], nameLen, author[], authorLen, version[], versionLen, &status);
static cell AMX_NATIVE_CALL get_module(AMX *amx, cell *params) static cell AMX_NATIVE_CALL get_module(AMX *amx, cell *params)
{ {
CList<CModule, const char *>::iterator moduleIter;
// find the module // find the module
int i = params[1]; int i = params[1];
for (moduleIter = g_modules.begin(); moduleIter && i; ++moduleIter) for (auto module : g_modules)
--i;
if (i != 0 || !moduleIter)
return -1; // not found
// set name, author, version
if ((*moduleIter).isAmxx())
{ {
const amxx_module_info_s *info = (*moduleIter).getInfoNew(); if (i--)
const char *name = info && info->name ? info->name : "unk"; {
const char *author = info && info->author ? info->author : "unk"; continue;
const char *version = info && info->version ? info->version : "unk"; }
set_amxstring_utf8(amx, params[2], name, strlen(name), params[3]); // set name, author, version
set_amxstring_utf8(amx, params[4], author, strlen(author), params[5]); if (module->isAmxx())
set_amxstring_utf8(amx, params[6], version, strlen(version), params[7]); {
const amxx_module_info_s *info = module->getInfoNew();
const char *name = info && info->name ? info->name : "unk";
const char *author = info && info->author ? info->author : "unk";
const char *version = info && info->version ? info->version : "unk";
set_amxstring_utf8(amx, params[2], name, strlen(name), params[3]);
set_amxstring_utf8(amx, params[4], author, strlen(author), params[5]);
set_amxstring_utf8(amx, params[6], version, strlen(version), params[7]);
}
// compatibility problem possible
int numParams = params[0] / sizeof(cell);
if (numParams < 8)
{
LogError(amx, AMX_ERR_NATIVE, "Call to incompatible version");
return 0;
}
// set status
cell *addr;
if (amx_GetAddr(amx, params[8], &addr) != AMX_ERR_NONE)
{
LogError(amx, AMX_ERR_NATIVE, "Invalid reference plugin");
return 0;
}
*addr = (cell)module->getStatusValue();
return params[1];
} }
return -1;
// compatibility problem possible
int numParams = params[0] / sizeof(cell);
if (numParams < 8)
{
LogError(amx, AMX_ERR_NATIVE, "Call to incompatible version");
return 0;
}
// set status
cell *addr;
if (amx_GetAddr(amx, params[8], &addr) != AMX_ERR_NONE)
{
LogError(amx, AMX_ERR_NATIVE, "Invalid reference plugin");
return 0;
}
*addr = (cell)(*moduleIter).getStatusValue();
return params[1];
} }
// native log_amx(const msg[], ...); // native log_amx(const msg[], ...);
@ -3891,8 +3893,8 @@ static cell AMX_NATIVE_CALL get_lang(AMX *amx, cell *params)
static cell AMX_NATIVE_CALL register_dictionary(AMX *amx, cell *params) static cell AMX_NATIVE_CALL register_dictionary(AMX *amx, cell *params)
{ {
int len; int len;
static char file[256]; static char file[PLATFORM_MAX_PATH];
int result = g_langMngr.MergeDefinitionFile(build_pathname_r(file, sizeof(file) - 1, "%s/lang/%s", get_localinfo("amxx_datadir", "addons/amxmodx/data"), get_amxstring(amx, params[1], 1, len))); int result = g_langMngr.MergeDefinitionFile(build_pathname_r(file, sizeof(file), "%s/lang/%s", get_localinfo("amxx_datadir", "addons/amxmodx/data"), get_amxstring(amx, params[1], 1, len)));
return result; return result;
} }

29
amxmodx/amxmodx.h
View File

@ -10,7 +10,7 @@
#ifndef AMXMODX_H #ifndef AMXMODX_H
#define AMXMODX_H #define AMXMODX_H
#if defined(__linux__) || defined(__APPLE__) #if defined PLATFORM_POSIX
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include "sclinux.h" #include "sclinux.h"
@ -30,14 +30,13 @@
#endif #endif
#include "hashing.h" #include "hashing.h"
#include "CList.h"
#include "CQueue.h"
#include "modules.h" #include "modules.h"
#include "CPlugin.h" #include "CPlugin.h"
#include "CLibrarySys.h" #include "CLibrarySys.h"
#include <auto-string.h> #include <auto-string.h>
#include <amtl/am-string.h> #include <amtl/am-string.h>
#include <amtl/am-vector.h> #include <amtl/am-vector.h>
#include <amtl/am-inlinelist.h>
#include "CMisc.h" #include "CMisc.h"
#include "CVault.h" #include "CVault.h"
#include "CModule.h" #include "CModule.h"
@ -75,7 +74,7 @@ extern AMX_NATIVE_INFO g_TextParserNatives[];
extern AMX_NATIVE_INFO g_CvarNatives[]; extern AMX_NATIVE_INFO g_CvarNatives[];
extern AMX_NATIVE_INFO g_GameConfigNatives[]; extern AMX_NATIVE_INFO g_GameConfigNatives[];
#if defined(_WIN32) #if defined PLATFORM_WINDOWS
#define DLLOAD(path) (DLHANDLE)LoadLibrary(path) #define DLLOAD(path) (DLHANDLE)LoadLibrary(path)
#define DLPROC(m, func) GetProcAddress(m, func) #define DLPROC(m, func) GetProcAddress(m, func)
#define DLFREE(m) FreeLibrary(m) #define DLFREE(m) FreeLibrary(m)
@ -96,21 +95,13 @@ extern AMX_NATIVE_INFO g_GameConfigNatives[];
#endif #endif
#endif #endif
#if defined(_WIN32) #if defined PLATFORM_WINDOWS
typedef HINSTANCE DLHANDLE; typedef HINSTANCE DLHANDLE;
#else #else
typedef void* DLHANDLE; typedef void* DLHANDLE;
#define INFINITE 0xFFFFFFFF #define INFINITE 0xFFFFFFFF
#endif #endif
#if defined(_WIN32)
#define PATH_SEP_CHAR '\\'
#define ALT_SEP_CHAR '/'
#else
#define PATH_SEP_CHAR '/'
#define ALT_SEP_CHAR '\\'
#endif
#ifndef GETPLAYERAUTHID #ifndef GETPLAYERAUTHID
#define GETPLAYERAUTHID (*g_engfuncs.pfnGetPlayerAuthId) #define GETPLAYERAUTHID (*g_engfuncs.pfnGetPlayerAuthId)
#endif #endif
@ -171,12 +162,12 @@ extern CFrameActionMngr g_frameActionMngr;
extern CPlayer g_players[33]; extern CPlayer g_players[33];
extern CPlayer* mPlayer; extern CPlayer* mPlayer;
extern CmdMngr g_commands; extern CmdMngr g_commands;
extern CList<ForceObject> g_forcemodels; extern ke::Vector<ke::AutoPtr<ForceObject>> g_forcemodels;
extern CList<ForceObject> g_forcesounds; extern ke::Vector<ke::AutoPtr<ForceObject>> g_forcesounds;
extern CList<ForceObject> g_forcegeneric; extern ke::Vector<ke::AutoPtr<ForceObject>> g_forcegeneric;
extern CList<CModule, const char *> g_modules; extern ke::Vector<ke::AutoPtr<CPlayer *>> g_auth;
extern CList<CScript, AMX*> g_loadedscripts; extern ke::InlineList<CModule> g_modules;
extern CList<CPlayer*> g_auth; extern ke::InlineList<CScript> g_loadedscripts;
extern EventsMngr g_events; extern EventsMngr g_events;
extern Grenades g_grenades; extern Grenades g_grenades;
extern LogEventsMngr g_logevents; extern LogEventsMngr g_logevents;

23
amxmodx/amxxlog.cpp
View File

@ -75,14 +75,14 @@ void CLog::CreateNewFile()
time(&td); time(&td);
tm *curTime = localtime(&td); tm *curTime = localtime(&td);
char file[256]; char file[PLATFORM_MAX_PATH];
char name[256]; char name[256];
int i = 0; int i = 0;
while (true) while (true)
{ {
ke::SafeSprintf(name, sizeof(name), "%s/L%02d%02d%03d.log", g_log_dir.chars(), curTime->tm_mon + 1, curTime->tm_mday, i); ke::SafeSprintf(name, sizeof(name), "%s/L%02d%02d%03d.log", g_log_dir.chars(), curTime->tm_mon + 1, curTime->tm_mday, i);
build_pathname_r(file, sizeof(file)-1, "%s", name); build_pathname_r(file, sizeof(file), "%s", name);
FILE *pTmpFile = fopen(file, "r"); // open for reading to check whether the file exists FILE *pTmpFile = fopen(file, "r"); // open for reading to check whether the file exists
if (!pTmpFile) if (!pTmpFile)
@ -108,8 +108,8 @@ void CLog::CreateNewFile()
void CLog::UseFile(const ke::AString &fileName) void CLog::UseFile(const ke::AString &fileName)
{ {
static char file[256]; static char file[PLATFORM_MAX_PATH];
m_LogFile = build_pathname_r(file, sizeof(file) - 1, "%s/%s", g_log_dir.chars(), fileName.chars()); m_LogFile = build_pathname_r(file, sizeof(file), "%s/%s", g_log_dir.chars(), fileName.chars());
} }
void CLog::SetLogType(const char* localInfo) void CLog::SetLogType(const char* localInfo)
@ -128,11 +128,11 @@ void CLog::SetLogType(const char* localInfo)
void CLog::MapChange() void CLog::MapChange()
{ {
// create dir if not existing // create dir if not existing
char file[256]; char file[PLATFORM_MAX_PATH];
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
mkdir(build_pathname_r(file, sizeof(file)-1, "%s", g_log_dir.chars()), 0700); mkdir(build_pathname_r(file, sizeof(file), "%s", g_log_dir.chars()), 0700);
#else #else
mkdir(build_pathname_r(file, sizeof(file) - 1, "%s", g_log_dir.chars())); mkdir(build_pathname_r(file, sizeof(file), "%s", g_log_dir.chars()));
#endif #endif
SetLogType("amxx_logging"); SetLogType("amxx_logging");
@ -152,7 +152,7 @@ void CLog::MapChange()
void CLog::Log(const char *fmt, ...) void CLog::Log(const char *fmt, ...)
{ {
static char file[256]; static char file[PLATFORM_MAX_PATH];
if (m_LogType == 1 || m_LogType == 2) if (m_LogType == 1 || m_LogType == 2)
{ {
@ -189,7 +189,7 @@ void CLog::Log(const char *fmt, ...)
} }
} }
} else { } else {
build_pathname_r(file, sizeof(file) - 1, "%s/L%04d%02d%02d.log", g_log_dir.chars(), (curTime->tm_year + 1900), curTime->tm_mon + 1, curTime->tm_mday); build_pathname_r(file, sizeof(file), "%s/L%04d%02d%02d.log", g_log_dir.chars(), (curTime->tm_year + 1900), curTime->tm_mon + 1, curTime->tm_mday);
pF = fopen(file, "a+"); pF = fopen(file, "a+");
} }
@ -218,7 +218,7 @@ void CLog::Log(const char *fmt, ...)
void CLog::LogError(const char *fmt, ...) void CLog::LogError(const char *fmt, ...)
{ {
static char file[256]; static char file[PLATFORM_MAX_PATH];
static char name[256]; static char name[256];
if (m_FoundError) if (m_FoundError)
@ -244,7 +244,7 @@ void CLog::LogError(const char *fmt, ...)
FILE *pF = NULL; FILE *pF = NULL;
ke::SafeSprintf(name, sizeof(name), "%s/error_%04d%02d%02d.log", g_log_dir.chars(), curTime->tm_year + 1900, curTime->tm_mon + 1, curTime->tm_mday); ke::SafeSprintf(name, sizeof(name), "%s/error_%04d%02d%02d.log", g_log_dir.chars(), curTime->tm_year + 1900, curTime->tm_mon + 1, curTime->tm_mday);
build_pathname_r(file, sizeof(file)-1, "%s", name); build_pathname_r(file, sizeof(file), "%s", name);
pF = fopen(file, "a+"); pF = fopen(file, "a+");
if (pF) if (pF)
@ -266,4 +266,3 @@ void CLog::LogError(const char *fmt, ...)
// print on server console // print on server console
print_srvconsole("L %s: %s\n", date, msg); print_srvconsole("L %s: %s\n", date, msg);
} }

10
amxmodx/binlog.cpp
View File

@ -49,8 +49,8 @@ int LookupFile(AMX_DBG *amxdbg, ucell address)
bool BinLog::Open() bool BinLog::Open()
{ {
const char *data = get_localinfo("amxmodx_datadir", "addons/amxmodx/data"); const char *data = get_localinfo("amxmodx_datadir", "addons/amxmodx/data");
char path[255]; char path[PLATFORM_MAX_PATH];
build_pathname_r(path, sizeof(path)-1, "%s/binlogs", data); build_pathname_r(path, sizeof(path), "%s/binlogs", data);
if (!DirExists(path)) if (!DirExists(path))
{ {
@ -63,8 +63,8 @@ bool BinLog::Open()
return false; return false;
} }
char file[255]; char file[PLATFORM_MAX_PATH];
build_pathname_r(file, sizeof(file)-1, "%s/binlogs/lastlog", data); build_pathname_r(file, sizeof(file), "%s/binlogs/lastlog", data);
unsigned int lastcntr = 0; unsigned int lastcntr = 0;
FILE *lastlog = fopen(file, "rb"); FILE *lastlog = fopen(file, "rb");
@ -81,7 +81,7 @@ bool BinLog::Open()
fwrite(&lastcntr, sizeof(int), 1, lastlog); fwrite(&lastcntr, sizeof(int), 1, lastlog);
fclose(lastlog); fclose(lastlog);
} }
build_pathname_r(file, sizeof(file)-1, "%s/binlogs/binlog%04d.blg", data, lastcntr); build_pathname_r(file, sizeof(file), "%s/binlogs/binlog%04d.blg", data, lastcntr);
m_logfile = file; m_logfile = file;
/** /**

88
amxmodx/debugger.cpp
View File

@ -568,22 +568,26 @@ void Debugger::DisplayTrace(const char *message)
const char *Debugger::_GetFilename() const char *Debugger::_GetFilename()
{ {
if (m_FileName.length() < 1) if (m_FileName.length() < 1)
{ {
const char *filename = ""; CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(m_pAmx);
CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(m_pAmx); if (pl)
if (pl) {
{ m_FileName = pl->getName();
filename = pl->getName(); }
} else { else
CList<CScript,AMX*>::iterator a = g_loadedscripts.find(m_pAmx); {
if (a) for (auto script : g_loadedscripts)
filename = (*a).getName(); {
} if (script->getAMX() == m_pAmx)
m_FileName = filename; {
} m_FileName = script->getName();
break;
return m_FileName.chars(); }
}
}
}
return m_FileName.chars();
} }
const char *Debugger::_GetVersion() const char *Debugger::_GetVersion()
@ -605,31 +609,35 @@ const char *Debugger::_GetVersion()
void Debugger::FmtGenericMsg(AMX *amx, int error, char buffer[], size_t maxLength) void Debugger::FmtGenericMsg(AMX *amx, int error, char buffer[], size_t maxLength)
{ {
const char *filename = ""; const char *filename = "";
char native[sNAMEMAX+1]; char native[sNAMEMAX+1];
for (auto script : g_loadedscripts)
{
if (script->getAMX() == amx)
{
filename = script->getName();
break;
}
}
size_t len = strlen(filename);
for (size_t i=len-1; i<len; i--)
{
if ((filename[i] == '/' || filename[i] == '\\') && i != len - 1)
{
filename = &(filename[i+1]);
break;
}
}
CList<CScript,AMX*>::iterator a = g_loadedscripts.find(amx); if (error == AMX_ERR_EXIT)
if (a) {
filename = (*a).getName(); ke::SafeSprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") - %s", error, filename, GenericError(AMX_ERR_EXIT));
size_t len = strlen(filename); } else if (error == AMX_ERR_NATIVE) {
for (size_t i=len-1; i<len; i--) amx_GetNative(amx, reinterpret_cast<long>(amx->usertags[UT_NATIVE]), native);
{ ke::SafeSprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") (native \"%s\") - debug not enabled!", error, filename, native);
if ((filename[i] == '/' || filename[i] == '\\') && i != len - 1) } else {
{ ke::SafeSprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") - debug not enabled!", error, filename);
filename = &(filename[i+1]); }
break;
}
}
if (error == AMX_ERR_EXIT)
{
ke::SafeSprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") - %s", error, filename, GenericError(AMX_ERR_EXIT));
} else if (error == AMX_ERR_NATIVE) {
amx_GetNative(amx, reinterpret_cast<long>(amx->usertags[UT_NATIVE]), native);
ke::SafeSprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") (native \"%s\") - debug not enabled!", error, filename, native);
} else {
ke::SafeSprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") - debug not enabled!", error, filename);
}
} }
void Debugger::GenericMessage(AMX *amx, int err) void Debugger::GenericMessage(AMX *amx, int err)

6
amxmodx/file.cpp
View File

@ -601,7 +601,7 @@ static cell AMX_NATIVE_CALL amx_fputs(AMX *amx, cell *params)
++length; ++length;
} }
if (fp->Write(string, length) != length) if (fp->Write(string, length) != (size_t)length)
{ {
return -1; return -1;
} }
@ -1015,8 +1015,8 @@ static cell AMX_NATIVE_CALL rename_file(AMX *amx, cell *params)
if (params[0] / sizeof(cell) >= 3 && params[3] > 0) if (params[0] / sizeof(cell) >= 3 && params[3] > 0)
{ {
build_pathname_r(file_old_r, sizeof(file_old_r) - 1, "%s", file_old); build_pathname_r(file_old_r, sizeof(file_old_r), "%s", file_old);
build_pathname_r(file_new_r, sizeof(file_new_r) - 1, "%s", file_new); build_pathname_r(file_new_r, sizeof(file_new_r), "%s", file_new);
} }
else else
{ {

150
amxmodx/meta_api.cpp
View File

@ -32,6 +32,8 @@
#include <engine_strucs.h> #include <engine_strucs.h>
#include <CDetour/detours.h> #include <CDetour/detours.h>
#include "CoreConfig.h" #include "CoreConfig.h"
#include <resdk/mod_rehlds_api.h>
#include <amtl/am-utility.h>
plugin_info_t Plugin_info = plugin_info_t Plugin_info =
{ {
@ -63,10 +65,10 @@ extern ke::Vector<CAdminData *> DynamicAdmins;
CLog g_log; CLog g_log;
CForwardMngr g_forwards; CForwardMngr g_forwards;
CList<CPlayer*> g_auth; ke::Vector<ke::AutoPtr<CPlayer *>> g_auth;
CList<ForceObject> g_forcemodels; ke::Vector<ke::AutoPtr<ForceObject>> g_forcemodels;
CList<ForceObject> g_forcesounds; ke::Vector<ke::AutoPtr<ForceObject>> g_forcesounds;
CList<ForceObject> g_forcegeneric; ke::Vector<ke::AutoPtr<ForceObject>> g_forcegeneric;
CPlayer g_players[33]; CPlayer g_players[33];
CPlayer* mPlayer; CPlayer* mPlayer;
CPluginMngr g_plugins; CPluginMngr g_plugins;
@ -185,9 +187,9 @@ void ParseAndOrAdd(CStack<ke::AString *> & files, const char *name)
void BuildPluginFileList(const char *initialdir, CStack<ke::AString *> & files) void BuildPluginFileList(const char *initialdir, CStack<ke::AString *> & files)
{ {
char path[255]; char path[PLATFORM_MAX_PATH];
#if defined WIN32 #if defined WIN32
build_pathname_r(path, sizeof(path)-1, "%s/*.ini", initialdir); build_pathname_r(path, sizeof(path), "%s/*.ini", initialdir);
_finddata_t fd; _finddata_t fd;
intptr_t handle = _findfirst(path, &fd); intptr_t handle = _findfirst(path, &fd);
@ -203,7 +205,7 @@ void BuildPluginFileList(const char *initialdir, CStack<ke::AString *> & files)
_findclose(handle); _findclose(handle);
#elif defined(__linux__) || defined(__APPLE__) #elif defined(__linux__) || defined(__APPLE__)
build_pathname_r(path, sizeof(path)-1, "%s/", initialdir); build_pathname_r(path, sizeof(path), "%s/", initialdir);
struct dirent *ep; struct dirent *ep;
DIR *dp; DIR *dp;
@ -263,10 +265,10 @@ int C_PrecacheModel(const char *s)
if (!g_forcedmodules) if (!g_forcedmodules)
{ {
g_forcedmodules = true; g_forcedmodules = true;
for (CList<ForceObject>::iterator a = g_forcemodels.begin(); a; ++a) for (auto &model : g_forcemodels)
{ {
PRECACHE_MODEL((char*)(*a).getFilename()); PRECACHE_MODEL(model->getFilename());
ENGINE_FORCE_UNMODIFIED((*a).getForceType(), (*a).getMin(), (*a).getMax(), (*a).getFilename()); ENGINE_FORCE_UNMODIFIED(model->getForceType(), model->getMin(), model->getMax(), model->getFilename());
} }
} }
@ -278,10 +280,10 @@ int C_PrecacheSound(const char *s)
if (!g_forcedsounds) if (!g_forcedsounds)
{ {
g_forcedsounds = true; g_forcedsounds = true;
for (CList<ForceObject>::iterator a = g_forcesounds.begin(); a; ++a) for (auto &sound : g_forcesounds)
{ {
PRECACHE_SOUND((char*)(*a).getFilename()); PRECACHE_SOUND(sound->getFilename());
ENGINE_FORCE_UNMODIFIED((*a).getForceType(), (*a).getMin(), (*a).getMax(), (*a).getFilename()); ENGINE_FORCE_UNMODIFIED(sound->getForceType(), sound->getMin(), sound->getMax(), sound->getFilename());
} }
if (!g_bmod_cstrike) if (!g_bmod_cstrike)
@ -461,8 +463,8 @@ int C_Spawn(edict_t *pent)
CVAR_SET_STRING(init_amxmodx_modules.name, buffer); CVAR_SET_STRING(init_amxmodx_modules.name, buffer);
// ###### Load Vault // ###### Load Vault
char file[255]; char file[PLATFORM_MAX_PATH];
g_vault.setSource(build_pathname_r(file, sizeof(file) - 1, "%s", get_localinfo("amxx_vault", "addons/amxmodx/configs/vault.ini"))); g_vault.setSource(build_pathname_r(file, sizeof(file), "%s", get_localinfo("amxx_vault", "addons/amxmodx/configs/vault.ini")));
g_vault.loadVault(); g_vault.loadVault();
// ###### Init time and freeze tasks // ###### Init time and freeze tasks
@ -531,11 +533,10 @@ int C_Spawn(edict_t *pent)
executeForwards(FF_PluginPrecache); executeForwards(FF_PluginPrecache);
g_dontprecache = true; g_dontprecache = true;
for (CList<ForceObject>::iterator a = g_forcegeneric.begin(); a; ++a) for (auto &generic : g_forcegeneric)
{ {
PRECACHE_GENERIC((char*)(*a).getFilename()); PRECACHE_GENERIC(generic->getFilename());
ENGINE_FORCE_UNMODIFIED((*a).getForceType(), ENGINE_FORCE_UNMODIFIED(generic->getForceType(), generic->getMin(), generic->getMax(), generic->getFilename());
(*a).getMin(), (*a).getMax(), (*a).getFilename());
} }
RETURN_META_VALUE(MRES_IGNORED, 0); RETURN_META_VALUE(MRES_IGNORED, 0);
@ -837,9 +838,9 @@ BOOL C_ClientConnect_Post(edict_t *pEntity, const char *pszName, const char *psz
if (a) if (a)
{ {
CPlayer** aa = new CPlayer*(pPlayer); auto playerToAuth = ke::AutoPtr<CPlayer *>(new CPlayer*(pPlayer));
if (aa) if (playerToAuth)
g_auth.put(aa); g_auth.append(ke::Move(playerToAuth));
} else { } else {
pPlayer->Authorize(); pPlayer->Authorize();
const char* authid = GETPLAYERAUTHID(pEntity); const char* authid = GETPLAYERAUTHID(pEntity);
@ -902,6 +903,31 @@ void C_ClientDisconnect(edict_t *pEntity)
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
CPlayer* SV_DropClient_PreHook(edict_s *client, qboolean crash, const char *buffer, size_t buffer_size)
{
auto pPlayer = client ? GET_PLAYER_POINTER(client) : nullptr;
if (pPlayer)
{
if (pPlayer->initialized)
{
pPlayer->disconnecting = true;
executeForwards(FF_ClientDisconnected, pPlayer->index, TRUE, prepareCharArray(const_cast<char*>(buffer), buffer_size, true), buffer_size - 1);
}
}
return pPlayer;
}
void SV_DropClient_PostHook(CPlayer *pPlayer, qboolean crash, const char *buffer)
{
if (pPlayer)
{
pPlayer->Disconnect();
executeForwards(FF_ClientRemove, pPlayer->index, TRUE, buffer);
}
}
// void SV_DropClient(client_t *cl, qboolean crash, const char *fmt, ...); // void SV_DropClient(client_t *cl, qboolean crash, const char *fmt, ...);
DETOUR_DECL_STATIC3_VAR(SV_DropClient, void, client_t*, cl, qboolean, crash, const char*, format) DETOUR_DECL_STATIC3_VAR(SV_DropClient, void, client_t*, cl, qboolean, crash, const char*, format)
{ {
@ -912,24 +938,23 @@ DETOUR_DECL_STATIC3_VAR(SV_DropClient, void, client_t*, cl, qboolean, crash, con
ke::SafeVsprintf(buffer, sizeof(buffer) - 1, format, ap); ke::SafeVsprintf(buffer, sizeof(buffer) - 1, format, ap);
va_end(ap); va_end(ap);
auto pPlayer = cl->edict ? GET_PLAYER_POINTER(cl->edict) : nullptr; auto pPlayer = SV_DropClient_PreHook(cl->edict, crash, buffer, ARRAY_LENGTH(buffer));
if (pPlayer)
{
if (pPlayer->initialized)
{
pPlayer->disconnecting = true;
executeForwards(FF_ClientDisconnected, pPlayer->index, TRUE, prepareCharArray(buffer, sizeof(buffer), true), sizeof(buffer) - 1);
}
}
DETOUR_STATIC_CALL(SV_DropClient)(cl, crash, "%s", buffer); DETOUR_STATIC_CALL(SV_DropClient)(cl, crash, "%s", buffer);
if (pPlayer) SV_DropClient_PostHook(pPlayer, crash, buffer);
{ }
pPlayer->Disconnect();
executeForwards(FF_ClientRemove, pPlayer->index, TRUE, buffer); void SV_DropClient_RH(IRehldsHook_SV_DropClient *chain, IGameClient *cl, bool crash, const char *format)
} {
char buffer[1024];
ke::SafeStrcpy(buffer, sizeof(buffer), format);
auto pPlayer = SV_DropClient_PreHook(cl->GetEdict(), crash, buffer, ARRAY_LENGTH(buffer));
chain->callNext(cl, crash, buffer);
SV_DropClient_PostHook(pPlayer, crash, buffer);
} }
void C_ClientPutInServer_Post(edict_t *pEntity) void C_ClientPutInServer_Post(edict_t *pEntity)
@ -1087,10 +1112,16 @@ void C_ClientCommand(edict_t *pEntity)
int item = pMenu->PagekeyToItem(pPlayer->page, pressed_key+1); int item = pMenu->PagekeyToItem(pPlayer->page, pressed_key+1);
if (item == MENU_BACK) if (item == MENU_BACK)
{ {
if (pMenu->pageCallback >= 0)
executeForwards(pMenu->pageCallback, static_cast<cell>(pPlayer->index), static_cast<cell>(MENU_BACK));
pMenu->Display(pPlayer->index, pPlayer->page - 1); pMenu->Display(pPlayer->index, pPlayer->page - 1);
} }
else if (item == MENU_MORE) else if (item == MENU_MORE)
{ {
if (pMenu->pageCallback >= 0)
executeForwards(pMenu->pageCallback, static_cast<cell>(pPlayer->index), static_cast<cell>(MENU_MORE));
pMenu->Display(pPlayer->index, pPlayer->page + 1); pMenu->Display(pPlayer->index, pPlayer->page + 1);
} }
else else
@ -1151,21 +1182,22 @@ void C_StartFrame_Post(void)
if (g_auth_time < gpGlobals->time) if (g_auth_time < gpGlobals->time)
{ {
g_auth_time = gpGlobals->time + 0.7f; g_auth_time = gpGlobals->time + 0.7f;
CList<CPlayer*>::iterator a = g_auth.begin();
while (a) size_t i = 0;
while (i < g_auth.length())
{ {
const char* auth = GETPLAYERAUTHID((*a)->pEdict); auto player = g_auth[i].get();
const char* auth = GETPLAYERAUTHID((*player)->pEdict);
if ((auth == 0) || (*auth == 0)) if ((auth == 0) || (*auth == 0))
{ {
a.remove(); g_auth.remove(i);
continue; continue;
} }
if (strcmp(auth, "STEAM_ID_PENDING")) if (strcmp(auth, "STEAM_ID_PENDING"))
{ {
(*a)->Authorize(); (*player)->Authorize();
if (g_auth_funcs.size()) if (g_auth_funcs.size())
{ {
List<AUTHORIZEFUNC>::iterator iter, end=g_auth_funcs.end(); List<AUTHORIZEFUNC>::iterator iter, end=g_auth_funcs.end();
@ -1173,15 +1205,15 @@ void C_StartFrame_Post(void)
for (iter=g_auth_funcs.begin(); iter!=end; iter++) for (iter=g_auth_funcs.begin(); iter!=end; iter++)
{ {
fn = (*iter); fn = (*iter);
fn((*a)->index, auth); fn((*player)->index, auth);
} }
} }
executeForwards(FF_ClientAuthorized, static_cast<cell>((*a)->index), auth); executeForwards(FF_ClientAuthorized, static_cast<cell>((*player)->index), auth);
a.remove(); g_auth.remove(i);
continue; continue;
} }
++a; i++;
} }
} }
@ -1609,19 +1641,27 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
ConfigManager.OnAmxxStartup(); ConfigManager.OnAmxxStartup();
g_CvarManager.CreateCvarHook(); if (RehldsApi_Init())
void *address = nullptr;
if (CommonConfig && CommonConfig->GetMemSig("SV_DropClient", &address) && address)
{ {
DropClientDetour = DETOUR_CREATE_STATIC_FIXED(SV_DropClient, address); RehldsHookchains->SV_DropClient()->registerHook(SV_DropClient_RH);
} }
else else
{ {
AMXXLOG_Log("client_disconnected and client_remove forwards have been disabled - check your gamedata files."); void *address = nullptr;
if (CommonConfig && CommonConfig->GetMemSig("SV_DropClient", &address) && address)
{
DropClientDetour = DETOUR_CREATE_STATIC_FIXED(SV_DropClient, address);
}
else
{
auto reason = RehldsApi ? "update ReHLDS" : "check your gamedata files";
AMXXLOG_Log("client_disconnected and client_remove forwards have been disabled - %s.", reason);
}
} }
g_CvarManager.CreateCvarHook();
GET_IFACE<IFileSystem>("filesystem_stdio", g_FileSystem, FILESYSTEM_INTERFACE_VERSION); GET_IFACE<IFileSystem>("filesystem_stdio", g_FileSystem, FILESYSTEM_INTERFACE_VERSION);
return (TRUE); return (TRUE);
@ -1671,6 +1711,10 @@ C_DLLEXPORT int Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reason)
{ {
DropClientDetour->Destroy(); DropClientDetour->Destroy();
} }
else if (RehldsApi)
{
RehldsHookchains->SV_DropClient()->unregisterHook(SV_DropClient_RH);
}
return (TRUE); return (TRUE);
} }

379
amxmodx/modules.cpp
View File

@ -31,9 +31,10 @@
#include "trie_natives.h" #include "trie_natives.h"
#include "CDataPack.h" #include "CDataPack.h"
#include "CGameConfigs.h" #include "CGameConfigs.h"
#include <amtl/os/am-path.h>
CList<CModule, const char*> g_modules; ke::InlineList<CModule> g_modules;
CList<CScript, AMX*> g_loadedscripts; ke::InlineList<CScript> g_loadedscripts;
CModule *g_CurrentlyCalledModule = NULL; // The module we are in at the moment; NULL otherwise CModule *g_CurrentlyCalledModule = NULL; // The module we are in at the moment; NULL otherwise
@ -332,9 +333,15 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
} }
#endif #endif
CScript* aa = new CScript(amx, *program, filename); auto script = new CScript(amx, *program, filename);
g_loadedscripts.put(aa); if (!script)
{
ke::SafeSprintf(error, 64, "Failed to allocate memory for script");
return (amx->error = AMX_ERR_MEMORY);
}
g_loadedscripts.append(script);
set_amxnatives(amx, error); set_amxnatives(amx, error);
@ -419,23 +426,19 @@ int CheckModules(AMX *amx, char error[128])
/* for binary compat */ /* for binary compat */
if (!found) if (!found)
{ {
CList<CModule, const char *>::iterator a = g_modules.begin(); for (auto module : g_modules)
while (a)
{ {
CModule &cm = (*a); if (module->getStatusValue() != MODULE_LOADED)
if (cm.getStatusValue() != MODULE_LOADED)
{ {
++a;
continue; continue;
} }
if (cm.getInfoNew() && if (module->getInfoNew() &&
cm.getInfoNew()->logtag && module->getInfoNew()->logtag &&
!strcasecmp(cm.getInfoNew()->logtag, buffer)) !strcasecmp(module->getInfoNew()->logtag, buffer))
{ {
found = true; found = true;
break; break;
} }
++a;
} }
} }
@ -497,18 +500,16 @@ int CheckModules(AMX *amx, char error[128])
int set_amxnatives(AMX* amx, char error[128]) int set_amxnatives(AMX* amx, char error[128])
{ {
CModule *cm; for (auto module : g_modules)
for (CList<CModule, const char *>::iterator a = g_modules.begin(); a ; ++a)
{ {
cm = &(*a); for (size_t i = 0; i < module->m_Natives.length(); i++)
for (size_t i=0; i<cm->m_Natives.length(); i++)
{ {
amx_Register(amx, cm->m_Natives[i], -1); amx_Register(amx, module->m_Natives[i], -1);
} }
for (size_t i = 0; i < cm->m_NewNatives.length(); i++) for (size_t i = 0; i < module->m_NewNatives.length(); i++)
{ {
amx_Register(amx, cm->m_NewNatives[i], -1); amx_Register(amx, module->m_NewNatives[i], -1);
} }
} }
@ -577,10 +578,16 @@ int unload_amxscript(AMX* amx, void** program)
if (opt) if (opt)
delete opt; delete opt;
CList<CScript, AMX*>::iterator a = g_loadedscripts.find(amx); for (auto script : g_loadedscripts)
{
if (script->getAMX() == amx)
{
g_loadedscripts.remove(script);
delete script;
if (a) break;
a.remove(); }
}
char *prg = (char *)*program; char *prg = (char *)*program;
@ -627,20 +634,20 @@ int unload_amxscript(AMX* amx, void** program)
AMX* get_amxscript(int id, void** code, const char** filename) AMX* get_amxscript(int id, void** code, const char** filename)
{ {
CList<CScript, AMX*>::iterator a = g_loadedscripts.begin(); for (auto script : g_loadedscripts)
while (a && id--)
++a;
if (a)
{ {
*filename = (*a).getName(); if (id--)
*code = (*a).getCode(); {
continue;
}
return (*a).getAMX(); *filename = script->getName();
*code = script->getCode();
return script->getAMX();
} }
return 0; return nullptr;
} }
const char* GetFileName(AMX *amx) const char* GetFileName(AMX *amx)
@ -651,10 +658,17 @@ const char* GetFileName(AMX *amx)
if (pl) if (pl)
{ {
filename = pl->getName(); filename = pl->getName();
} else { }
CList<CScript,AMX*>::iterator a = g_loadedscripts.find(amx); else
if (a) {
filename = (*a).getName(); for (auto script : g_loadedscripts)
{
if (script->getAMX() == amx)
{
filename = script->getName();
break;
}
}
} }
return filename; return filename;
@ -662,8 +676,14 @@ const char* GetFileName(AMX *amx)
const char* get_amxscriptname(AMX* amx) const char* get_amxscriptname(AMX* amx)
{ {
CList<CScript, AMX*>::iterator a = g_loadedscripts.find(amx); for (auto script : g_loadedscripts)
return a ? (*a).getName() : ""; {
if (script->getAMX() == amx)
{
return script->getName();
}
}
return "";
} }
void get_modname(char* buffer) void get_modname(char* buffer)
@ -671,77 +691,41 @@ void get_modname(char* buffer)
strcpy(buffer, g_mod_name.chars()); strcpy(buffer, g_mod_name.chars());
} }
char* build_pathname(const char *fmt, ...) char *build_pathname(const char *fmt, ...)
{ {
static char string[256]; static char string[PLATFORM_MAX_PATH];
int b; auto len = ke::path::Format(string, sizeof(string), "%s/", g_mod_name.chars());
int a = b = ke::SafeSprintf(string, sizeof(string), "%s%c", g_mod_name.chars(), PATH_SEP_CHAR);
va_list argptr; va_list argptr;
va_start(argptr, fmt); va_start(argptr, fmt);
a += vsnprintf (&string[a], 255 - a, fmt, argptr); ke::path::FormatVa(&string[len], sizeof(string) - len, fmt, argptr);
string[a] = 0;
va_end(argptr); va_end(argptr);
char* path = &string[b];
while (*path)
{
if (*path == ALT_SEP_CHAR)
{
*path = PATH_SEP_CHAR;
}
++path;
}
return string; return string;
} }
char *build_pathname_r(char *buffer, size_t maxlen, const char *fmt, ...) char *build_pathname_r(char *buffer, size_t maxlen, const char *fmt, ...)
{ {
ke::SafeSprintf(buffer, maxlen, "%s%c", g_mod_name.chars(), PATH_SEP_CHAR); auto len = ke::path::Format(buffer, maxlen, "%s/", g_mod_name.chars());
size_t len = strlen(buffer);
char *ptr = buffer + len;
va_list argptr; va_list argptr;
va_start(argptr, fmt); va_start(argptr, fmt);
vsnprintf (ptr, maxlen-len, fmt, argptr); ke::path::FormatVa(&buffer[len], maxlen - len, fmt, argptr);
va_end (argptr); va_end (argptr);
while (*ptr)
{
if (*ptr == ALT_SEP_CHAR)
{
*ptr = PATH_SEP_CHAR;
}
++ptr;
}
return buffer; return buffer;
} }
// build pathname based on addons dir // build pathname based on addons dir
char* build_pathname_addons(const char *fmt, ...) char *build_pathname_addons(const char *fmt, ...)
{ {
static char string[256]; static char string[PLATFORM_MAX_PATH];
va_list argptr; va_list argptr;
va_start(argptr, fmt); va_start(argptr, fmt);
vsnprintf (string, 255, fmt, argptr); ke::path::FormatVa(string, sizeof(string), fmt, argptr);
va_end(argptr); va_end(argptr);
char* path = string;
while (*path)
{
if (*path == ALT_SEP_CHAR)
{
*path = PATH_SEP_CHAR;
}
++path;
}
return string; return string;
} }
@ -762,7 +746,7 @@ bool ConvertModuleName(const char *pathString, char *path)
/* run to filename instead of dir */ /* run to filename instead of dir */
char *ptr = tmpname; char *ptr = tmpname;
ptr = tmpname + len - 1; ptr = tmpname + len - 1;
while (ptr >= tmpname && *ptr != PATH_SEP_CHAR) while (ptr >= tmpname && *ptr != PLATFORM_SEP_CHAR)
ptr--; ptr--;
if (ptr >= tmpname) if (ptr >= tmpname)
{ {
@ -822,7 +806,7 @@ bool ConvertModuleName(const char *pathString, char *path)
*ptr = '\0'; *ptr = '\0';
} }
size_t length = ke::SafeSprintf(path, PLATFORM_MAX_PATH, "%s%c%s_amxx", orig_path, PATH_SEP_CHAR, tmpname); auto length = ke::path::Format(path, PLATFORM_MAX_PATH, "%s/%s_amxx", orig_path, tmpname);
#if defined PLATFORM_LINUX #if defined PLATFORM_LINUX
# if defined AMD64 || PAWN_CELL_SIZE == 64 # if defined AMD64 || PAWN_CELL_SIZE == 64
@ -843,7 +827,7 @@ bool LoadModule(const char *shortname, PLUG_LOADTIME now, bool simplify, bool no
build_pathname_r( build_pathname_r(
pathString, pathString,
sizeof(pathString)-1, sizeof(pathString),
"%s/%s", "%s/%s",
get_localinfo("amxx_modulesdir", "addons/amxmodx/modules"), get_localinfo("amxx_modulesdir", "addons/amxmodx/modules"),
shortname); shortname);
@ -864,18 +848,26 @@ bool LoadModule(const char *shortname, PLUG_LOADTIME now, bool simplify, bool no
fclose(fp); fclose(fp);
} }
CList<CModule, const char *>::iterator a = g_modules.find(path); for (auto module : g_modules)
{
if (!strcmp(module->getFilename(), path))
{
return false;
}
}
if (a) auto module = new CModule(path);
if (!module)
{
return false; return false;
}
CModule* cc = new CModule(path); module->queryModule();
cc->queryModule();
bool error = true; bool error = true;
switch (cc->getStatusValue()) switch (module->getStatusValue())
{ {
case MODULE_BADLOAD: case MODULE_BADLOAD:
report_error(1, "[AMXX] Module is not a valid library (file \"%s\")", path); report_error(1, "[AMXX] Module is not a valid library (file \"%s\")", path);
@ -887,7 +879,7 @@ bool LoadModule(const char *shortname, PLUG_LOADTIME now, bool simplify, bool no
report_error(1, "[AMXX] Couldn't find \"AMX_Query\" or \"AMXX_Query\" (file \"%s\")", path); report_error(1, "[AMXX] Couldn't find \"AMX_Query\" or \"AMXX_Query\" (file \"%s\")", path);
break; break;
case MODULE_NOATTACH: case MODULE_NOATTACH:
report_error(1, "[AMXX] Couldn't find \"%s\" (file \"%s\")", cc->isAmxx() ? "AMXX_Attach" : "AMX_Attach", path); report_error(1, "[AMXX] Couldn't find \"%s\" (file \"%s\")", module->isAmxx() ? "AMXX_Attach" : "AMX_Attach", path);
break; break;
case MODULE_OLD: case MODULE_OLD:
report_error(1, "[AMXX] Module has a different interface version (file \"%s\")", path); report_error(1, "[AMXX] Module has a different interface version (file \"%s\")", path);
@ -909,38 +901,38 @@ bool LoadModule(const char *shortname, PLUG_LOADTIME now, bool simplify, bool no
break; break;
} }
g_modules.put(cc); g_modules.append(module);
if (error) if (error)
{ {
return false; return false;
} }
if (cc->IsMetamod()) if (module->IsMetamod())
{ {
char *mmpathname = build_pathname_addons( char *mmpathname = build_pathname_addons(
"%s/%s", "%s/%s",
get_localinfo("amxx_modulesdir", "addons/amxmodx/modules"), get_localinfo("amxx_modulesdir", "addons/amxmodx/modules"),
shortname); shortname);
ConvertModuleName(mmpathname, path); ConvertModuleName(mmpathname, path);
cc->attachMetamod(path, now); module->attachMetamod(path, now);
} }
bool retVal = cc->attachModule(); bool retVal = module->attachModule();
if (cc->isAmxx() && !retVal) if (module->isAmxx() && !retVal)
{ {
switch (cc->getStatusValue()) switch (module->getStatusValue())
{ {
case MODULE_FUNCNOTPRESENT: case MODULE_FUNCNOTPRESENT:
report_error(1, "[AMXX] Module requested a not existing function (file \"%s\")%s%s%s", cc->getFilename(), cc->getMissingFunc() ? " (func \"" : "", report_error(1, "[AMXX] Module requested a not existing function (file \"%s\")%s%s%s", module->getFilename(), module->getMissingFunc() ? " (func \"" : "",
cc->getMissingFunc() ? cc->getMissingFunc() : "", cc->getMissingFunc() ? "\")" : ""); module->getMissingFunc() ? module->getMissingFunc() : "", module->getMissingFunc() ? "\")" : "");
break; break;
case MODULE_INTERROR: case MODULE_INTERROR:
report_error(1, "[AMXX] Internal error during module load (file \"%s\")", cc->getFilename()); report_error(1, "[AMXX] Internal error during module load (file \"%s\")", module->getFilename());
break; break;
case MODULE_BADLOAD: case MODULE_BADLOAD:
report_error(1, "[AMXX] Module is not a valid library (file \"%s\")", cc->getFilename()); report_error(1, "[AMXX] Module is not a valid library (file \"%s\")", module->getFilename());
break; break;
} }
@ -1004,29 +996,33 @@ int loadModules(const char* filename, PLUG_LOADTIME now)
void detachModules() void detachModules()
{ {
CList<CModule, const char *>::iterator a = g_modules.begin(); auto moduleIter = g_modules.begin(), end = g_modules.end();
while (moduleIter != end)
while (a)
{ {
(*a).detachModule(); auto module = *moduleIter;
a.remove();
module->detachModule();
moduleIter = g_modules.erase(moduleIter);
delete module;
} }
} }
void detachReloadModules() void detachReloadModules()
{ {
CList<CModule, const char *>::iterator a = g_modules.begin(); auto moduleIter = g_modules.begin(), end = g_modules.end();
while (moduleIter != end)
while (a)
{ {
if ((*a).isReloadable() && !(*a).IsMetamod()) auto module = *moduleIter;
if (module->isReloadable() && !module->IsMetamod())
{ {
(*a).detachModule(); module->detachModule();
a.remove();
moduleIter = g_modules.erase(moduleIter);
delete module;
continue; continue;
} }
++a; moduleIter++;
} }
} }
@ -1050,34 +1046,29 @@ const char* strip_name(const char* a)
// Get the number of running modules // Get the number of running modules
int countModules(CountModulesMode mode) int countModules(CountModulesMode mode)
{ {
CList<CModule, const char *>::iterator iter; auto num = 0;
int num;
switch (mode) switch (mode)
{ {
case CountModules_All: case CountModules_All:
return g_modules.size(); for (auto module : g_modules)
case CountModules_Running:
iter = g_modules.begin();
num = 0;
while (iter)
{ {
if ((*iter).getStatusValue() == MODULE_LOADED) num++;
}
return num;
case CountModules_Running:
for (auto module : g_modules)
{
if (module->getStatusValue() == MODULE_LOADED)
++num; ++num;
++iter;
} }
return num; return num;
case CountModules_Stopped: case CountModules_Stopped:
iter = g_modules.begin(); for (auto module : g_modules)
num = 0;
while (iter)
{ {
if ((*iter).getStatusValue() != MODULE_LOADED) if (module->getStatusValue() != MODULE_LOADED)
++num; ++num;
++iter;
} }
return num; return num;
@ -1089,35 +1080,26 @@ int countModules(CountModulesMode mode)
// Call all modules' AMXX_PluginsLoaded functions // Call all modules' AMXX_PluginsLoaded functions
void modules_callPluginsLoaded() void modules_callPluginsLoaded()
{ {
CList<CModule, const char *>::iterator iter = g_modules.begin(); for (auto module : g_modules)
while (iter)
{ {
(*iter).CallPluginsLoaded(); module->CallPluginsLoaded();
++iter;
} }
} }
//same for unloaded //same for unloaded
void modules_callPluginsUnloaded() void modules_callPluginsUnloaded()
{ {
CList<CModule, const char *>::iterator iter = g_modules.begin(); for (auto module : g_modules)
while (iter)
{ {
(*iter).CallPluginsUnloaded(); module->CallPluginsUnloaded();
++iter;
} }
} }
void modules_callPluginsUnloading() void modules_callPluginsUnloading()
{ {
CList<CModule, const char *>::iterator iter = g_modules.begin(); for (auto module : g_modules)
while (iter)
{ {
(*iter).CallPluginsUnloading(); module->CallPluginsUnloading();
++iter;
} }
} }
@ -1149,44 +1131,42 @@ const char *MNF_GetModname(void)
AMX *MNF_GetAmxScript(int id) AMX *MNF_GetAmxScript(int id)
{ {
CList<CScript, AMX*>::iterator iter = g_loadedscripts.begin(); for (auto script : g_loadedscripts)
{
while (iter && id--) if (id--)
++iter; {
continue;
if (iter == 0) }
return NULL; return script->getAMX();
}
return (*iter).getAMX(); return nullptr;
} }
const char *MNF_GetAmxScriptName(int id) const char *MNF_GetAmxScriptName(int id)
{ {
CList<CScript, AMX*>::iterator iter = g_loadedscripts.begin(); for (auto script : g_loadedscripts)
{
while (iter && id--) if (id--)
++iter; {
continue;
if (iter == 0) }
return NULL; return script->getName();
}
return (*iter).getName(); return nullptr;
} }
int MNF_FindAmxScriptByName(const char *name) int MNF_FindAmxScriptByName(const char *name)
{ {
CList<CScript, AMX*>::iterator iter = g_loadedscripts.begin();
bool found = false; bool found = false;
int i = 0; int i = 0;
while (iter) for (auto script : g_loadedscripts)
{ {
if (stricmp((*iter).getName(), name) == 0) if (!stricmp(script->getName(), name))
{ {
found = true; found = true;
break; break;
} }
++iter;
++i; ++i;
} }
@ -1198,19 +1178,16 @@ int MNF_FindAmxScriptByName(const char *name)
int MNF_FindAmxScriptByAmx(const AMX *amx) int MNF_FindAmxScriptByAmx(const AMX *amx)
{ {
CList<CScript, AMX*>::iterator iter = g_loadedscripts.begin();
bool found = false; bool found = false;
int i = 0; int i = 0;
while (iter) for (auto script : g_loadedscripts)
{ {
if (amx == (*iter).getAMX()) if (script->getAMX() == amx)
{ {
found = true; found = true;
break; break;
} }
++iter;
++i; ++i;
} }
@ -1311,17 +1288,16 @@ void MNF_OverrideNatives(AMX_NATIVE_INFO *natives, const char *name)
{ {
//HACKHACK - we should never have had to do this //HACKHACK - we should never have had to do this
//find a better solution for SourceMod!!! //find a better solution for SourceMod!!!
for (CList<CModule, const char *>::iterator a = g_modules.begin(); a ; ++a) for (auto module : g_modules)
{ {
CModule &cm = (*a); if (module->getStatusValue() != MODULE_LOADED)
if (cm.getStatusValue() != MODULE_LOADED)
continue; continue;
const amxx_module_info_s *p = cm.getInfoNew(); const amxx_module_info_s *p = module->getInfoNew();
if (!p || !p->name) if (!p || !p->name)
continue; continue;
if (strcmp(p->name, name)==0) if (strcmp(p->name, name)==0)
continue; continue;
cm.rewriteNativeLists(natives); module->rewriteNativeLists(natives);
} }
} }
@ -1635,52 +1611,38 @@ cell MNF_PrepareCharArray(char *ptr, unsigned int size)
return prepareCharArray(ptr, size, false); return prepareCharArray(ptr, size, false);
} }
inline bool operator ==(func_s &arg1, const char *desc) ke::Vector<ke::AutoPtr<func_s>> g_functions;
{
if (strcmp(arg1.desc, desc) == 0)
return true;
return false;
}
CList<func_s, const char *> g_functions;
// Fnptr Request function for the new interface // Fnptr Request function for the new interface
const char *g_LastRequestedFunc = NULL; const char *g_LastRequestedFunc = NULL;
#define REGISTER_FUNC(name, func) \ #define REGISTER_FUNC(name, func) \
{ \ { \
pFunc = new func_s; \ auto pFunc = ke::AutoPtr<func_s>(new func_s); \
pFunc->pfn = (void *)func; \ pFunc->pfn = (void *)func; \
pFunc->desc = name; \ pFunc->desc = name; \
g_functions.put(pFunc); \ g_functions.append(ke::Move(pFunc)); \
} }
void MNF_RegisterFunction(void *pfn, const char *description) void MNF_RegisterFunction(void *pfn, const char *description)
{ {
func_s *pFunc;
REGISTER_FUNC(description, pfn); REGISTER_FUNC(description, pfn);
} }
void *MNF_RegisterFunctionEx(void *pfn, const char *description) void *MNF_RegisterFunctionEx(void *pfn, const char *description)
{ {
func_s *pFunc; for (auto &func : g_functions)
CList<func_s, const char *>::iterator iter;
for (iter = g_functions.begin(); iter; ++iter)
{ {
pFunc = &(*iter); if (!strcmp(description, func->desc))
if (strcmp(description, pFunc->desc) == 0)
{ {
void *pOld = pFunc->pfn; void *pOld = func->pfn;
pFunc->pfn = pfn; func->pfn = pfn;
return pOld; return pOld;
} }
} }
MNF_RegisterFunction(pfn, description); MNF_RegisterFunction(pfn, description);
return NULL; return nullptr;
} }
void Module_UncacheFunctions() void Module_UncacheFunctions()
@ -1809,8 +1771,6 @@ IGameConfigManager *MNF_GetConfigManager()
void Module_CacheFunctions() void Module_CacheFunctions()
{ {
func_s *pFunc;
REGISTER_FUNC("BuildPathname", build_pathname) REGISTER_FUNC("BuildPathname", build_pathname)
REGISTER_FUNC("BuildPathnameR", build_pathname_r) REGISTER_FUNC("BuildPathnameR", build_pathname_r)
REGISTER_FUNC("PrintSrvConsole", print_srvconsole) REGISTER_FUNC("PrintSrvConsole", print_srvconsole)
@ -1918,20 +1878,15 @@ void Module_CacheFunctions()
void *Module_ReqFnptr(const char *funcName) void *Module_ReqFnptr(const char *funcName)
{ {
// code
// ^---- really? wow!
g_LastRequestedFunc = funcName; g_LastRequestedFunc = funcName;
CList<func_s, const char *>::iterator iter; for (auto &func : g_functions)
for (iter = g_functions.begin(); iter; ++iter)
{ {
if (strcmp(funcName, iter->desc) == 0) if (!strcmp(funcName, func->desc))
return iter->pfn; return func->pfn;
} }
return NULL; return nullptr;
} }
Debugger *DisableDebugHandler(AMX *amx) Debugger *DisableDebugHandler(AMX *amx)

4
amxmodx/msvc12/amxmodx_mm.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013 # Visual Studio 14
VisualStudioVersion = 12.0.31101.0 VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx_mm", "amxmodx_mm.vcxproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx_mm", "amxmodx_mm.vcxproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
EndProject EndProject

15
amxmodx/msvc12/amxmodx_mm.vcxproj
View File

@ -151,6 +151,7 @@
<ClCompile Include="..\..\public\memtools\CDetour\asm\asm.c" /> <ClCompile Include="..\..\public\memtools\CDetour\asm\asm.c" />
<ClCompile Include="..\..\public\memtools\CDetour\detours.cpp" /> <ClCompile Include="..\..\public\memtools\CDetour\detours.cpp" />
<ClCompile Include="..\..\public\memtools\MemoryUtils.cpp" /> <ClCompile Include="..\..\public\memtools\MemoryUtils.cpp" />
<ClCompile Include="..\..\public\resdk\mod_rehlds_api.cpp" />
<ClCompile Include="..\..\third_party\hashing\hashers\crc32.cpp"> <ClCompile Include="..\..\third_party\hashing\hashers\crc32.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='JITDebug|Win32'">$(IntDir)hashing\</ObjectFileName> <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='JITDebug|Win32'">$(IntDir)hashing\</ObjectFileName>
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='JITRelease|Win32'">$(IntDir)hashing\</ObjectFileName> <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='JITRelease|Win32'">$(IntDir)hashing\</ObjectFileName>
@ -311,6 +312,13 @@
<ClInclude Include="..\..\public\memtools\CDetour\detourhelpers.h" /> <ClInclude Include="..\..\public\memtools\CDetour\detourhelpers.h" />
<ClInclude Include="..\..\public\memtools\CDetour\detours.h" /> <ClInclude Include="..\..\public\memtools\CDetour\detours.h" />
<ClInclude Include="..\..\public\memtools\MemoryUtils.h" /> <ClInclude Include="..\..\public\memtools\MemoryUtils.h" />
<ClInclude Include="..\..\public\resdk\common\hookchains.h" />
<ClInclude Include="..\..\public\resdk\engine\rehlds_api.h" />
<ClInclude Include="..\..\public\resdk\engine\rehlds_interfaces.h" />
<ClInclude Include="..\..\public\resdk\mod_rehlds_api.h" />
<ClInclude Include="..\..\public\sh_list.h" />
<ClInclude Include="..\..\public\sh_stack.h" />
<ClInclude Include="..\..\public\sh_tinyhash.h" />
<ClInclude Include="..\..\third_party\hashing\hashers\crc32.h" /> <ClInclude Include="..\..\third_party\hashing\hashers\crc32.h" />
<ClInclude Include="..\..\third_party\hashing\hashers\keccak.h" /> <ClInclude Include="..\..\third_party\hashing\hashers\keccak.h" />
<ClInclude Include="..\..\third_party\hashing\hashers\md5.h" /> <ClInclude Include="..\..\third_party\hashing\hashers\md5.h" />
@ -341,17 +349,16 @@
<ClInclude Include="..\CFileSystem.h" /> <ClInclude Include="..\CFileSystem.h" />
<ClInclude Include="..\CFlagManager.h" /> <ClInclude Include="..\CFlagManager.h" />
<ClInclude Include="..\CForward.h" /> <ClInclude Include="..\CForward.h" />
<ClInclude Include="..\CFrameAction.h" />
<ClInclude Include="..\CGameConfigs.h" /> <ClInclude Include="..\CGameConfigs.h" />
<ClInclude Include="..\CLang.h" /> <ClInclude Include="..\CLang.h" />
<ClInclude Include="..\CLibrarySys.h" /> <ClInclude Include="..\CLibrarySys.h" />
<ClInclude Include="..\CList.h" />
<ClInclude Include="..\CLogEvent.h" /> <ClInclude Include="..\CLogEvent.h" />
<ClInclude Include="..\CMenu.h" /> <ClInclude Include="..\CMenu.h" />
<ClInclude Include="..\CMisc.h" /> <ClInclude Include="..\CMisc.h" />
<ClInclude Include="..\CModule.h" /> <ClInclude Include="..\CModule.h" />
<ClInclude Include="..\CoreConfig.h" /> <ClInclude Include="..\CoreConfig.h" />
<ClInclude Include="..\CPlugin.h" /> <ClInclude Include="..\CPlugin.h" />
<ClInclude Include="..\CQueue.h" />
<ClInclude Include="..\CTask.h" /> <ClInclude Include="..\CTask.h" />
<ClInclude Include="..\CTextParsers.h" /> <ClInclude Include="..\CTextParsers.h" />
<ClInclude Include="..\CvarManager.h" /> <ClInclude Include="..\CvarManager.h" />
@ -369,14 +376,10 @@
<ClInclude Include="..\newmenus.h" /> <ClInclude Include="..\newmenus.h" />
<ClInclude Include="..\nongpl_matches.h" /> <ClInclude Include="..\nongpl_matches.h" />
<ClInclude Include="..\optimizer.h" /> <ClInclude Include="..\optimizer.h" />
<ClInclude Include="..\sh_list.h" />
<ClInclude Include="..\sh_stack.h" />
<ClInclude Include="..\sh_tinyhash.h" />
<ClInclude Include="..\textparse.h" /> <ClInclude Include="..\textparse.h" />
<ClInclude Include="..\trie_natives.h" /> <ClInclude Include="..\trie_natives.h" />
<ClInclude Include="..\..\public\sdk\amxxmodule.h" /> <ClInclude Include="..\..\public\sdk\amxxmodule.h" />
<ClInclude Include="..\..\public\sdk\moduleconfig.h" /> <ClInclude Include="..\..\public\sdk\moduleconfig.h" />
<ClInclude Include="..\CFrameAction.h">
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\version.rc" /> <ResourceCompile Include="..\version.rc" />

48
amxmodx/msvc12/amxmodx_mm.vcxproj.filters
View File

@ -46,6 +46,15 @@
<Filter Include="Third Party\Hashing\hashers"> <Filter Include="Third Party\Hashing\hashers">
<UniqueIdentifier>{fb5fd616-bb2e-42f1-a113-a61eb9ead739}</UniqueIdentifier> <UniqueIdentifier>{fb5fd616-bb2e-42f1-a113-a61eb9ead739}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="ReSDK">
<UniqueIdentifier>{5dd87e1c-9be5-43d3-8216-74d36f4f7610}</UniqueIdentifier>
</Filter>
<Filter Include="ReSDK\common">
<UniqueIdentifier>{26cdecf1-06de-459e-9ea0-0bbb4a2b3bf6}</UniqueIdentifier>
</Filter>
<Filter Include="ReSDK\engine">
<UniqueIdentifier>{04fab577-6f56-40d0-8f69-7ce1b8bf3bb9}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\amx.cpp"> <ClCompile Include="..\amx.cpp">
@ -291,6 +300,9 @@
<ClCompile Include="..\CoreConfig.cpp"> <ClCompile Include="..\CoreConfig.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\public\resdk\mod_rehlds_api.cpp">
<Filter>ReSDK</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\amx.h"> <ClInclude Include="..\amx.h">
@ -326,9 +338,6 @@
<ClInclude Include="..\CLang.h"> <ClInclude Include="..\CLang.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\CList.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CLogEvent.h"> <ClInclude Include="..\CLogEvent.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -344,9 +353,6 @@
<ClInclude Include="..\CPlugin.h"> <ClInclude Include="..\CPlugin.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\CQueue.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\CTask.h"> <ClInclude Include="..\CTask.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -386,15 +392,6 @@
<ClInclude Include="..\optimizer.h"> <ClInclude Include="..\optimizer.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\sh_list.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\sh_stack.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\sh_tinyhash.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\trie_natives.h"> <ClInclude Include="..\trie_natives.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -407,6 +404,15 @@
<ClInclude Include="..\textparse.h"> <ClInclude Include="..\textparse.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\public\sh_list.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\public\sh_stack.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\public\sh_tinyhash.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\public\sdk\amxxmodule.h"> <ClInclude Include="..\..\public\sdk\amxxmodule.h">
<Filter>SDK</Filter> <Filter>SDK</Filter>
</ClInclude> </ClInclude>
@ -503,6 +509,18 @@
<ClInclude Include="..\CFrameAction.h"> <ClInclude Include="..\CFrameAction.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\public\resdk\common\hookchains.h">
<Filter>ReSDK\common</Filter>
</ClInclude>
<ClInclude Include="..\..\public\resdk\engine\rehlds_api.h">
<Filter>ReSDK\engine</Filter>
</ClInclude>
<ClInclude Include="..\..\public\resdk\engine\rehlds_interfaces.h">
<Filter>ReSDK\engine</Filter>
</ClInclude>
<ClInclude Include="..\..\public\resdk\mod_rehlds_api.h">
<Filter>ReSDK</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\version.rc"> <ResourceCompile Include="..\version.rc">

25
amxmodx/newmenus.cpp
View File

@ -93,7 +93,7 @@ bool CloseNewMenus(CPlayer *pPlayer)
Menu::Menu(const char *title, AMX *amx, int fid) : m_Title(title), m_ItemColor("\\r"), Menu::Menu(const char *title, AMX *amx, int fid) : m_Title(title), m_ItemColor("\\r"),
m_NeverExit(false), m_AutoColors(g_coloredmenus), thisId(0), func(fid), m_NeverExit(false), m_AutoColors(g_coloredmenus), thisId(0), func(fid),
isDestroying(false), items_per_page(7) isDestroying(false), pageCallback(-1), items_per_page(7)
{ {
CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(amx); CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(amx);
menuId = g_menucmds.registerMenuId(title, amx); menuId = g_menucmds.registerMenuId(title, amx);
@ -133,6 +133,7 @@ Menu::~Menu()
} }
unregisterSPForward(this->func); unregisterSPForward(this->func);
unregisterSPForward(this->pageCallback);
m_Items.clear(); m_Items.clear();
} }
@ -1004,6 +1005,28 @@ static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
switch (params[2]) switch (params[2])
{ {
case MPROP_PAGE_CALLBACK:
{
const char *str = get_amxstring_null(amx, params[3], 0, len);
if (str == nullptr)
{
unregisterSPForward(pMenu->pageCallback);
pMenu->pageCallback = -1;
break;
}
int callback = registerSPForwardByName(amx, str, FP_CELL, FP_CELL, FP_DONE);
if (callback < 0)
{
LogError(amx, AMX_ERR_NATIVE, "Function %s not present", str);
return 0;
}
unregisterSPForward(pMenu->pageCallback);
pMenu->pageCallback = callback;
break;
}
case MPROP_SET_NUMBER_COLOR: case MPROP_SET_NUMBER_COLOR:
{ {
char *str = get_amxstring(amx, params[3], 0, len); char *str = get_amxstring(amx, params[3], 0, len);

2
amxmodx/newmenus.h
View File

@ -30,6 +30,7 @@
#define MPROP_NOCOLORS 8 #define MPROP_NOCOLORS 8
#define MPROP_PADMENU 9 #define MPROP_PADMENU 9
#define MPROP_SET_NUMBER_COLOR 10 #define MPROP_SET_NUMBER_COLOR 10
#define MPROP_PAGE_CALLBACK 11
typedef int (*MENUITEM_CALLBACK)(int, int, int, int); typedef int (*MENUITEM_CALLBACK)(int, int, int, int);
@ -125,6 +126,7 @@ public:
int thisId; int thisId;
int func; int func;
bool isDestroying; bool isDestroying;
int pageCallback;
public: public:
unsigned int items_per_page; unsigned int items_per_page;
}; };

297
amxmodx/sh_list.h
View File

@ -1,297 +0,0 @@
/* ======== SourceMM ========
* Copyright (C) 2004-2005 Metamod:Source Development Team
* No warranties of any kind
*
* License: zlib/libpng
*
* Author(s): David "BAILOPAN" Anderson
* ============================
*/
#ifndef _INCLUDE_SMM_LIST_H
#define _INCLUDE_SMM_LIST_H
// MSVC8 fix for offsetof macro redefition warnings
#ifdef _MSC_VER
#if _MSC_VER >= 1400
#undef offsetof
#endif
#endif
#include <new>
#include <stdlib.h>
//namespace SourceHook
//{
//This class is from CSDM for AMX Mod X
/*
A circular, doubly-linked list with one sentinel node
Empty:
m_Head = sentinel
m_Head->next = m_Head;
m_Head->prev = m_Head;
One element:
m_Head = sentinel
m_Head->next = node1
m_Head->prev = node1
node1->next = m_Head
node1->prev = m_Head
Two elements:
m_Head = sentinel
m_Head->next = node1
m_Head->prev = node2
node1->next = node2
node1->prev = m_Head
node2->next = m_Head
node2->prev = node1
*/
template <class T>
class List
{
public:
class iterator;
friend class iterator;
class ListNode
{
public:
ListNode(const T & o) : obj(o) { };
ListNode() { };
T obj;
ListNode *next;
ListNode *prev;
};
private:
// Initializes the sentinel node.
// BAIL used malloc instead of new in order to bypass the need for a constructor.
ListNode *_Initialize()
{
ListNode *n = (ListNode *)malloc(sizeof(ListNode));
n->next = n;
n->prev = n;
return n;
}
public:
List() : m_Head(_Initialize()), m_Size(0)
{
}
List(const List &src) : m_Head(_Initialize()), m_Size(0)
{
iterator iter;
for (iter=src.begin(); iter!=src.end(); iter++)
push_back( (*iter) );
}
~List()
{
clear();
// Don't forget to free the sentinel
if (m_Head)
{
free(m_Head);
m_Head = NULL;
}
}
void push_back(const T &obj)
{
ListNode *node = new ListNode(obj);
node->prev = m_Head->prev;
node->next = m_Head;
m_Head->prev->next = node;
m_Head->prev = node;
m_Size++;
}
size_t size()
{
return m_Size;
}
void clear()
{
ListNode *node = m_Head->next;
ListNode *temp;
m_Head->next = m_Head;
m_Head->prev = m_Head;
// Iterate through the nodes until we find g_Head (the sentinel) again
while (node != m_Head)
{
temp = node->next;
delete node;
node = temp;
}
m_Size = 0;
}
bool empty()
{
return (m_Size == 0);
}
T & back()
{
return m_Head->prev->obj;
}
private:
ListNode *m_Head;
size_t m_Size;
public:
class iterator
{
friend class List;
public:
iterator()
{
m_This = NULL;
}
iterator(const List &src)
{
m_This = src.m_Head;
}
iterator(ListNode *n) : m_This(n)
{
}
iterator(const iterator &where)
{
m_This = where.m_This;
}
//pre decrement
iterator & operator--()
{
if (m_This)
m_This = m_This->prev;
return *this;
}
//post decrement
iterator operator--(int)
{
iterator old(*this);
if (m_This)
m_This = m_This->prev;
return old;
}
//pre increment
iterator & operator++()
{
if (m_This)
m_This = m_This->next;
return *this;
}
//post increment
iterator operator++(int)
{
iterator old(*this);
if (m_This)
m_This = m_This->next;
return old;
}
const T & operator * () const
{
return m_This->obj;
}
T & operator * ()
{
return m_This->obj;
}
T * operator -> ()
{
return &(m_This->obj);
}
const T * operator -> () const
{
return &(m_This->obj);
}
bool operator != (const iterator &where) const
{
return (m_This != where.m_This);
}
bool operator ==(const iterator &where) const
{
return (m_This == where.m_This);
}
private:
ListNode *m_This;
};
public:
iterator begin() const
{
return iterator(m_Head->next);
}
iterator end() const
{
return iterator(m_Head);
}
iterator erase(iterator &where)
{
ListNode *pNode = where.m_This;
iterator iter(where);
iter++;
// Works for all cases: empty list, erasing first element, erasing tail, erasing in the middle...
pNode->prev->next = pNode->next;
pNode->next->prev = pNode->prev;
delete pNode;
m_Size--;
return iter;
}
iterator insert(iterator where, const T &obj)
{
// Insert obj right before where
ListNode *node = new ListNode(obj);
ListNode *pWhereNode = where.m_This;
pWhereNode->prev->next = node;
node->prev = pWhereNode->prev;
pWhereNode->prev = node;
node->next = pWhereNode;
m_Size++;
return iterator(node);
}
public:
void remove(const T & obj)
{
iterator b;
for (b=begin(); b!=end(); b++)
{
if ( (*b) == obj )
{
erase( b );
break;
}
}
}
template <typename U>
iterator find(const U & equ)
{
iterator iter;
for (iter=begin(); iter!=end(); iter++)
{
if ( (*iter) == equ )
return iter;
}
return end();
}
List & operator =(const List &src)
{
clear();
iterator iter;
for (iter=src.begin(); iter!=src.end(); iter++)
push_back( (*iter) );
return *this;
}
};
//}; //NAMESPACE
#endif //_INCLUDE_CSDM_LIST_H

219
amxmodx/sh_stack.h
View File

@ -1,219 +0,0 @@
/* ======== SourceMM ========
* Copyright (C) 2004-2005 Metamod:Source Development Team
* No warranties of any kind
*
* License: zlib/libpng
*
* Author(s): Pavol "PM OnoTo" Marko
* ============================
*/
#ifndef __SH_STACK_H__
#define __SH_STACK_H__
#define SH_STACK_DEFAULT_SIZE 4
//namespace SourceHook
//{/
// Vector
template <class T> class CStack
{
T *m_Elements;
size_t m_AllocatedSize;
size_t m_UsedSize;
public:
friend class iterator;
class iterator
{
CStack<T> *m_pParent;
size_t m_Index;
public:
iterator(CStack<T> *pParent, size_t id) : m_pParent(pParent), m_Index(id)
{
}
iterator(CStack<T> *pParent) : m_pParent(pParent), m_Index(0)
{
}
iterator() : m_pParent(NULL), m_Index(0)
{
}
T &operator *()
{
return m_pParent->m_Elements[m_Index];
}
const T &operator *() const
{
return m_pParent->m_Elements[m_Index];
}
T * operator->()
{
return m_pParent->m_Elements + m_Index;
}
const T * operator->() const
{
return m_pParent->m_Elements + m_Index;
}
iterator & operator++() // preincrement
{
++m_Index;
return (*this);
}
iterator operator++(int) // postincrement
{
iterator tmp = *this;
++m_Index;
return tmp;
}
iterator & operator--() // predecrement
{
--m_Index;
return (*this);
}
iterator operator--(int) // postdecrememnt
{
iterator tmp = *this;
--m_Index;
return tmp;
}
bool operator==(const iterator & right) const
{
return (m_pParent == right.m_pParent && m_Index == right.m_Index);
}
bool operator!=(const iterator & right) const
{
return !(*this == right);
}
};
CStack() : m_Elements(new T[SH_STACK_DEFAULT_SIZE]),
m_AllocatedSize(SH_STACK_DEFAULT_SIZE),
m_UsedSize(0)
{
}
CStack(size_t size) : m_Elements(new T[size]),
m_AllocatedSize(size),
m_UsedSize(0)
{
}
CStack(const CStack &other) : m_Elements(NULL),
m_AllocatedSize(0),
m_UsedSize(0)
{
reserve(other.m_AllocatedSize);
m_UsedSize = other.m_UsedSize;
for (size_t i = 0; i < m_UsedSize; ++i)
m_Elements[i] = other.m_Elements[i];
}
~CStack()
{
if (m_Elements)
delete [] m_Elements;
}
void operator=(const CStack &other)
{
if (m_AllocatedSize < other.m_AllocatedSize)
{
if (m_Elements)
delete [] m_Elements;
m_Elements = new T[other.m_AllocatedSize];
m_AllocatedSize = other.m_AllocatedSize;
}
m_UsedSize = other.m_UsedSize;
for (size_t i = 0; i < m_UsedSize; ++i)
m_Elements[i] = other.m_Elements[i];
}
bool push(const T &val)
{
if (m_UsedSize + 1 == m_AllocatedSize)
{
// zOHNOES! REALLOCATE!
m_AllocatedSize *= 2;
T *newElements = new T[m_AllocatedSize];
if (!newElements)
{
m_AllocatedSize /= 2;
return false;
}
if (m_Elements)
{
for (size_t i = 0; i < m_UsedSize; ++i)
newElements[i] = m_Elements[i];
delete [] m_Elements;
}
m_Elements = newElements;
}
m_Elements[m_UsedSize++] = val;
return true;
}
void pop()
{
--m_UsedSize;
}
T &front()
{
return m_Elements[m_UsedSize - 1];
}
const T &front() const
{
return m_Elements[m_UsedSize - 1];
}
iterator begin()
{
return iterator(this, 0);
}
iterator end()
{
return iterator(this, m_UsedSize);
}
size_t size()
{
return m_UsedSize;
}
size_t capacity()
{
return m_AllocatedSize;
}
bool empty()
{
return m_UsedSize == 0 ? true : false;
}
bool reserve(size_t size)
{
if (size > m_AllocatedSize)
{
T *newElements = new T[size];
if (!newElements)
return false;
if (m_Elements)
{
for (size_t i = 0; i < m_UsedSize; ++i)
newElements[i] = m_Elements[i];
delete [] m_Elements;
}
m_Elements = newElements;
m_AllocatedSize = size;
}
return true;
}
};
//}; //namespace SourceHook
#endif

9
amxmodx/srvcmd.cpp
View File

@ -188,16 +188,13 @@ void amx_command()
int running = 0; int running = 0;
int modules = 0; int modules = 0;
CList<CModule, const char *>::iterator a = g_modules.begin(); for (auto module : g_modules)
while (a)
{ {
if ((*a).getStatusValue() == MODULE_LOADED) if (module->getStatusValue() == MODULE_LOADED)
++running; ++running;
++modules; ++modules;
print_srvconsole(" [%2d] %-23.22s %-11.10s %-20.19s %-11.10s\n", modules, (*a).getName(), (*a).getVersion(), (*a).getAuthor(), (*a).getStatus()); print_srvconsole(" [%2d] %-23.22s %-11.10s %-20.19s %-11.10s\n", modules, module->getName(), module->getVersion(), module->getAuthor(), module->getStatus());
++a;
} }
print_srvconsole("%d modules, %d correct\n", modules, running); print_srvconsole("%d modules, %d correct\n", modules, running);

2
modules/cstrike/cstrike/AMBuilder
View File

@ -19,6 +19,8 @@ binary.sources = [
'../../../public/memtools/MemoryUtils.cpp', '../../../public/memtools/MemoryUtils.cpp',
'../../../public/memtools/CDetour/detours.cpp', '../../../public/memtools/CDetour/detours.cpp',
'../../../public/memtools/CDetour/asm/asm.c', '../../../public/memtools/CDetour/asm/asm.c',
'../../../public/resdk/mod_rehlds_api.cpp',
'../../../public/resdk/mod_regamedll_api.cpp',
] ]
if builder.target_platform == 'windows': if builder.target_platform == 'windows':

6
modules/cstrike/cstrike/CstrikeDatas.h
View File

@ -326,7 +326,7 @@ enum CsWeaponClassType
/** /**
* Weapon infos. * Weapon infos.
*/ */
typedef struct struct WeaponInfoStruct
{ {
int id; int id;
int cost; int cost;
@ -336,8 +336,8 @@ typedef struct
int maxRounds; int maxRounds;
int ammoType; int ammoType;
char *entityName; char *entityName;
} const char *ammoName;
WeaponInfoStruct; };
/** /**
* Weapon infos for use with cs_get_weapon_info(). * Weapon infos for use with cs_get_weapon_info().

506
modules/cstrike/cstrike/CstrikeHacks.cpp
View File

@ -15,6 +15,8 @@
#include "CstrikeUtils.h" #include "CstrikeUtils.h"
#include "CstrikeHacks.h" #include "CstrikeHacks.h"
#include "CstrikeItemsInfos.h" #include "CstrikeItemsInfos.h"
#include <resdk/mod_rehlds_api.h>
#include <resdk/mod_regamedll_api.h>
int ForwardInternalCommand = -1; int ForwardInternalCommand = -1;
int ForwardOnBuy = -1; int ForwardOnBuy = -1;
@ -64,10 +66,20 @@ server_t *Server;
// Mod global variable // Mod global variable
void **GameRules; void **GameRules;
void *GameRulesRH;
bool HasReHlds;
bool HasReGameDll;
bool HasRestricteditem_Enabled;
bool InternalCommand_Enabled;
bool GiveDefaultItems_Enabled;
void InitializeHacks() void InitializeHacks()
{ {
HasReHlds = RehldsApi_Init();
HasReGameDll = RegamedllApi_Init();
CtrlDetours_ClientCommand(true); CtrlDetours_ClientCommand(true);
CtrlDetours_BuyCommands(true); CtrlDetours_BuyCommands(true);
CtrlDetours_Natives(true); CtrlDetours_Natives(true);
@ -88,7 +100,11 @@ void ShutdownHacks()
const char *CMD_ARGV(int i) const char *CMD_ARGV(int i)
{ {
if (*UseBotArgs) if (HasReGameDll)
{
return ReGameFuncs->Cmd_Argv(i);
}
else if (*UseBotArgs)
{ {
if (i < 4) if (i < 4)
{ {
@ -101,9 +117,10 @@ const char *CMD_ARGV(int i)
return g_engfuncs.pfnCmd_Argv(i); return g_engfuncs.pfnCmd_Argv(i);
} }
DETOUR_DECL_STATIC1(C_ClientCommand, void, edict_t*, pEdict) // void ClientCommand(edict_t *pEntity) void (*C_ClientCommand_Actual)(edict_t *) = nullptr;
void ClientCommand_Custom(edict_t *pEdict, const char *command, const char *arg1, IReGameHook_InternalCommand *chain = nullptr)
{ {
auto command = CMD_ARGV(0);
auto client = TypeConversion.edict_to_id(pEdict); auto client = TypeConversion.edict_to_id(pEdict);
CurrentItemId = CSI_NONE; CurrentItemId = CSI_NONE;
@ -117,7 +134,7 @@ DETOUR_DECL_STATIC1(C_ClientCommand, void, edict_t*, pEdict) // void ClientComma
// Handling buy via menu. // Handling buy via menu.
if (!strcmp(command, "menuselect")) if (!strcmp(command, "menuselect"))
{ {
auto slot = atoi(CMD_ARGV(1)); auto slot = atoi(arg1);
if (slot > 0 && slot < 9) if (slot > 0 && slot < 9)
{ {
@ -172,7 +189,7 @@ DETOUR_DECL_STATIC1(C_ClientCommand, void, edict_t*, pEdict) // void ClientComma
} }
} }
if (HasInternalCommandForward && *UseBotArgs && MF_ExecuteForward(ForwardInternalCommand, client, *BotArgs) > 0) if (HasInternalCommandForward && (HasReGameDll || *UseBotArgs) && MF_ExecuteForward(ForwardInternalCommand, client, CMD_ARGV(0)) > 0)
{ {
return; return;
} }
@ -185,11 +202,21 @@ DETOUR_DECL_STATIC1(C_ClientCommand, void, edict_t*, pEdict) // void ClientComma
TriggeredFromCommand = CurrentItemId != CSI_NONE; TriggeredFromCommand = CurrentItemId != CSI_NONE;
DETOUR_STATIC_CALL(C_ClientCommand)(pEdict); chain ? chain->callNext(pEdict, command, arg1) : C_ClientCommand_Actual(pEdict);
TriggeredFromCommand = BlockMoneyUpdate = BlockAmmosUpdate = false; TriggeredFromCommand = BlockMoneyUpdate = BlockAmmosUpdate = false;
} }
void C_ClientCommand(edict_t* pEdict) // void ClientCommand(edict_t *pEntity)
{
ClientCommand_Custom(pEdict, CMD_ARGV(0), CMD_ARGV(1));
}
void InternalCommand_RH(IReGameHook_InternalCommand* chain, edict_t *pEdict, const char *command, const char *arg1)
{
ClientCommand_Custom(pEdict, CMD_ARGV(0), CMD_ARGV(1), chain);
}
edict_s* OnCreateNamedEntity(int classname) edict_s* OnCreateNamedEntity(int classname)
{ {
if (NoKnivesMode) if (NoKnivesMode)
@ -219,6 +246,18 @@ DETOUR_DECL_MEMBER0(GiveDefaultItems, void) // void CBasePlayer::GiveDefaultIte
g_pengfuncsTable->pfnCreateNamedEntity = nullptr; g_pengfuncsTable->pfnCreateNamedEntity = nullptr;
} }
void GiveDefaultItems_RH(IReGameHook_CBasePlayer_GiveDefaultItems *chain, class CBasePlayer *pPlayer)
{
if (NoKnivesMode)
{
g_pengfuncsTable->pfnCreateNamedEntity = OnCreateNamedEntity;
}
chain->callNext(pPlayer);
g_pengfuncsTable->pfnCreateNamedEntity = nullptr;
}
DETOUR_DECL_MEMBER1(CanPlayerBuy, bool, bool, display) // bool CBasePlayer::CanPlayerBuy(bool display) DETOUR_DECL_MEMBER1(CanPlayerBuy, bool, bool, display) // bool CBasePlayer::CanPlayerBuy(bool display)
{ {
auto canBuy = DETOUR_MEMBER_CALL(CanPlayerBuy)(display); auto canBuy = DETOUR_MEMBER_CALL(CanPlayerBuy)(display);
@ -340,6 +379,35 @@ DETOUR_DECL_MEMBER2(AddAccount, void, int, amount, bool, bTrackChange) // void C
DETOUR_MEMBER_CALL(AddAccount)(amount, bTrackChange); DETOUR_MEMBER_CALL(AddAccount)(amount, bTrackChange);
} }
bool CBasePlayer_HasRestrictItem_RH(IReGameHook_CBasePlayer_HasRestrictItem *chain, class CBasePlayer *pPlayer, ItemID item, ItemRestType type)
{
if (type == ITEM_TYPE_BUYING && CurrentItemId != CSI_NONE)
{
auto player = TypeConversion.cbase_to_id(pPlayer);
if (MF_IsPlayerAlive(player) && MF_ExecuteForward(ForwardOnBuy, player, CurrentItemId) > 0)
{
return true;
}
}
return chain->callNext(pPlayer, item, type);
}
bool BuyGunAmmo_RH(IReGameHook_BuyGunAmmo *chain, class CBasePlayer *pPlayer, class CBasePlayerItem *pWeapon, bool blinkMoney)
{
if (CurrentItemId == CSI_PRIAMMO || CurrentItemId == CSI_SECAMMO)
{
auto player = TypeConversion.cbase_to_id(pPlayer);
if (MF_IsPlayerAlive(player) && MF_ExecuteForward(ForwardOnBuy, player, CurrentItemId) > 0)
{
return false;
}
}
return chain->callNext(pPlayer, pWeapon, blinkMoney);
}
void ToggleDetour(CDetour *detour, bool enable) void ToggleDetour(CDetour *detour, bool enable)
{ {
@ -363,137 +431,190 @@ void CtrlDetours_ClientCommand(bool set)
{ {
if (set) if (set)
{ {
auto base = reinterpret_cast<void *>(MDLL_ClientCommand); if (HasReGameDll)
{
if (!InternalCommand_Enabled)
{
ReGameHookchains->InternalCommand()->registerHook(InternalCommand_RH);
InternalCommand_Enabled = true;
}
}
else
{
auto base = reinterpret_cast<void *>(MDLL_ClientCommand);
#if defined(KE_WINDOWS) #if defined(KE_WINDOWS)
TypeDescription type; TypeDescription type;
if (MainConfig->GetOffset("UseBotArgs", &type)) if (MainConfig->GetOffset("UseBotArgs", &type))
{ {
UseBotArgs = get_pdata<decltype(UseBotArgs)>(base, type.fieldOffset); UseBotArgs = get_pdata<decltype(UseBotArgs)>(base, type.fieldOffset);
} }
if (MainConfig->GetOffset("BotArgs", &type)) if (MainConfig->GetOffset("BotArgs", &type))
{ {
BotArgs = get_pdata<decltype(BotArgs)>(base, type.fieldOffset); BotArgs = get_pdata<decltype(BotArgs)>(base, type.fieldOffset);
} }
#else #else
void *address = nullptr; void *address = nullptr;
if (MainConfig->GetMemSig("UseBotArgs", &address)) if (MainConfig->GetMemSig("UseBotArgs", &address))
{ {
UseBotArgs = reinterpret_cast<decltype(UseBotArgs)>(address); UseBotArgs = reinterpret_cast<decltype(UseBotArgs)>(address);
} }
if (MainConfig->GetMemSig("BotArgs", &address)) if (MainConfig->GetMemSig("BotArgs", &address))
{ {
BotArgs = reinterpret_cast<decltype(BotArgs)>(address); BotArgs = reinterpret_cast<decltype(BotArgs)>(address);
} }
#endif #endif
ClientCommandDetour = DETOUR_CREATE_STATIC_FIXED(C_ClientCommand, base); ClientCommandDetour = DETOUR_CREATE_STATIC_FIXED(C_ClientCommand, base);
if (!ClientCommandDetour) if (!ClientCommandDetour)
{ {
MF_Log("ClientCommand is not available - forwards CS_InternalCommand and CS_OnBuy[Attempt] have been disabled"); MF_Log("ClientCommand is not available - forwards CS_InternalCommand and CS_OnBuy[Attempt] have been disabled");
CtrlDetours_ClientCommand(false); ToggleHook_ClientCommands(false);
} }
else if (!UseBotArgs || !BotArgs) else if (!UseBotArgs || !BotArgs)
{ {
MF_Log("UseBotArgs or BotArgs is not available - forward CS_InternalCommand has been disabled"); MF_Log("UseBotArgs or BotArgs is not available - forward CS_InternalCommand has been disabled");
}
} }
} }
else else
{ {
DestroyDetour(ClientCommandDetour); if (HasReGameDll)
{
ReGameHookchains->InternalCommand()->unregisterHook(InternalCommand_RH);
InternalCommand_Enabled = false;
}
else
{
DestroyDetour(ClientCommandDetour);
}
} }
} }
void ToggleDetour_ClientCommands(bool enable) void ToggleHook_ClientCommands(bool enable)
{ {
ToggleDetour(ClientCommandDetour, enable); if (HasReGameDll)
{
CtrlDetours_ClientCommand(enable);
}
else
{
ToggleDetour(ClientCommandDetour, enable);
}
} }
void CtrlDetours_BuyCommands(bool set) void CtrlDetours_BuyCommands(bool set)
{ {
if (set) if (set)
{ {
void *address = nullptr; if (HasReGameDll)
if (MainConfig->GetMemSig("BuyGunAmmo", &address))
{ {
BuyGunAmmoDetour = DETOUR_CREATE_STATIC_FIXED(BuyGunAmmo, address); if (!HasRestricteditem_Enabled)
}
if (MainConfig->GetMemSig("GiveNamedItem", &address))
{
GiveNamedItemDetour = DETOUR_CREATE_MEMBER_FIXED(GiveNamedItem, address);
}
if (MainConfig->GetMemSig("AddAccount", &address))
{
AddAccountDetour = DETOUR_CREATE_MEMBER_FIXED(AddAccount, address);
}
if (MainConfig->GetMemSig("CanPlayerBuy", &address))
{
CanPlayerBuyDetour = DETOUR_CREATE_MEMBER_FIXED(CanPlayerBuy, address);
}
if (MainConfig->GetMemSig("CanBuyThis", &address))
{
CanBuyThisDetour = DETOUR_CREATE_STATIC_FIXED(CanBuyThis, address);
}
if (!BuyGunAmmoDetour || !GiveNamedItemDetour || !AddAccountDetour || !CanPlayerBuyDetour || !CanBuyThisDetour)
{
if (!BuyGunAmmoDetour)
{ {
MF_Log("BuyGunAmmo is not available"); ReGameHookchains->CBasePlayer_HasRestrictItem()->registerHook(CBasePlayer_HasRestrictItem_RH);
ReGameHookchains->BuyGunAmmo()->registerHook(BuyGunAmmo_RH);
HasRestricteditem_Enabled = true;
}
}
else
{
void *address = nullptr;
if (MainConfig->GetMemSig("BuyGunAmmo", &address))
{
BuyGunAmmoDetour = DETOUR_CREATE_STATIC_FIXED(BuyGunAmmo, address);
} }
if (!GiveNamedItemDetour) if (MainConfig->GetMemSig("GiveNamedItem", &address))
{ {
MF_Log("GiveNamedItem is not available"); GiveNamedItemDetour = DETOUR_CREATE_MEMBER_FIXED(GiveNamedItem, address);
} }
if (!AddAccountDetour) if (MainConfig->GetMemSig("AddAccount", &address))
{ {
MF_Log("AddAccount is not available"); AddAccountDetour = DETOUR_CREATE_MEMBER_FIXED(AddAccount, address);
} }
if (!CanPlayerBuyDetour) if (MainConfig->GetMemSig("CanPlayerBuy", &address))
{ {
MF_Log("CanPlayerBuy is not available"); CanPlayerBuyDetour = DETOUR_CREATE_MEMBER_FIXED(CanPlayerBuy, address);
} }
if (!CanBuyThisDetour) if (MainConfig->GetMemSig("CanBuyThis", &address))
{ {
MF_Log("CanBuyThis is not available"); CanBuyThisDetour = DETOUR_CREATE_STATIC_FIXED(CanBuyThis, address);
} }
MF_Log("Some functions are not available - forwards CS_OnBuy[Attempt] have been disabled"); if (!BuyGunAmmoDetour || !GiveNamedItemDetour || !AddAccountDetour || !CanPlayerBuyDetour || !CanBuyThisDetour)
ToggleDetour_BuyCommands(false); {
if (!BuyGunAmmoDetour)
{
MF_Log("BuyGunAmmo is not available");
}
if (!GiveNamedItemDetour)
{
MF_Log("GiveNamedItem is not available");
}
if (!AddAccountDetour)
{
MF_Log("AddAccount is not available");
}
if (!CanPlayerBuyDetour)
{
MF_Log("CanPlayerBuy is not available");
}
if (!CanBuyThisDetour)
{
MF_Log("CanBuyThis is not available");
}
MF_Log("Some functions are not available - forwards CS_OnBuy[Attempt] have been disabled");
ToggleHook_BuyCommands(false);
}
} }
} }
else else
{ {
DestroyDetour(BuyGunAmmoDetour); if (HasReGameDll)
DestroyDetour(GiveNamedItemDetour); {
DestroyDetour(AddAccountDetour); ReGameHookchains->CBasePlayer_HasRestrictItem()->unregisterHook(CBasePlayer_HasRestrictItem_RH);
DestroyDetour(CanPlayerBuyDetour); ReGameHookchains->BuyGunAmmo()->unregisterHook(BuyGunAmmo_RH);
DestroyDetour(CanBuyThisDetour); HasRestricteditem_Enabled = false;
}
else
{
DestroyDetour(BuyGunAmmoDetour);
DestroyDetour(GiveNamedItemDetour);
DestroyDetour(AddAccountDetour);
DestroyDetour(CanPlayerBuyDetour);
DestroyDetour(CanBuyThisDetour);
}
} }
} }
void ToggleDetour_BuyCommands(bool enable) void ToggleHook_BuyCommands(bool enable)
{ {
ToggleDetour(BuyGunAmmoDetour, enable); if (HasReGameDll)
ToggleDetour(GiveNamedItemDetour, enable); {
ToggleDetour(AddAccountDetour, enable); CtrlDetours_BuyCommands(enable);
ToggleDetour(CanPlayerBuyDetour, enable); }
ToggleDetour(CanBuyThisDetour, enable); else
{
ToggleDetour(BuyGunAmmoDetour, enable);
ToggleDetour(GiveNamedItemDetour, enable);
ToggleDetour(AddAccountDetour, enable);
ToggleDetour(CanPlayerBuyDetour, enable);
ToggleDetour(CanBuyThisDetour, enable);
}
} }
@ -501,54 +622,94 @@ void CtrlDetours_Natives(bool set)
{ {
if (set) if (set)
{ {
void *address = nullptr; if (HasReGameDll)
if (MainConfig->GetMemSig("GiveDefaultItems", &address))
{ {
GiveDefaultItemsDetour = DETOUR_CREATE_MEMBER_FIXED(GiveDefaultItems, address); if (!GiveDefaultItems_Enabled)
{
ReGameHookchains->CBasePlayer_GiveDefaultItems()->registerHook(GiveDefaultItems_RH);
GiveDefaultItems_Enabled = true;
}
} }
else
if (!GiveDefaultItemsDetour)
{ {
MF_Log("GiveDefaultItems is not available - native cs_set_no_knives has been disabled"); void *address = nullptr;
if (MainConfig->GetMemSig("GiveDefaultItems", &address))
{
GiveDefaultItemsDetour = DETOUR_CREATE_MEMBER_FIXED(GiveDefaultItems, address);
}
if (!GiveDefaultItemsDetour)
{
MF_Log("GiveDefaultItems is not available - native cs_set_no_knives has been disabled");
}
} }
} }
else else
{ {
DestroyDetour(GiveDefaultItemsDetour); if (HasReGameDll)
{
ReGameHookchains->CBasePlayer_GiveDefaultItems()->unregisterHook(GiveDefaultItems_RH);
GiveDefaultItems_Enabled = false;
}
else
{
DestroyDetour(GiveDefaultItemsDetour);
}
}
}
void ToggleHook_GiveDefaultItems(bool enable)
{
if (HasReGameDll)
{
CtrlDetours_Natives(enable);
}
else
{
ToggleDetour(GiveDefaultItemsDetour, enable);
} }
} }
void InitFuncsAddresses() void InitFuncsAddresses()
{ {
void *address = nullptr; if (HasReGameDll)
if (MainConfig->GetMemSig("CreateNamedEntity", &address)) // cs_create_entity()
{ {
CS_CreateNamedEntity = reinterpret_cast<CreateNamedEntityFunc>(address); RemoveEntityHashValue = ReGameFuncs->RemoveEntityHashValue;
CS_CreateNamedEntity = ReGameFuncs->CREATE_NAMED_ENTITY2;
CS_UTIL_FindEntityByString = ReGameFuncs->UTIL_FindEntityByString;
AddEntityHashValue = ReGameFuncs->AddEntityHashValue;
} }
else
if (MainConfig->GetMemSig("FindEntityByString", &address)) // cs_find_ent_by_class()
{ {
CS_UTIL_FindEntityByString = reinterpret_cast<UTIL_FindEntityByStringFunc>(address); void *address = nullptr;
}
if (MainConfig->GetMemSig("GetWeaponInfo", &address)) // cs_get_weapon_info() if (MainConfig->GetMemSig("CreateNamedEntity", &address)) // cs_create_entity()
{ {
GetWeaponInfo = reinterpret_cast<GetWeaponInfoFunc>(address); CS_CreateNamedEntity = reinterpret_cast<CreateNamedEntityFunc>(address);
} }
if (MainConfig->GetMemSig("AddEntityHashValue", &address)) // cs_set_ent_class() if (MainConfig->GetMemSig("FindEntityByString", &address)) // cs_find_ent_by_class()
{ {
AddEntityHashValue = reinterpret_cast<AddEntityHashValueFunc>(address); CS_UTIL_FindEntityByString = reinterpret_cast<UTIL_FindEntityByStringFunc>(address);
} }
if (MainConfig->GetMemSig("RemoveEntityHashValue", &address)) // cs_set_ent_class() if (MainConfig->GetMemSig("GetWeaponInfo", &address)) // cs_get_weapon_info()
{ {
RemoveEntityHashValue = reinterpret_cast<RemoveEntityHashValueFunc>(address); GetWeaponInfo = reinterpret_cast<GetWeaponInfoFunc>(address);
} }
if (MainConfig->GetMemSig("AddEntityHashValue", &address)) // cs_set_ent_class()
{
AddEntityHashValue = reinterpret_cast<AddEntityHashValueFunc>(address);
}
if (MainConfig->GetMemSig("RemoveEntityHashValue", &address)) // cs_set_ent_class()
{
RemoveEntityHashValue = reinterpret_cast<RemoveEntityHashValueFunc>(address);
}
}
if (!CS_CreateNamedEntity) if (!CS_CreateNamedEntity)
{ {
@ -560,7 +721,12 @@ void InitFuncsAddresses()
MF_Log("UTIL_FindEntByString is not available - native cs_find_ent_by_class() has been disabled"); MF_Log("UTIL_FindEntByString is not available - native cs_find_ent_by_class() has been disabled");
} }
if (!GetWeaponInfo) if (!AddEntityHashValue || !AddEntityHashValue)
{
MF_Log("AddEntityHashValue or AddEntityHashValue is not available - native cs_set_ent_class() has been disabled");
}
if (!HasReGameDll && !GetWeaponInfo)
{ {
MF_Log("GetWeaponInfo is not available - native cs_get_weapon_info() and forward CS_OnBuy have been disabled"); MF_Log("GetWeaponInfo is not available - native cs_get_weapon_info() and forward CS_OnBuy have been disabled");
CtrlDetours_BuyCommands(false); CtrlDetours_BuyCommands(false);
@ -584,66 +750,86 @@ void InitClassMembers()
!MoneyDesc.fieldOffset) !MoneyDesc.fieldOffset)
{ {
MF_Log("Invalid or missing entity gamedata files - forwards CS_OnBuy[Attempt] have been disabled"); MF_Log("Invalid or missing entity gamedata files - forwards CS_OnBuy[Attempt] have been disabled");
CtrlDetours_BuyCommands(false); ToggleHook_BuyCommands(false);
} }
} }
CGameRules* InstallGameRules(IReGameHook_InstallGameRules *chain)
{
GameRulesRH = chain->callNext();
return static_cast<CGameRules*>(GameRulesRH);
}
void InitGlobalVars() void InitGlobalVars()
{ {
void *address = nullptr; void *address = nullptr;
if (!HasReHlds)
{
#if defined(KE_WINDOWS) #if defined(KE_WINDOWS)
TypeDescription typeDesc;
TypeDescription typeDesc; if (CommonConfig->GetOffset("svs", &typeDesc))
{
if (CommonConfig->GetOffset("svs", &typeDesc)) uintptr_t base = *reinterpret_cast<uintptr_t*>(reinterpret_cast<byte*>(g_engfuncs.pfnGetCurrentPlayer) + typeDesc.fieldOffset);
{ ServerStatic = reinterpret_cast<decltype(ServerStatic)>(base - 4);
uintptr_t base = *reinterpret_cast<uintptr_t*>(reinterpret_cast<byte*>(g_engfuncs.pfnGetCurrentPlayer) + typeDesc.fieldOffset); }
ServerStatic = reinterpret_cast<decltype(ServerStatic)>(base - 4);
}
if (CommonConfig->GetAddress("sv", &address))
{
Server = *reinterpret_cast<decltype(Server)*>(address);
}
if (CommonConfig->GetAddress("g_pGameRules", &address))
{
GameRules = *reinterpret_cast<decltype(GameRules)*>(address);
}
if (CommonConfig->GetAddress("sv", &address))
{
Server = *reinterpret_cast<decltype(Server)*>(address);
}
#else #else
if (CommonConfig->GetMemSig("svs", &address))
{
ServerStatic = reinterpret_cast<decltype(ServerStatic)>(address);
}
if (CommonConfig->GetMemSig("svs", &address)) if (CommonConfig->GetMemSig("sv", &address))
{ {
ServerStatic = reinterpret_cast<decltype(ServerStatic)>(address); Server = reinterpret_cast<decltype(Server)>(address);
} }
if (CommonConfig->GetMemSig("sv", &address))
{
Server = reinterpret_cast<decltype(Server)>(address);
}
if (CommonConfig->GetMemSig("g_pGameRules", &address))
{
GameRules = reinterpret_cast<decltype(GameRules)>(address);
}
#endif #endif
if (!ServerStatic)
{
MF_Log("svs global variable is not available");
} }
if (!Server) if (HasReGameDll)
{ {
MF_Log("sv global variable is not available"); ReGameHookchains->InstallGameRules()->registerHook(InstallGameRules);
}
else
{
#if defined(KE_WINDOWS)
if (CommonConfig->GetAddress("g_pGameRules", &address))
{
GameRules = *reinterpret_cast<decltype(GameRules)*>(address);
}
#else
if (CommonConfig->GetMemSig("g_pGameRules", &address))
{
GameRules = reinterpret_cast<decltype(GameRules)>(address);
}
#endif
} }
if (!GameRules) if (!HasReHlds)
{ {
MF_Log("g_pGameRules is not available - Forward CS_OnBuy has been disabled"); if (!ServerStatic)
CtrlDetours_BuyCommands(false); {
MF_Log("svs global variable is not available");
}
if (!Server)
{
MF_Log("sv global variable is not available");
}
}
if (!HasReGameDll)
{
if (!GameRules)
{
MF_Log("g_pGameRules is not available - Forward CS_OnBuy has been disabled");
CtrlDetours_BuyCommands(false);
}
} }
} }

16
modules/cstrike/cstrike/CstrikeHacks.h
View File

@ -19,6 +19,7 @@
#include <CDetour/detours.h> #include <CDetour/detours.h>
#include <engine_strucs.h> #include <engine_strucs.h>
#include "CstrikeDatas.h" #include "CstrikeDatas.h"
#include <resdk/cstrike/regamedll_api.h>
void InitializeHacks(); void InitializeHacks();
void InitFuncsAddresses(); void InitFuncsAddresses();
@ -30,8 +31,9 @@ void CtrlDetours_ClientCommand(bool set);
void CtrlDetours_BuyCommands(bool set); void CtrlDetours_BuyCommands(bool set);
void CtrlDetours_Natives(bool set); void CtrlDetours_Natives(bool set);
void ToggleDetour_ClientCommands(bool enable); void ToggleHook_ClientCommands(bool enable);
void ToggleDetour_BuyCommands(bool enable); void ToggleHook_BuyCommands(bool enable);
void ToggleHook_GiveDefaultItems(bool enable);
extern AMX_NATIVE_INFO CstrikeNatives[]; extern AMX_NATIVE_INFO CstrikeNatives[];
@ -60,10 +62,10 @@ enum class HashType
}; };
typedef edict_t* (*CreateNamedEntityFunc)(string_t iszClassname); typedef edict_t* (*CreateNamedEntityFunc)(string_t iszClassname);
typedef void* (*UTIL_FindEntityByStringFunc)(void* pStartEntity, const char *szKeyword, const char *szValue); typedef class CBaseEntity* (*UTIL_FindEntityByStringFunc)(class CBaseEntity *pStartEntity, const char *szKeyword, const char *szValue);
typedef WeaponInfoStruct* (*GetWeaponInfoFunc)(int id); typedef WeaponInfoStruct* (*GetWeaponInfoFunc)(int id);
typedef void (*AddEntityHashValueFunc)(struct entvars_s *pev, const char *value, HashType fieldType); typedef void (*AddEntityHashValueFunc)(entvars_s *pev, const char *value, hash_types_e fieldType);
typedef void (*RemoveEntityHashValueFunc)(struct entvars_s *pev, const char *value, HashType fieldType); typedef void (*RemoveEntityHashValueFunc)(entvars_t *pev, const char *value, hash_types_e fieldType);
extern CreateNamedEntityFunc CS_CreateNamedEntity; extern CreateNamedEntityFunc CS_CreateNamedEntity;
extern UTIL_FindEntityByStringFunc CS_UTIL_FindEntityByString; extern UTIL_FindEntityByStringFunc CS_UTIL_FindEntityByString;
@ -79,8 +81,12 @@ extern bool NoKnivesMode;
extern server_static_t *ServerStatic; extern server_static_t *ServerStatic;
extern server_t *Server; extern server_t *Server;
extern void **GameRules; extern void **GameRules;
extern void *GameRulesRH;
extern int *UseBotArgs; extern int *UseBotArgs;
extern const char **BotArgs; extern const char **BotArgs;
extern bool HasReHlds;
extern bool HasReGameDll;
#endif // CSTRIKE_HACKS_H #endif // CSTRIKE_HACKS_H

10
modules/cstrike/cstrike/CstrikeItemsInfos.cpp
View File

@ -14,6 +14,7 @@
#include "CstrikeItemsInfos.h" #include "CstrikeItemsInfos.h"
#include "CstrikeHacks.h" #include "CstrikeHacks.h"
#include <amtl/am-utility.h> #include <amtl/am-utility.h>
#include <resdk/mod_regamedll_api.h>
CsItemInfo ItemsManager; CsItemInfo ItemsManager;
ItemInfo WeaponsList[MAX_WEAPONS]; ItemInfo WeaponsList[MAX_WEAPONS];
@ -102,7 +103,7 @@ SMCResult CsItemInfo::ReadSMC_KeyValue(const SMCStates *states, const char *key,
CSI_NONE, CSI_VEST, CSI_VESTHELM, CSI_FLASHBANG, CSI_HEGRENADE, CSI_SMOKEGRENADE, CSI_NVGS, CSI_DEFUSER CSI_NONE, CSI_VEST, CSI_VESTHELM, CSI_FLASHBANG, CSI_HEGRENADE, CSI_SMOKEGRENADE, CSI_NVGS, CSI_DEFUSER
}; };
for (int i = 0; i < ARRAY_LENGTH(equipmentsList); ++i) for (size_t i = 0; i < ARRAY_LENGTH(equipmentsList); ++i)
{ {
if (m_AliasInfo.itemid == equipmentsList[i]) if (m_AliasInfo.itemid == equipmentsList[i])
{ {
@ -172,7 +173,7 @@ bool CsItemInfo::GetAliasFromId(size_t id, ke::AString &name, ke::AString &altna
{ {
for (auto iter = m_BuyAliasesList.iter(); !iter.empty(); iter.next()) for (auto iter = m_BuyAliasesList.iter(); !iter.empty(); iter.next())
{ {
if (iter->value.itemid == id) if (iter->value.itemid == (int)id)
{ {
name = iter->key; name = iter->key;
altname = iter->value.alt_alias; altname = iter->value.alt_alias;
@ -272,5 +273,10 @@ int CsItemInfo::GetItemPrice(int itemId)
return m_EquipmentsPrice[static_cast<size_t>(id)]; return m_EquipmentsPrice[static_cast<size_t>(id)];
} }
if (HasReGameDll)
{
return ReGameApi->GetWeaponInfo(itemId == CSI_SHIELD ? CSI_SHIELDGUN : itemId)->cost;
}
return GetWeaponInfo(itemId == CSI_SHIELD ? CSI_SHIELDGUN : itemId)->cost; return GetWeaponInfo(itemId == CSI_SHIELD ? CSI_SHIELDGUN : itemId)->cost;
} }

67
modules/cstrike/cstrike/CstrikeMain.cpp
View File

@ -17,6 +17,7 @@
#include "CstrikeItemsInfos.h" #include "CstrikeItemsInfos.h"
#include "CstrikeUserMessages.h" #include "CstrikeUserMessages.h"
#include <IGameConfigs.h> #include <IGameConfigs.h>
#include <resdk/mod_rehlds_api.h>
IGameConfig *MainConfig; IGameConfig *MainConfig;
IGameConfig *CommonConfig; IGameConfig *CommonConfig;
@ -24,6 +25,8 @@ IGameConfigManager *ConfigManager;
HLTypeConversion TypeConversion; HLTypeConversion TypeConversion;
extern StringHashMap<int> ModelsList;
int AmxxCheckGame(const char *game) int AmxxCheckGame(const char *game)
{ {
if (strcasecmp(game, "cstrike") == 0 || if (strcasecmp(game, "cstrike") == 0 ||
@ -34,6 +37,30 @@ int AmxxCheckGame(const char *game)
return AMXX_GAME_BAD; return AMXX_GAME_BAD;
} }
void SV_ActivateServer_RH(IRehldsHook_SV_ActivateServer *chain, int runPhysics)
{
chain->callNext(runPhysics);
auto numResources = RehldsData->GetResourcesNum();
if (!numResources)
{
return;
}
ModelsList.clear();
for (auto i = 0; i < numResources; ++i) // Saves all the precached models into a list.
{
auto resource = RehldsData->GetResource(i);
if (resource->type == t_model)
{
ModelsList.insert(resource->szFileName, i);
}
}
}
void OnAmxxAttach() void OnAmxxAttach()
{ {
MF_AddNatives(CstrikeNatives); MF_AddNatives(CstrikeNatives);
@ -58,6 +85,11 @@ void OnAmxxAttach()
} }
InitializeHacks(); InitializeHacks();
if (HasReHlds)
{
RehldsHookchains->SV_ActivateServer()->registerHook(SV_ActivateServer_RH);
}
} }
void OnPluginsLoaded() void OnPluginsLoaded()
@ -74,23 +106,30 @@ void OnServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
// Used to catch WeaponList message at map change. // Used to catch WeaponList message at map change.
EnableMessageHooks(); EnableMessageHooks();
if (!ClientCommandDetour) // All CS_* forwards requires ClientCommand. Unlikely to fail. if (!HasReGameDll && !ClientCommandDetour) // All CS_* forwards requires ClientCommand. Unlikely to fail.
{ {
ToggleDetour_ClientCommands(false); ToggleHook_ClientCommands(false);
ToggleDetour_BuyCommands(false); ToggleHook_BuyCommands(false);
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
auto haveBotDetours = UseBotArgs && BotArgs; auto haveBotHooks = true;
auto haveBuyDetours = BuyGunAmmoDetour && GiveNamedItemDetour && AddAccountDetour && CanPlayerBuyDetour && CanBuyThisDetour; auto haveBuyHooks = true;
HasInternalCommandForward = haveBotDetours && UTIL_CheckForPublic("CS_InternalCommand"); if (!HasReGameDll)
HasOnBuyAttemptForward = haveBuyDetours && UTIL_CheckForPublic("CS_OnBuyAttempt"); {
HasOnBuyForward = haveBuyDetours && UTIL_CheckForPublic("CS_OnBuy"); haveBotHooks = UseBotArgs && BotArgs;
haveBuyHooks = BuyGunAmmoDetour && GiveNamedItemDetour && AddAccountDetour && CanPlayerBuyDetour && CanBuyThisDetour;
}
ToggleDetour_ClientCommands(HasInternalCommandForward || HasOnBuyAttemptForward || HasOnBuyForward); HasInternalCommandForward = haveBotHooks && UTIL_CheckForPublic("CS_InternalCommand");
ToggleDetour_BuyCommands(HasOnBuyForward); HasOnBuyAttemptForward = haveBuyHooks && UTIL_CheckForPublic("CS_OnBuyAttempt");
HasOnBuyForward = haveBuyHooks && UTIL_CheckForPublic("CS_OnBuy");
ToggleHook_ClientCommands(HasInternalCommandForward || HasOnBuyAttemptForward || HasOnBuyForward);
ToggleHook_BuyCommands(HasOnBuyForward);
ToggleHook_GiveDefaultItems(false);
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
@ -104,13 +143,15 @@ void OnServerActivate_Post(edict_t *pEdictList, int edictCount, int clientMax)
void OnServerDeactivate() void OnServerDeactivate()
{ {
if (!ClientCommandDetour) if (!HasReGameDll && !ClientCommandDetour)
{ {
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }
ToggleDetour_ClientCommands(false); GameRulesRH = nullptr;
ToggleDetour_BuyCommands(false);
ToggleHook_ClientCommands(false);
ToggleHook_BuyCommands(false);
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
} }

45
modules/cstrike/cstrike/CstrikeNatives.cpp
View File

@ -19,8 +19,10 @@
#include "CstrikeItemsInfos.h" #include "CstrikeItemsInfos.h"
#include <CDetour/detours.h> #include <CDetour/detours.h>
#include <amtl/am-string.h> #include <amtl/am-string.h>
#include <resdk/mod_regamedll_api.h>
bool NoKnivesMode = false; bool NoKnivesMode = false;
StringHashMap<int> ModelsList;
// native cs_set_user_money(index, money, flash = 1); // native cs_set_user_money(index, money, flash = 1);
static cell AMX_NATIVE_CALL cs_set_user_money(AMX *amx, cell *params) static cell AMX_NATIVE_CALL cs_set_user_money(AMX *amx, cell *params)
@ -865,18 +867,17 @@ static cell AMX_NATIVE_CALL cs_set_user_model(AMX *amx, cell *params)
char modelpath[260]; char modelpath[260];
ke::SafeSprintf(modelpath, sizeof(modelpath), "models/player/%s/%s.mdl", newModel, newModel); ke::SafeSprintf(modelpath, sizeof(modelpath), "models/player/%s/%s.mdl", newModel, newModel);
for (size_t i = 0; i < HL_MODEL_MAX; ++i) auto modelIndex = 0;
{
if (Server->model_precache[i] && !strcmp(Server->model_precache[i], modelpath))
{
if (pPlayer->v.modelindex != i)
{
SET_MODEL(pPlayer, STRING(ALLOC_STRING(modelpath)));
}
set_pdata<int>(pPlayer, m_modelIndexPlayer, i); if (ModelsList.retrieve(modelpath, &modelIndex))
return 1; {
if (pPlayer->v.modelindex != modelIndex)
{
SET_MODEL(pPlayer, STRING(ALLOC_STRING(modelpath)));
} }
set_pdata<int>(pPlayer, m_modelIndexPlayer, modelIndex);
return 1;
} }
MF_Log("Model must be precached using cs_set_user_model with update_index parameter set"); MF_Log("Model must be precached using cs_set_user_model with update_index parameter set");
@ -1044,7 +1045,7 @@ static cell AMX_NATIVE_CALL cs_get_no_knives(AMX *amx, cell *params)
// native cs_set_no_knives(noknives = 0); // native cs_set_no_knives(noknives = 0);
static cell AMX_NATIVE_CALL cs_set_no_knives(AMX *amx, cell *params) static cell AMX_NATIVE_CALL cs_set_no_knives(AMX *amx, cell *params)
{ {
if (!GiveDefaultItemsDetour) if (!HasReGameDll && !GiveDefaultItemsDetour)
{ {
MF_LogError(amx, AMX_ERR_NATIVE, "Native cs_set_no_knives() is disabled. Check your amxx logs."); MF_LogError(amx, AMX_ERR_NATIVE, "Native cs_set_no_knives() is disabled. Check your amxx logs.");
return 0; return 0;
@ -1052,14 +1053,7 @@ static cell AMX_NATIVE_CALL cs_set_no_knives(AMX *amx, cell *params)
NoKnivesMode = params[1] != 0; NoKnivesMode = params[1] != 0;
if (NoKnivesMode) ToggleHook_GiveDefaultItems(NoKnivesMode);
{
GiveDefaultItemsDetour->EnableDetour();
}
else
{
GiveDefaultItemsDetour->DisableDetour();
}
return 1; return 1;
} }
@ -1698,7 +1692,7 @@ static cell AMX_NATIVE_CALL cs_find_ent_by_class(AMX* amx, cell* params)
} }
int len; int len;
void* pEntity = TypeConversion.id_to_cbase(params[1]); auto pEntity = (CBaseEntity*)TypeConversion.id_to_cbase(params[1]);
const char* value = MF_GetAmxString(amx, params[2], 0, &len); const char* value = MF_GetAmxString(amx, params[2], 0, &len);
int index = TypeConversion.cbase_to_id(CS_UTIL_FindEntityByString(pEntity, "classname", value)); int index = TypeConversion.cbase_to_id(CS_UTIL_FindEntityByString(pEntity, "classname", value));
@ -1724,7 +1718,7 @@ static cell AMX_NATIVE_CALL cs_find_ent_by_owner(AMX* amx, cell* params)
CHECK_ENTITY_SIMPLE(owner); CHECK_ENTITY_SIMPLE(owner);
int length; int length;
void* pEntity = TypeConversion.id_to_cbase(params[1]); auto pEntity = (CBaseEntity*)TypeConversion.id_to_cbase(params[1]);
const char* value = MF_GetAmxString(amx, params[2], 0, &length); const char* value = MF_GetAmxString(amx, params[2], 0, &length);
edict_t *pOwner = TypeConversion.id_to_edict(owner); edict_t *pOwner = TypeConversion.id_to_edict(owner);
@ -1763,14 +1757,14 @@ static cell AMX_NATIVE_CALL cs_set_ent_class(AMX* amx, cell* params)
if (pev->classname) if (pev->classname)
{ {
RemoveEntityHashValue(pev, STRING(pev->classname), HashType::Classname); RemoveEntityHashValue(pev, STRING(pev->classname), CLASSNAME);
} }
int length; int length;
auto new_classname = MF_GetAmxString(amx, params[2], 0, &length); auto new_classname = MF_GetAmxString(amx, params[2], 0, &length);
pev->classname = ALLOC_STRING(new_classname); pev->classname = ALLOC_STRING(new_classname);
AddEntityHashValue(pev, STRING(pev->classname), HashType::Classname); AddEntityHashValue(pev, STRING(pev->classname), CLASSNAME);
return 1; return 1;
} }
@ -1882,7 +1876,7 @@ static cell AMX_NATIVE_CALL cs_get_translated_item_alias(AMX* amx, cell* params)
// native cs_get_weapon_info(weapon_id, CsWeaponInfo:type); // native cs_get_weapon_info(weapon_id, CsWeaponInfo:type);
static cell AMX_NATIVE_CALL cs_get_weapon_info(AMX* amx, cell* params) static cell AMX_NATIVE_CALL cs_get_weapon_info(AMX* amx, cell* params)
{ {
if (GetWeaponInfo <= 0) if (!HasReGameDll && GetWeaponInfo <= 0)
{ {
MF_LogError(amx, AMX_ERR_NATIVE, "Native cs_get_weapon_info() is disabled. Check your amxx logs."); MF_LogError(amx, AMX_ERR_NATIVE, "Native cs_get_weapon_info() is disabled. Check your amxx logs.");
return 0; return 0;
@ -1893,7 +1887,7 @@ static cell AMX_NATIVE_CALL cs_get_weapon_info(AMX* amx, cell* params)
WeaponInfoStruct *info; WeaponInfoStruct *info;
if (weapon_id <= CSW_NONE || weapon_id > CSW_LAST_WEAPON || !(info = GetWeaponInfo(weapon_id))) if (weapon_id <= CSW_NONE || weapon_id > CSW_LAST_WEAPON || !(info = HasReGameDll ? ReGameApi->GetWeaponInfo(weapon_id) : GetWeaponInfo(weapon_id)))
{ {
MF_LogError(amx, AMX_ERR_NATIVE, "Invalid weapon id: %d", weapon_id); MF_LogError(amx, AMX_ERR_NATIVE, "Invalid weapon id: %d", weapon_id);
return 0; return 0;
@ -1925,6 +1919,7 @@ static cell AMX_NATIVE_CALL cs_get_weapon_info(AMX* amx, cell* params)
{ {
return info->ammoType; return info->ammoType;
} }
// TODO: Ammo name (custom)
} }
MF_LogError(amx, AMX_ERR_NATIVE, "Invalid info type: %d", info_type); MF_LogError(amx, AMX_ERR_NATIVE, "Invalid info type: %d", info_type);

2
modules/cstrike/cstrike/CstrikePlayer.cpp
View File

@ -52,7 +52,7 @@ void StartFrame()
{ {
g_pFunctionTable->pfnStartFrame = nullptr; g_pFunctionTable->pfnStartFrame = nullptr;
for (int i = 1; i < gpGlobals->maxClients; ++i) for (int i = 1; i <= gpGlobals->maxClients; ++i)
{ {
if (Players[i].HasModel()) if (Players[i].HasModel())
{ {

6
modules/cstrike/cstrike/CstrikePlayer.h
View File

@ -18,6 +18,7 @@
#include "CstrikeUtils.h" #include "CstrikeUtils.h"
#include "CstrikeHacks.h" #include "CstrikeHacks.h"
#include <amtl/am-vector.h> #include <amtl/am-vector.h>
#include <resdk/mod_rehlds_api.h>
extern ke::Vector<int> ModelsUpdateQueue; extern ke::Vector<int> ModelsUpdateQueue;
@ -119,6 +120,11 @@ class CPlayer
g_pengfuncsTable->pfnSetClientKeyValue = SetClientKeyValue; g_pengfuncsTable->pfnSetClientKeyValue = SetClientKeyValue;
} }
if (HasReHlds)
{
return;
}
if (!ServerStatic) if (!ServerStatic)
{ {
MF_Log("Postponing of model update disabled, check your gamedata files"); MF_Log("Postponing of model update disabled, check your gamedata files");

10
modules/cstrike/cstrike/msvc12/cstrike.vcxproj
View File

@ -144,6 +144,8 @@
<ClCompile Include="..\..\..\..\public\memtools\CDetour\asm\asm.c" /> <ClCompile Include="..\..\..\..\public\memtools\CDetour\asm\asm.c" />
<ClCompile Include="..\..\..\..\public\memtools\CDetour\detours.cpp" /> <ClCompile Include="..\..\..\..\public\memtools\CDetour\detours.cpp" />
<ClCompile Include="..\..\..\..\public\memtools\MemoryUtils.cpp" /> <ClCompile Include="..\..\..\..\public\memtools\MemoryUtils.cpp" />
<ClCompile Include="..\..\..\..\public\resdk\mod_regamedll_api.cpp" />
<ClCompile Include="..\..\..\..\public\resdk\mod_rehlds_api.cpp" />
<ClCompile Include="..\CstrikeMain.cpp" /> <ClCompile Include="..\CstrikeMain.cpp" />
<ClCompile Include="..\CstrikeHacks.cpp" /> <ClCompile Include="..\CstrikeHacks.cpp" />
<ClCompile Include="..\CstrikeNatives.cpp" /> <ClCompile Include="..\CstrikeNatives.cpp" />
@ -158,6 +160,14 @@
<ClInclude Include="..\..\..\..\public\memtools\CDetour\detourhelpers.h" /> <ClInclude Include="..\..\..\..\public\memtools\CDetour\detourhelpers.h" />
<ClInclude Include="..\..\..\..\public\memtools\CDetour\detours.h" /> <ClInclude Include="..\..\..\..\public\memtools\CDetour\detours.h" />
<ClInclude Include="..\..\..\..\public\memtools\MemoryUtils.h" /> <ClInclude Include="..\..\..\..\public\memtools\MemoryUtils.h" />
<ClInclude Include="..\..\..\..\public\resdk\common\hookchains.h" />
<ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_api.h" />
<ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_const.h" />
<ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_interfaces.h" />
<ClInclude Include="..\..\..\..\public\resdk\engine\rehlds_api.h" />
<ClInclude Include="..\..\..\..\public\resdk\engine\rehlds_interfaces.h" />
<ClInclude Include="..\..\..\..\public\resdk\mod_regamedll_api.h" />
<ClInclude Include="..\..\..\..\public\resdk\mod_rehlds_api.h" />
<ClInclude Include="..\CstrikeItemsInfos.h" /> <ClInclude Include="..\CstrikeItemsInfos.h" />
<ClInclude Include="..\CstrikeDatas.h" /> <ClInclude Include="..\CstrikeDatas.h" />
<ClInclude Include="..\CstrikeHacks.h" /> <ClInclude Include="..\CstrikeHacks.h" />

42
modules/cstrike/cstrike/msvc12/cstrike.vcxproj.filters
View File

@ -27,6 +27,18 @@
<Filter Include="Memtools\CDetour\asm"> <Filter Include="Memtools\CDetour\asm">
<UniqueIdentifier>{4f3c4a13-065a-49b1-83a1-f646a3ec3678}</UniqueIdentifier> <UniqueIdentifier>{4f3c4a13-065a-49b1-83a1-f646a3ec3678}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="ReSDK">
<UniqueIdentifier>{7f37b35a-6ac7-4269-81a1-60dab5abbee4}</UniqueIdentifier>
</Filter>
<Filter Include="ReSDK\engine">
<UniqueIdentifier>{bcfa2fd6-45a9-4671-a48e-f9ae4fdd3a9a}</UniqueIdentifier>
</Filter>
<Filter Include="ReSDK\common">
<UniqueIdentifier>{d192d10f-9ccb-4357-a360-875a563b016a}</UniqueIdentifier>
</Filter>
<Filter Include="ReSDK\cstrike">
<UniqueIdentifier>{ba0b72ba-25d8-48c3-af84-c1d4d7436636}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\CstrikeHacks.cpp"> <ClCompile Include="..\CstrikeHacks.cpp">
@ -62,6 +74,12 @@
<ClCompile Include="..\CstrikeItemsInfos.cpp"> <ClCompile Include="..\CstrikeItemsInfos.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\public\resdk\mod_regamedll_api.cpp">
<Filter>ReSDK</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\public\resdk\mod_rehlds_api.cpp">
<Filter>ReSDK</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\CstrikePlayer.h"> <ClInclude Include="..\CstrikePlayer.h">
@ -100,6 +118,30 @@
<ClInclude Include="..\CstrikeItemsInfos.h"> <ClInclude Include="..\CstrikeItemsInfos.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\public\resdk\common\hookchains.h">
<Filter>ReSDK\common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_api.h">
<Filter>ReSDK\cstrike</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_const.h">
<Filter>ReSDK\cstrike</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_interfaces.h">
<Filter>ReSDK\cstrike</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\public\resdk\engine\rehlds_api.h">
<Filter>ReSDK\engine</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\public\resdk\engine\rehlds_interfaces.h">
<Filter>ReSDK\engine</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\public\resdk\mod_regamedll_api.h">
<Filter>ReSDK</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\public\resdk\mod_rehlds_api.h">
<Filter>ReSDK</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\..\..\plugins\include\cstrike.inc"> <None Include="..\..\..\..\plugins\include\cstrike.inc">

1
modules/fakemeta/AMBuilder
View File

@ -10,6 +10,7 @@ binary.compiler.defines += [
binary.sources = [ binary.sources = [
'../../public/sdk/amxxmodule.cpp', '../../public/sdk/amxxmodule.cpp',
'../../public/memtools/MemoryUtils.cpp', '../../public/memtools/MemoryUtils.cpp',
'../../public/resdk/mod_regamedll_api.cpp',
'dllfunc.cpp', 'dllfunc.cpp',
'engfunc.cpp', 'engfunc.cpp',
'fakemeta_amxx.cpp', 'fakemeta_amxx.cpp',

36
modules/fakemeta/fakemeta_amxx.cpp
View File

@ -13,14 +13,24 @@
#include "fakemeta_amxx.h" #include "fakemeta_amxx.h"
#include "sh_stack.h" #include "sh_stack.h"
#include <resdk/mod_regamedll_api.h>
IGameConfig *CommonConfig; IGameConfig *CommonConfig;
IGameConfig *GamerulesConfig; IGameConfig *GamerulesConfig;
IGameConfigManager *ConfigManager; IGameConfigManager *ConfigManager;
bool HasRegameDll;
HLTypeConversion TypeConversion; HLTypeConversion TypeConversion;
void *GameRulesRH;
void **GameRulesAddress; void **GameRulesAddress;
CGameRules* InstallGameRules(IReGameHook_InstallGameRules *chain)
{
GameRulesRH = chain->callNext();
return static_cast<CGameRules*>(GameRulesRH);
}
void OnAmxxAttach() void OnAmxxAttach()
{ {
initialze_offsets(); initialze_offsets();
@ -61,19 +71,26 @@ void OnAmxxAttach()
return; return;
} }
void *address = nullptr; if ((HasRegameDll = RegamedllApi_Init()))
if (!CommonConfig->GetAddress("g_pGameRules", &address) || !address)
{ {
MF_Log("get/set_gamerules_* natives have been disabled because g_pGameRules address could not be found. "); ReGameHookchains->InstallGameRules()->registerHook(InstallGameRules);
return;
} }
else
{
void *address = nullptr;
if (!CommonConfig->GetAddress("g_pGameRules", &address) || !address)
{
MF_Log("get/set_gamerules_* natives have been disabled because g_pGameRules address could not be found. ");
return;
}
#if defined(KE_WINDOWS) #if defined(KE_WINDOWS)
GameRulesAddress = *reinterpret_cast<void***>(address); GameRulesAddress = *reinterpret_cast<void***>(address);
#else #else
GameRulesAddress = reinterpret_cast<void**>(address); GameRulesAddress = reinterpret_cast<void**>(address);
#endif #endif
}
} }
void OnPluginsLoaded() void OnPluginsLoaded()
@ -135,6 +152,11 @@ void ServerActivate(edict_t *pEdictList, int edictCount, int clientMax)
void FMH_ServerDeactivate_Post() void FMH_ServerDeactivate_Post()
{ {
if (HasRegameDll)
{
GameRulesRH = nullptr;
}
// Reset all call lists here. // Reset all call lists here.
// NULL all function tables // NULL all function tables
RESETE(PrecacheModel); RESETE(PrecacheModel);

2
modules/fakemeta/fakemeta_amxx.h
View File

@ -79,7 +79,9 @@ extern IGameConfig *CommonConfig;
extern IGameConfig *GamerulesConfig; extern IGameConfig *GamerulesConfig;
extern IGameConfigManager *ConfigManager; extern IGameConfigManager *ConfigManager;
extern bool HasRegameDll;
extern HLTypeConversion TypeConversion; extern HLTypeConversion TypeConversion;
extern void *GameRulesRH;
extern void **GameRulesAddress; extern void **GameRulesAddress;
#endif //_FAKEMETA_INCLUDE_H #endif //_FAKEMETA_INCLUDE_H

11
modules/fakemeta/msvc12/fakemeta.vcxproj
View File

@ -55,7 +55,7 @@
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk;..\..\..\public\amtl;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk;..\..\..\public\amtl;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS;HAVE_STDINT_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -78,7 +78,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk;..\..\..\public\amtl;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk;..\..\..\public\amtl;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS;HAVE_STDINT_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS;HAVE_STDINT_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader> <PrecompiledHeader>
@ -97,6 +97,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\public\memtools\MemoryUtils.cpp" /> <ClCompile Include="..\..\..\public\memtools\MemoryUtils.cpp" />
<ClCompile Include="..\..\..\public\resdk\mod_regamedll_api.cpp" />
<ClCompile Include="..\fakemeta_amxx.cpp" /> <ClCompile Include="..\fakemeta_amxx.cpp" />
<ClCompile Include="..\fm_tr.cpp" /> <ClCompile Include="..\fm_tr.cpp" />
<ClCompile Include="..\fm_tr2.cpp" /> <ClCompile Include="..\fm_tr2.cpp" />
@ -114,6 +115,12 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\public\HLTypeConversion.h" /> <ClInclude Include="..\..\..\public\HLTypeConversion.h" />
<ClInclude Include="..\..\..\public\memtools\MemoryUtils.h" /> <ClInclude Include="..\..\..\public\memtools\MemoryUtils.h" />
<ClInclude Include="..\..\..\public\resdk\common\hookchains.h" />
<ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_api.h" />
<ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_const.h" />
<ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_interfaces.h" />
<ClInclude Include="..\..\..\public\resdk\mod_regamedll_api.h" />
<ClInclude Include="..\..\..\public\resdk\mod_rehlds_api.h" />
<ClInclude Include="..\fakemeta_amxx.h" /> <ClInclude Include="..\fakemeta_amxx.h" />
<ClInclude Include="..\fm_tr.h" /> <ClInclude Include="..\fm_tr.h" />
<ClInclude Include="..\dllfunc.h" /> <ClInclude Include="..\dllfunc.h" />

30
modules/fakemeta/msvc12/fakemeta.vcxproj.filters
View File

@ -36,6 +36,15 @@
<Filter Include="Memtools"> <Filter Include="Memtools">
<UniqueIdentifier>{e1b28b22-6fde-4e1f-a982-f37dec584571}</UniqueIdentifier> <UniqueIdentifier>{e1b28b22-6fde-4e1f-a982-f37dec584571}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="ReSDK">
<UniqueIdentifier>{395f243b-8294-49ad-a959-d3d9ca6b79db}</UniqueIdentifier>
</Filter>
<Filter Include="ReSDK\common">
<UniqueIdentifier>{87a7e30d-f917-4853-b5b9-56782049cee6}</UniqueIdentifier>
</Filter>
<Filter Include="ReSDK\cstrike">
<UniqueIdentifier>{0d1c5025-071d-43aa-b19a-2eee0d34a906}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\fakemeta_amxx.cpp"> <ClCompile Include="..\fakemeta_amxx.cpp">
@ -80,6 +89,9 @@
<ClCompile Include="..\pdata_gamerules.cpp"> <ClCompile Include="..\pdata_gamerules.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\public\resdk\mod_regamedll_api.cpp">
<Filter>ReSDK</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\fakemeta_amxx.h"> <ClInclude Include="..\fakemeta_amxx.h">
@ -124,6 +136,24 @@
<ClInclude Include="..\pdata_shared.h"> <ClInclude Include="..\pdata_shared.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\public\resdk\common\hookchains.h">
<Filter>ReSDK\common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_api.h">
<Filter>ReSDK\cstrike</Filter>
</ClInclude>
<ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_const.h">
<Filter>ReSDK\cstrike</Filter>
</ClInclude>
<ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_interfaces.h">
<Filter>ReSDK\cstrike</Filter>
</ClInclude>
<ClInclude Include="..\..\..\public\resdk\mod_regamedll_api.h">
<Filter>ReSDK</Filter>
</ClInclude>
<ClInclude Include="..\..\..\public\resdk\mod_rehlds_api.h">
<Filter>ReSDK</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\..\plugins\include\fakemeta.inc"> <None Include="..\..\..\plugins\include\fakemeta.inc">

20
modules/fakemeta/pdata_gamerules.cpp
View File

@ -25,7 +25,7 @@ static cell AMX_NATIVE_CALL get_gamerules_int(AMX *amx, cell *params)
int element = params[3]; int element = params[3];
CHECK_DATA(data, element, BaseFieldType::Integer); CHECK_DATA(data, element, BaseFieldType::Integer);
return PvData::GetInt(*GameRulesAddress, data, element); return PvData::GetInt(HasRegameDll ? GameRulesRH : *GameRulesAddress, data, element);
} }
// native set_gamerules_int(const class[], const member[], any:value, element = 0); // native set_gamerules_int(const class[], const member[], any:value, element = 0);
@ -45,7 +45,7 @@ static cell AMX_NATIVE_CALL set_gamerules_int(AMX *amx, cell *params)
return 0; return 0;
} }
PvData::SetInt(*GameRulesAddress, data, params[3], element); PvData::SetInt(HasRegameDll ? GameRulesRH : *GameRulesAddress, data, params[3], element);
return 0; return 0;
} }
@ -62,7 +62,7 @@ static cell AMX_NATIVE_CALL get_gamerules_float(AMX *amx, cell *params)
int element = params[3]; int element = params[3];
CHECK_DATA(data, element, BaseFieldType::Float); CHECK_DATA(data, element, BaseFieldType::Float);
return PvData::GetFloat(*GameRulesAddress, data, element); return PvData::GetFloat(HasRegameDll ? GameRulesRH : *GameRulesAddress, data, element);
} }
// native set_gamerules_float(const class[], const member[], Float:value, element = 0); // native set_gamerules_float(const class[], const member[], Float:value, element = 0);
@ -76,7 +76,7 @@ static cell AMX_NATIVE_CALL set_gamerules_float(AMX *amx, cell *params)
int element = params[4]; int element = params[4];
CHECK_DATA(data, element, BaseFieldType::Float); CHECK_DATA(data, element, BaseFieldType::Float);
PvData::SetFloat(*GameRulesAddress, data, amx_ctof(params[3]), element); PvData::SetFloat(HasRegameDll ? GameRulesRH : *GameRulesAddress, data, amx_ctof(params[3]), element);
return 1; return 1;
} }
@ -93,7 +93,7 @@ static cell AMX_NATIVE_CALL get_gamerules_vector(AMX *amx, cell *params)
int element = params[4]; int element = params[4];
CHECK_DATA(data, element, BaseFieldType::Vector); CHECK_DATA(data, element, BaseFieldType::Vector);
PvData::GetVector(*GameRulesAddress, data, MF_GetAmxAddr(amx, params[3]), element); PvData::GetVector(HasRegameDll ? GameRulesRH : *GameRulesAddress, data, MF_GetAmxAddr(amx, params[3]), element);
return 1; return 1;
} }
@ -109,7 +109,7 @@ static cell AMX_NATIVE_CALL set_gamerules_vector(AMX *amx, cell *params)
int element = params[4]; int element = params[4];
CHECK_DATA(data, element, BaseFieldType::Vector); CHECK_DATA(data, element, BaseFieldType::Vector);
PvData::GetVector(*GameRulesAddress, data, MF_GetAmxAddr(amx, params[3]), element); PvData::GetVector(HasRegameDll ? GameRulesRH : *GameRulesAddress, data, MF_GetAmxAddr(amx, params[3]), element);
return 1; return 1;
} }
@ -126,7 +126,7 @@ static cell AMX_NATIVE_CALL get_gamerules_entity(AMX *amx, cell *params)
int element = params[3]; int element = params[3];
CHECK_DATA(data, element, BaseFieldType::Entity); CHECK_DATA(data, element, BaseFieldType::Entity);
return PvData::GetEntity(*GameRulesAddress, data, element); return PvData::GetEntity(HasRegameDll ? GameRulesRH : *GameRulesAddress, data, element);
} }
// native set_gamerules_entity(const class[], const member[], value, element = 0); // native set_gamerules_entity(const class[], const member[], value, element = 0);
@ -147,7 +147,7 @@ static cell AMX_NATIVE_CALL set_gamerules_entity(AMX *amx, cell *params)
int element = params[4]; int element = params[4];
CHECK_DATA(data, element, BaseFieldType::Entity); CHECK_DATA(data, element, BaseFieldType::Entity);
PvData::SetEntity(*GameRulesAddress, data, params[3], element); PvData::SetEntity(HasRegameDll ? GameRulesRH : *GameRulesAddress, data, params[3], element);
return 0; return 0;
} }
@ -167,7 +167,7 @@ static cell AMX_NATIVE_CALL get_gamerules_string(AMX *amx, cell *params)
auto buffer = params[3]; auto buffer = params[3];
auto maxlen = params[4]; auto maxlen = params[4];
auto string = PvData::GetString(*GameRulesAddress, data, element); auto string = PvData::GetString(HasRegameDll ? GameRulesRH : *GameRulesAddress, data, element);
if (data.fieldSize) if (data.fieldSize)
{ {
@ -191,7 +191,7 @@ static cell AMX_NATIVE_CALL set_gamerules_string(AMX *amx, cell *params)
int length; int length;
const char *value = MF_GetAmxString(amx, params[3], 0, &length); const char *value = MF_GetAmxString(amx, params[3], 0, &length);
return PvData::SetString(*GameRulesAddress, data, value, length, element); return PvData::SetString(HasRegameDll ? GameRulesRH : *GameRulesAddress, data, value, length, element);
} }

10
modules/fakemeta/pdata_shared.h
View File

@ -63,11 +63,11 @@ enum class BaseFieldType
return 0; \ return 0; \
} }
#define CHECK_GAMERULES() \ #define CHECK_GAMERULES() \
if (!GameRulesAddress) \ if ((HasRegameDll && !GameRulesRH) || (!HasRegameDll && (!GameRulesAddress || !*GameRulesAddress))) \
{ \ { \
MF_LogError(amx, AMX_ERR_NATIVE, "%s is disabled. Check your AMXX log.", __FUNCTION__); \ MF_LogError(amx, AMX_ERR_NATIVE, "%s is disabled. Check your AMXX log.", __FUNCTION__); \
return 0; \ return 0; \
} }
class PvData class PvData

2
modules/hamsandwich/config_parser.cpp
View File

@ -307,7 +307,7 @@ int ReadConfig(void)
{ {
char FileName[512]; char FileName[512];
MF_BuildPathnameR(FileName,sizeof(FileName)-1,"%s",get_localinfo("amxx_configsdir","addons/amxmodx/configs")); MF_BuildPathnameR(FileName,sizeof(FileName),"%s",get_localinfo("amxx_configsdir","addons/amxmodx/configs"));
strncat(FileName,"/hamdata.ini",sizeof(FileName)-1); strncat(FileName,"/hamdata.ini",sizeof(FileName)-1);

12
modules/nvault/amxxapi.cpp
View File

@ -14,7 +14,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "amxxapi.h" #include "amxxapi.h"
#include "NVault.h" #include "NVault.h"
#include <sm_queue.h>
#ifdef WIN32 #ifdef WIN32
#define MKDIR(p) mkdir(p) #define MKDIR(p) mkdir(p)
@ -31,7 +30,7 @@
#endif #endif
ke::Vector<NVault *> g_Vaults; ke::Vector<NVault *> g_Vaults;
Queue<int> g_OldVaults; ke::Deque<int> g_OldVaults;
VaultMngr g_VaultMngr; VaultMngr g_VaultMngr;
@ -46,7 +45,7 @@ static cell nvault_open(AMX *amx, cell *params)
int len, id=-1; int len, id=-1;
char *name = MF_GetAmxString(amx, params[1], 0, &len); char *name = MF_GetAmxString(amx, params[1], 0, &len);
char path[255], file[255]; char path[255], file[255];
MF_BuildPathnameR(path, sizeof(path)-1, "%s/vault", MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data")); MF_BuildPathnameR(path, sizeof(path), "%s/vault", MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"));
sprintf(file, "%s/%s.vault", path, name); sprintf(file, "%s/%s.vault", path, name);
for (size_t i=0; i<g_Vaults.length(); i++) for (size_t i=0; i<g_Vaults.length(); i++)
{ {
@ -63,8 +62,7 @@ static cell nvault_open(AMX *amx, cell *params)
} }
if (!g_OldVaults.empty()) if (!g_OldVaults.empty())
{ {
id = g_OldVaults.first(); id = g_OldVaults.popFrontCopy();
g_OldVaults.pop();
} }
if (id != -1) if (id != -1)
{ {
@ -210,7 +208,7 @@ static cell nvault_close(AMX *amx, cell *params)
pVault->Close(); pVault->Close();
delete pVault; delete pVault;
g_Vaults[id] = NULL; g_Vaults[id] = NULL;
g_OldVaults.push(id); g_OldVaults.append(id);
return 1; return 1;
} }
@ -268,7 +266,7 @@ void OnPluginsUnloaded()
} }
g_Vaults.clear(); g_Vaults.clear();
while (!g_OldVaults.empty()) while (!g_OldVaults.empty())
g_OldVaults.pop(); g_OldVaults.popFront();
} }
AMX_NATIVE_INFO nVault_natives[] = { AMX_NATIVE_INFO nVault_natives[] = {

3
modules/nvault/amxxapi.h
View File

@ -17,9 +17,8 @@
#include "amxxmodule.h" #include "amxxmodule.h"
#include <amtl/am-vector.h> #include <amtl/am-vector.h>
#include <amtl/am-string.h> #include <amtl/am-string.h>
#include <sm_queue.h> #include <amtl/am-deque.h>
extern AMX_NATIVE_INFO nVault_natives[]; extern AMX_NATIVE_INFO nVault_natives[];
#endif //_INCLUDE_AMXXAPI_H #endif //_INCLUDE_AMXXAPI_H

4
modules/sockets/AMBuilder
View File

@ -8,6 +8,10 @@ binary.sources = [
'sockets.cpp', 'sockets.cpp',
] ]
binary.compiler.defines += [
'HAVE_STDINT_H',
]
if builder.target_platform == 'windows': if builder.target_platform == 'windows':
binary.sources += ['version.rc'] binary.sources += ['version.rc']

6
modules/sockets/moduleconfig.h
View File

@ -19,9 +19,9 @@
// Module info // Module info
#define MODULE_NAME "Sockets" #define MODULE_NAME "Sockets"
#define MODULE_VERSION AMXX_VERSION #define MODULE_VERSION AMXX_VERSION
#define MODULE_AUTHOR "HLSW Dev Team" #define MODULE_AUTHOR "AMX Mod X Dev Team"
#define MODULE_URL "http://www.hlsw.net/" #define MODULE_URL "http://www.amxmodx.org"
#define MODULE_LOGTAG "SOCKET" #define MODULE_LOGTAG "SOCKETS"
#define MODULE_LIBRARY "sockets" #define MODULE_LIBRARY "sockets"
#define MODULE_LIBCLASS "" #define MODULE_LIBCLASS ""
// If you want the module not to be reloaded on mapchange, remove / comment out the next line // If you want the module not to be reloaded on mapchange, remove / comment out the next line

8
modules/sockets/msvc12/sockets.vcxproj
View File

@ -55,7 +55,7 @@
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk;..\..\..\public\amtl;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk;..\..\..\public\amtl;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;HAVE_STDINT_H;_DEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@ -66,7 +66,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)sockets.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(OutDir)sockets.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -79,7 +79,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk;..\..\..\public\amtl;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\;..\..\..\public;..\..\..\public\sdk;..\..\..\public\amtl;..\..\third_party;..\..\third_party\hashing;$(METAMOD)\metamod;$(HLSDK)\common;$(HLSDK)\engine;$(HLSDK)\dlls;$(HLSDK)\pm_shared;$(HLSDK)\public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;HAVE_STDINT_H;NDEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader> <PrecompiledHeader>
@ -88,7 +88,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>

460
modules/sockets/sockets.cpp
View File

@ -3,10 +3,6 @@
// AMX Mod X, based on AMX Mod by Aleksander Naszko ("OLO"). // AMX Mod X, based on AMX Mod by Aleksander Naszko ("OLO").
// Copyright (C) The AMX Mod X Development Team. // Copyright (C) The AMX Mod X Development Team.
// //
// Codebase from Ivan, -g-s-ivan@web.de (AMX 0.9.3)
// Modification by Olaf Reusch, kenterfie@hlsw.de (AMXX 0.16, AMX 0.96)
// Modification by David Anderson, dvander@tcwonline.org (AMXx 0.20)
//
// This software is licensed under the GNU General Public License, version 3 or higher. // This software is licensed under the GNU General Public License, version 3 or higher.
// Additional exceptions apply. For full license details, see LICENSE.txt or visit: // Additional exceptions apply. For full license details, see LICENSE.txt or visit:
// https://alliedmods.net/amxmodx-license // https://alliedmods.net/amxmodx-license
@ -15,233 +11,335 @@
// Sockets Module // Sockets Module
// //
#include <stdlib.h> #include "amxxmodule.h"
#include <fcntl.h> #include <amtl/am-string.h>
#include <errno.h>
#include <string.h>
#ifdef _WIN32 #ifdef _WIN32
/* Windows */ #include <winsock2.h>
#include <winsock.h> #include <ws2tcpip.h>
#include <io.h>
#define socklen_t int #undef errno
#undef close
#define errno WSAGetLastError()
#define close(sockfd) closesocket(sockfd)
#define EINPROGRESS WSAEINPROGRESS
#define EWOULDBLOCK WSAEWOULDBLOCK
#else #else
/* Unix/Linux */ #include <netinet/in.h>
#include <unistd.h> #include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <unistd.h>
#include <netdb.h> #include <errno.h>
#include <arpa/inet.h> #include <netdb.h>
#define closesocket(s) close(s) #include <fcntl.h>
#endif #endif
// AMX Headers #ifdef _WIN32
#include "amxxmodule.h" bool g_winsock_initialized = false;
#endif
#define SOCKET_TCP 1 static char *g_send2_buffer = nullptr;
#define SOCKET_UDP 2 static int g_send2_buffer_length = 0;
// And global Variables:
// native socket_open(_hostname[], _port, _protocol = SOCKET_TCP, &_error); bool setnonblocking(int sockfd)
static cell AMX_NATIVE_CALL socket_open(AMX *amx, cell *params) /* 2 param */
{ {
unsigned int port = params[2]; #ifdef _WIN32
int len; unsigned long flags = 1;
char* hostname = MF_GetAmxString(amx,params[1],0,&len); // Get the hostname from AMX
cell *err = MF_GetAmxAddr(amx, params[4]);
if(len == 0) { // just to prevent to work with a nonset hostname
*err = 2; // server unknown
return -1;
}
*err = 0; // params[4] is error backchannel
struct sockaddr_in server;
struct hostent *host_info;
unsigned long addr;
int sock=-1;
int contr;
// Create a Socket
sock = socket(AF_INET, params[3]==SOCKET_TCP?SOCK_STREAM:SOCK_DGRAM, 0);
if (sock < 0) {
// Error, couldn't create a socket, so set an error and return.
*err = 1;
return -1;
}
// Clear the server structure (set everything to 0) return (ioctlsocket(sockfd, FIONBIO, &flags) == 0);
memset( &server, 0, sizeof (server)); #else
// Test the hostname, and resolve if needed
if ((addr = inet_addr(hostname)) != INADDR_NONE) {
// seems like hostname is a numeric ip, so put it into the structure
memcpy( (char *)&server.sin_addr, &addr, sizeof(addr));
}
else {
// hostname is a domain, so resolve it to an ip
host_info = gethostbyname(hostname);
if (host_info == NULL) {
// an error occured, the hostname is unknown
*err = 2; // server unknown
return -1;
}
// If not, put it in the Server structure
memcpy( (char *)&server.sin_addr, host_info->h_addr, host_info->h_length);
}
// Set the type of the Socket
server.sin_family = AF_INET;
// Change the port to network byte order, and put it into the structure
server.sin_port = htons(port);
// Not, let's try to open a connection to the server int flags = -1;
contr = connect(sock, (struct sockaddr*)&server, sizeof( server));
if (contr < 0) { if((flags = fcntl(sockfd, F_GETFL, 0)) == -1)
// If an error occured cancel return false;
*err = 3; //error while connecting
return -1; if(fcntl(sockfd, F_SETFL, flags | O_NONBLOCK) == -1)
} return false;
// Everything went well, so return the socket
return sock; return true;
#endif
}
// native socket_open(_hostname[], _port, _protocol = SOCKET_TCP, &_error, _flags = 0);
static cell AMX_NATIVE_CALL socket_open(AMX *amx, cell *params)
{
// Socket flags and backwards compatibility
enum
{
SOCK_NON_BLOCKING = (1 << 0),
SOCK_LIBC_ERRORS = (1 << 1)
};
#define SOCK_ERROR_OK 0 // No error
#define SOCK_ERROR_CREATE_SOCKET 1 // Couldn't create a socket
#define SOCK_ERROR_SERVER_UNKNOWN 2 // Server unknown
#define SOCK_ERROR_WHILE_CONNECTING 3 // Error while connecting
#define ERROR_EHOSTUNREACH 113 // libc error code: No route to host
int hostname_length = 0;
char *hostname = MF_GetAmxString(amx, params[1], 0, &hostname_length);
cell *error = MF_GetAmxAddr(amx, params[4]);
*error = 0;
unsigned int flags = 0;
bool libc_errors = false, nonblocking_socket = false;
if((*params / sizeof(cell)) == 5)
{
flags = params[5];
nonblocking_socket = (flags & SOCK_NON_BLOCKING) != 0;
libc_errors = (flags & SOCK_LIBC_ERRORS) != 0;
}
if(hostname_length == 0)
{
*error = libc_errors ? ERROR_EHOSTUNREACH : SOCK_ERROR_SERVER_UNKNOWN;
return -1;
}
char port_number[6];
ke::SafeSprintf(port_number, sizeof(port_number), "%d", params[2]);
int sockfd = -1, getaddrinfo_status = -1, connect_status = -1;
bool setnonblocking_status = false, connect_inprogress = false;
struct addrinfo hints, *server_info, *server;
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = params[3];
if((getaddrinfo_status = getaddrinfo(hostname, port_number, &hints, &server_info)) != 0)
{
*error = libc_errors ? getaddrinfo_status : SOCK_ERROR_SERVER_UNKNOWN;
return -1;
}
server = server_info;
do
{
if((sockfd = socket(server->ai_family, server->ai_socktype, server->ai_protocol)) != -1)
{
if(nonblocking_socket)
setnonblocking_status = setnonblocking(sockfd);
if(nonblocking_socket == false || (nonblocking_socket && setnonblocking_status == true))
{
if((connect_status = connect(sockfd, server->ai_addr, server->ai_addrlen)) == -1)
{
*error = libc_errors ? errno : SOCK_ERROR_WHILE_CONNECTING;
if(nonblocking_socket && (errno == EINPROGRESS || errno == EWOULDBLOCK))
connect_inprogress = true;
else
close(sockfd);
}
else
{
*error = 0;
}
}
else
{
if(*error == 0)
*error = libc_errors ? errno : SOCK_ERROR_CREATE_SOCKET;
}
}
else
{
if(*error == 0)
*error = errno;
}
} while((nonblocking_socket && connect_inprogress == false) && connect_status != 0 && (server = server->ai_next) != nullptr);
freeaddrinfo(server_info);
if(sockfd == -1 || server == nullptr)
return -1;
return sockfd;
} }
// native socket_close(_socket); // native socket_close(_socket);
static cell AMX_NATIVE_CALL socket_close(AMX *amx, cell *params) /* 2 param */ static cell AMX_NATIVE_CALL socket_close(AMX *amx, cell *params)
{ {
int socket = params[1]; return (close(params[1]) == -1) ? 0 : 1;
//PRINT_CONSOLE("Function: Close | Socket: %i\n", socket);
#ifdef _WIN32 // On windows, check whether the sockets are initialized correctly
closesocket(socket);
#else
// Close the socket (linux/unix styled systems)
close(socket);
#endif
return 0;
}
// native socket_change(_socket, _timeout=100000);
// 1 sec =1000000 usec
static cell AMX_NATIVE_CALL socket_change(AMX *amx, cell *params) /* 2 param */
{
int socket = params[1];
unsigned int timeout = params[2];
//PRINT_CONSOLE("Function: Change | Socket: %i | Timeout: %i\n", socket, timeout);
// We need both a timeout structure and a fdset for our filedescriptor
fd_set rfds;
struct timeval tv;
// Fill in ...
FD_ZERO(&rfds);
FD_SET(socket, &rfds);
tv.tv_sec = 0;
tv.tv_usec = timeout;
// Now we "select", which will show us if new data is waiting in the socket's buffer
if (select(socket+1, &rfds, NULL, NULL, &tv) > 0)
return 1; // Ok, new data, return it
else
return 0; // No new data, return it
} }
// native socket_recv(_socket, _data[], _length); // native socket_recv(_socket, _data[], _length);
static cell AMX_NATIVE_CALL socket_recv(AMX *amx, cell *params) /* 2 param */ static cell AMX_NATIVE_CALL socket_recv(AMX *amx, cell *params)
{ {
int socket = params[1]; int sockfd = params[1];
int length = params[3]; int length = params[3];
int tmp = -1;
// First we dynamicly allocate a block of heap memory for recieving our data char *recv_buffer = new char[length];
char *tmpchar = new char[length];
if(tmpchar == NULL) return -1; // If we didn't got a block, we have to quit here to avoid sigsegv if(recv_buffer == nullptr)
// And set it all to 0, because the memory could contain old trash return -1;
memset(tmpchar, 0, length);
// Now we recieve memset(recv_buffer, 0, length);
tmp = recv(socket, tmpchar, length-1, 0);
if (tmp == -1) int bytes_received = -1;
bytes_received = recv(sockfd, recv_buffer, length - 1, 0);
if(bytes_received == -1)
{ {
delete [] tmpchar; delete[] recv_buffer;
return -1; return -1;
} }
// And put a copy of our recieved data into amx's string
tmpchar[tmp]='\0'; recv_buffer[bytes_received] = '\0';
int nlen = 0;
//int max = params[3]; cell* destination = MF_GetAmxAddr(amx, params[2]);
int max = length-1;
const char* src = tmpchar; int current_length = 0;
cell* dest = MF_GetAmxAddr(amx,params[2]); int max_length = length - 1;
while(max--&&nlen<tmp){
*dest++ = (cell)*src++; const char *buffer = recv_buffer;
nlen++; while(max_length-- && current_length < bytes_received)
} {
*dest = 0; *destination++ = (cell)*buffer++;
// And we need to free up the space to avoid wasting memory current_length++;
delete [] tmpchar; }
// And finnally, return the what recv returnd
return tmp; *destination = 0;
delete[] recv_buffer;
return bytes_received;
} }
// native socket_send(_socket, _data[], _length); // native socket_send(_socket, _data[], _length);
static cell AMX_NATIVE_CALL socket_send(AMX *amx, cell *params) /* 3 param */ static cell AMX_NATIVE_CALL socket_send(AMX *amx, cell *params)
{ {
// We get the string from amx int sockfd = params[1];
int len; int length = 0;
int socket = params[1];
char* data = MF_GetAmxString(amx,params[2],0,&len);
// And send it to the socket
return send(socket, data, len, 0);
}
static char *g_buffer = NULL; char *data = MF_GetAmxString(amx, params[2], 0, &length);
static size_t g_buflen = 0;
return send(sockfd, data, length, 0);
}
// native socket_send2(_socket, _data[], _length); // native socket_send2(_socket, _data[], _length);
static cell AMX_NATIVE_CALL socket_send2(AMX *amx, cell *params) /* 3 param */ static cell AMX_NATIVE_CALL socket_send2(AMX *amx, cell *params)
{ {
// We get the string from amx int sockfd = params[1];
int len = params[3]; int length = params[3];
int socket = params[1];
if ((size_t)len > g_buflen) if(length > g_send2_buffer_length)
{ {
delete [] g_buffer; delete[] g_send2_buffer;
g_buffer = new char[len+1];
g_buflen = len; g_send2_buffer = new char[length + 1];
if(g_send2_buffer == nullptr)
{
g_send2_buffer_length = 0;
return -1;
}
g_send2_buffer_length = length;
} }
cell *pData = MF_GetAmxAddr(amx, params[2]); cell *data = MF_GetAmxAddr(amx, params[2]);
char *pBuffer = g_buffer; char *buffer = g_send2_buffer;
while (len--) while(length--)
*pBuffer++ = (char)*pData++; *buffer++ = (char)*data++;
// And send it to the socket return send(sockfd, g_send2_buffer, params[3], 0);
return send(socket, g_buffer, params[3], 0);
} }
AMX_NATIVE_INFO sockets_natives[] = { // native socket_change(_socket, _timeout = 100000);
static cell AMX_NATIVE_CALL socket_change(AMX *amx, cell *params)
{
int sockfd = params[1];
unsigned int timeout = params[2];
struct timeval tv;
tv.tv_sec = 0;
tv.tv_usec = timeout;
fd_set readfds;
FD_ZERO(&readfds);
FD_SET(sockfd, &readfds);
return (select(sockfd + 1, &readfds, nullptr, nullptr, &tv) > 0) ? 1 : 0;
}
// native socket_is_readable(_socket, _timeout = 100000);
static cell AMX_NATIVE_CALL socket_is_readable(AMX *amx, cell *params)
{
return socket_change(amx, params);
}
// native socket_is_writable(_socket, _timeout = 100000);
static cell AMX_NATIVE_CALL socket_is_writable(AMX *amx, cell *params)
{
int sockfd = params[1];
unsigned int timeout = params[2];
struct timeval tv;
tv.tv_sec = 0;
tv.tv_usec = timeout;
fd_set writefds;
FD_ZERO(&writefds);
FD_SET(sockfd, &writefds);
return (select(sockfd + 1, nullptr, &writefds, nullptr, &tv) > 0) ? 1 : 0;
}
AMX_NATIVE_INFO sockets_natives[] =
{
{"socket_open", socket_open}, {"socket_open", socket_open},
{"socket_close", socket_close}, {"socket_close", socket_close},
{"socket_change", socket_change},
{"socket_recv", socket_recv}, {"socket_recv", socket_recv},
{"socket_send", socket_send}, {"socket_send", socket_send},
{"socket_send2", socket_send2}, {"socket_send2", socket_send2},
{"socket_change", socket_change},
{"socket_is_readable", socket_is_readable},
{"socket_is_writable", socket_is_writable},
{NULL, NULL} {NULL, NULL}
}; };
void OnAmxxAttach() void OnAmxxAttach()
{ {
#ifdef _WIN32
WSADATA WSAData;
int errorcode = WSAStartup(MAKEWORD(2, 2), &WSAData);
if(errorcode != 0)
{
MF_Log("[%s]: WSAStartup failed with error code %d. Natives will not be available.", MODULE_LOGTAG, errorcode);
return;
}
g_winsock_initialized = true;
#endif
MF_AddNatives(sockets_natives); MF_AddNatives(sockets_natives);
// And, if win32, we have to specially start up the winsock environment
#ifdef _WIN32
short wVersionRequested;
WSADATA wsaData;
wVersionRequested = MAKEWORD (1, 1);
if (WSAStartup (wVersionRequested, &wsaData) != 0) {
MF_Log("Sockets Module: Error while starting up winsock environment.!");
}
#endif
return;
} }
void OnAmxxDetach() void OnAmxxDetach()
{ {
#ifdef _WIN32 #ifdef _WIN32
WSACleanup(); if(g_winsock_initialized)
#endif WSACleanup();
delete [] g_buffer; #endif
return;
delete[] g_send2_buffer;
} }

5
modules/sqlite/basic_sql.cpp
View File

@ -59,13 +59,13 @@ static cell AMX_NATIVE_CALL SQL_MakeDbTuple(AMX *amx, cell *params)
char path[255]; char path[255];
FILE *fp; FILE *fp;
MF_BuildPathnameR(path, sizeof(path)-1, "%s", db); MF_BuildPathnameR(path, sizeof(path), "%s", db);
if ((fp=fopen(path, "rb"))) if ((fp=fopen(path, "rb")))
{ {
fclose(fp); fclose(fp);
sql->db = strdup(path); sql->db = strdup(path);
} else { } else {
MF_BuildPathnameR(path, sizeof(path)-1, "%s/sqlite3/%s.sq3", MF_BuildPathnameR(path, sizeof(path), "%s/sqlite3/%s.sq3",
MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"), MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"),
db); db);
sql->db = strdup(path); sql->db = strdup(path);
@ -630,4 +630,3 @@ AMX_NATIVE_INFO g_BaseSqlNatives[] =
{NULL, NULL}, {NULL, NULL},
}; };

3
modules/sqlite/module.cpp
View File

@ -69,7 +69,7 @@ void OnAmxxAttach()
MF_OverrideNatives(g_OldCompatNatives, MODULE_NAME); MF_OverrideNatives(g_OldCompatNatives, MODULE_NAME);
char path[255]; char path[255];
MF_BuildPathnameR(path, sizeof(path)-1, "%s/sqlite3", MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data")); MF_BuildPathnameR(path, sizeof(path), "%s/sqlite3", MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"));
if (!DirExists(path)) if (!DirExists(path))
{ {
mkdir(path mkdir(path
@ -96,4 +96,3 @@ void OnPluginsUnloaded()
extern "C" void __cxa_pure_virtual(void) extern "C" void __cxa_pure_virtual(void)
{ {
} }

4
modules/sqlite/oldcompat_sql.cpp
View File

@ -73,14 +73,14 @@ static cell AMX_NATIVE_CALL dbi_connect(AMX *amx, cell *params)
int err; int err;
char error[512]; char error[512];
/** if there is an older database, read there instead of the new path */ /** if there is an older database, read there instead of the new path */
MF_BuildPathnameR(path, sizeof(path)-1, "%s", info.database); MF_BuildPathnameR(path, sizeof(path), "%s", info.database);
FILE *fp = fopen(path, "rb"); FILE *fp = fopen(path, "rb");
if (fp) if (fp)
{ {
fclose(fp); fclose(fp);
info.database = path; info.database = path;
} else { } else {
MF_BuildPathnameR(path, sizeof(path)-1, "%s/sqlite3/%s.sq3", MF_BuildPathnameR(path, sizeof(path), "%s/sqlite3/%s.sq3",
MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"), MF_GetLocalInfo("amxx_datadir", "addons/amxmodx/data"),
info.database); info.database);
info.database = path; info.database = path;

6
plugins/include/datapack.inc
View File

@ -120,10 +120,10 @@ native ResetPack(DataPack:pack, bool:clear = false);
* *
* @param pack Datapack handle * @param pack Datapack handle
* *
* @return Position in the datapack * @return Position in the datapack, only usable with calls to SetPackPosition
* @error If an invalid handle is provided, an error will be thrown. * @error If an invalid handle is provided, an error will be thrown.
*/ */
native GetPackPosition(DataPack:pack); native DataPackPos:GetPackPosition(DataPack:pack);
/** /**
* Sets the datapack read/write position. * Sets the datapack read/write position.
@ -139,7 +139,7 @@ native GetPackPosition(DataPack:pack);
* @error If an invalid handle is provided, or the new position is * @error If an invalid handle is provided, or the new position is
* out of datapack bounds, an error will be thrown. * out of datapack bounds, an error will be thrown.
*/ */
native SetPackPosition(DataPack:pack, position); native SetPackPosition(DataPack:pack, DataPackPos:position);
/** /**
* Returns if the datapack has reached its end and no more data can be read. * Returns if the datapack has reached its end and no more data can be read.

3
plugins/include/newmenus.inc
View File

@ -27,6 +27,9 @@
#define MPROP_EXIT 6 /* Exit functionality (param1 = number, see MEXIT constants) */ #define MPROP_EXIT 6 /* Exit functionality (param1 = number, see MEXIT constants) */
#define MPROP_NOCOLORS 8 /* Sets whether colors are not auto (param1 = number, 0=default) */ #define MPROP_NOCOLORS 8 /* Sets whether colors are not auto (param1 = number, 0=default) */
#define MPROP_NUMBER_COLOR 10 /* Color indicator to use for numbers (param1 = string, "\r"=default) */ #define MPROP_NUMBER_COLOR 10 /* Color indicator to use for numbers (param1 = string, "\r"=default) */
#define MPROP_PAGE_CALLBACK 11 /* Function to be called on Back and Next (param1 = string) */
/* public function(id, status); where status is either MENU_BACK or MENU_MORE */
/* Pass NULL_STRING to disable the callback */
#define MEXIT_NORMAL 0 /* DEPRECATED, do not use (has no effect) */ #define MEXIT_NORMAL 0 /* DEPRECATED, do not use (has no effect) */
#define MENUPAD_NONE 0 /* DEPRECATED, do not use (has no effect) */ #define MENUPAD_NONE 0 /* DEPRECATED, do not use (has no effect) */

171
plugins/include/sockets.inc
View File

@ -3,9 +3,6 @@
// AMX Mod X, based on AMX Mod by Aleksander Naszko ("OLO"). // AMX Mod X, based on AMX Mod by Aleksander Naszko ("OLO").
// Copyright (C) The AMX Mod X Development Team. // Copyright (C) The AMX Mod X Development Team.
// //
// Codebase from Ivan, -g-s-ivan@web.de (AMX 0.9.3)
// Modification by Olaf Reusch, kenterfie@hlsw.de (AMXX 0.16, AMX 0.96)
//
// This software is licensed under the GNU General Public License, version 3 or higher. // This software is licensed under the GNU General Public License, version 3 or higher.
// Additional exceptions apply. For full license details, see LICENSE.txt or visit: // Additional exceptions apply. For full license details, see LICENSE.txt or visit:
// https://alliedmods.net/amxmodx-license // https://alliedmods.net/amxmodx-license
@ -24,43 +21,159 @@
#pragma loadlib sockets #pragma loadlib sockets
#endif #endif
// Use SOCKET_TCP for TCP Socket connections /**
* Socket connection type (TCP/UDP)
*/
#define SOCKET_TCP 1 #define SOCKET_TCP 1
// Use SOCKET_UDP for UDP Socket connections
#define SOCKET_UDP 2 #define SOCKET_UDP 2
/* Opens a new connection to hostname:port via protocol (either SOCKET_TCP or SOCKET_UDP), /**
* returns a socket (positive) or negative or zero on error. * Socket flags
* States of error: */
* 0 - no error #define SOCK_NON_BLOCKING (1 << 0) /* Set the socket a nonblocking */
* 1 - error while creating socket #define SOCK_LIBC_ERRORS (1 << 1) /* Enable libc error reporting */
* 2 - couldn't resolve hostname
* 3 - couldn't connect to given hostname:port /**
* Error reporting
*/
#define SOCK_ERROR_OK 0 /* No error */
#define SOCK_ERROR_CREATE_SOCKET 1 /* Couldn't create a socket */
#define SOCK_ERROR_SERVER_UNKNOWN 2 /* Server unknown */
#define SOCK_ERROR_WHILE_CONNECTING 3 /* Error while connecting */
/**
* Connects to the given node and service via TCP/UDP.
*
* @note There's 2 types of error reporting on this function that you can use.
* @note Default error codes:
* 0 - No error
* 1 - Error while creating socket
* 2 - Couldn't resolve hostname
* 3 - Couldn't connect
* @note New, more expressive libc error codes:
* https://www.gnu.org/software/libc/manual/html_node/Error-Codes.html
* https://github.com/torvalds/linux/blob/master/include/uapi/asm-generic/errno.h
* https://msdn.microsoft.com/en-us/library/ms740668.aspx
*
* @note The currently available bit flags are:
* - SOCK_NON_BLOCKING : if set, the socket will be on nonblocking mode
* - SOCK_LIBC_ERRORS : if set, the new libc errors will be seen on _error
*
* @note If no flags are set, the behaviour of the function will not be modified.
*
* @note Multiple flags may be set at the same time using the | operator.
* For example, SOCK_NON_BLOCKING|SOCK_LIBC_ERRORS will create a nonblocking socket with libc error codes.
*
* @note If you're creating a new nonblocking socket, _hostname should be numeric to avoid calling the
* name resolution server and potentially blocking the call.
*
* @note If the socket is a nonblocking one, the returned socket descriptor may be still connecting and
* further checks should be done with socket_is_writable() before trying to send data.
*
* @param _hostname Node to connect to
* @param _port Service to connect to
* @param _protocol Connect via SOCKET_TCP or SOCKET_UDP
* @param _error Set an error code here if anything goes wrong
* @param _flags Optional bit flags that change the behaviour of the function
*
* @return A socket descriptor (a positive integer) on success
* -1 on failure
*/ */
native socket_open(const _hostname[], _port, _protocol = SOCKET_TCP, &_error, _flags = 0);
native socket_open(const _hostname[], _port, _protocol = SOCKET_TCP, &_error); /**
* Closes a socket.
/* Closes a Socket */ *
* @param _socket Socket descriptor
*
* @return 1 on success
* 0 on failure
*/
native socket_close(_socket); native socket_close(_socket);
/* Recieves Data to string with the given length */ /**
* Receives data.
*
* @note The amount of bytes than you end up receiving can be less than the one you expected.
*
* @param _socket Socket descriptor
* @param _data Array to save the data
* @param _length Length of the array
*
* @return Amount of bytes received
* 0 if the peer closed the connection
* -1 on failure
*/
native socket_recv(_socket, _data[], _length); native socket_recv(_socket, _data[], _length);
/* Sends data to the Socket */ /**
* Sends data.
*
* @note The amount of bytes that end up being sent may be lower than the total length of the array,
* check the return value and send the rest if needed.
*
* @param _socket Socket descriptor
* @param _data Array with the data to send
* @param _length Length of the array
*
* @return Amount of bytes sent
* -1 on failure
*/
native socket_send(_socket, const _data[], _length); native socket_send(_socket, const _data[], _length);
/* Same as socket_send but Data can contain null bytes */ /**
* Sends data that can contain null bytes.
*
* @note The amount of bytes that end up being sent may be lower than the total length of the array,
* check the return value and send the rest if needed.
*
* @note strlen(_data) will return the wrong length if the array contains null bytes.
*
* @param _socket Socket descriptor
* @param _data Array with the data to send
* @param _length Length of the array
*
* @return Amount of bytes sent
* -1 on failure
*/
native socket_send2(_socket, const _data[], _length); native socket_send2(_socket, const _data[], _length);
/* This function will return true if the state (buffer content) have changed within the last recieve or /**
* the timeout, where timeout is a value in µSeconds, (1 sec =1000000 µsec). * Backwards compatible function.
* Use to check if new data is in your socket. */ *
* @deprecated Renamed to socket_is_readable()
*/
#pragma deprecated Use socket_is_readable() instead
native socket_change(_socket, _timeout = 100000);
native socket_change(_socket, _timeout=100000); /**
* Checks if a socket is marked as readable.
*
* @note You can use this function to make sure there's something on the socket and avoid a blocking call.
* @note Set _timeout to 0 avoid blocking the call.
* @note A socket will become readable if there's any data or an EOF.
*
* @param _socket Socket descriptor
* @param _timeout Amount of time to block the call waiting for the socket to be marked as readable or
* for the timeout to expire, in µSeconds (1 sec = 1000000 µsec)
*
* @return 1 if the socket is marked as readable
* 0 otherwise
*/
native socket_is_readable(_socket, _timeout = 100000);
/**
* Checks if a socket is marked as writable.
*
* @note Use this function to check if a nonblocking socket is ready to be used.
* @note Set _timeout to 0 avoid blocking the call.
* @note An UDP socket is always writable.
*
* @param _socket Socket descriptor
* @param _timeout Amount of time to block the call waiting for the socket to be marked as writable or
* for the timeout to expire, in µSeconds (1 sec = 1000000 µsec)
*
* @return 1 if the socket is marked as writable
* 0 otherwise
*/
native socket_is_writable(_socket, _timeout = 100000);

42
plugins/include/xs.inc
View File

@ -369,6 +369,24 @@ stock xs_vec_sub(const Float:in1[], const Float:in2[], Float:out[])
out[2] = in1[2] - in2[2]; out[2] = in1[2] - in2[2];
} }
// Adds the second vector scaled by a scalar to the first
// tested
stock xs_vec_add_scaled(const Float:in1[], const Float:in2[], Float:scalar, Float:out[])
{
out[0] = in1[0] + in2[0] * scalar;
out[1] = in1[1] + in2[1] * scalar;
out[2] = in1[2] + in2[2] * scalar;
}
// Subtracts the second vector scaled by a scalar to the first
// tested
stock xs_vec_sub_scaled(const Float:in1[], const Float:in2[], Float:scalar, Float:out[])
{
out[0] = in1[0] - in2[0] * scalar;
out[1] = in1[1] - in2[1] * scalar;
out[2] = in1[2] - in2[2] * scalar;
}
// Are vectors equal? // Are vectors equal?
// untested, but should work // untested, but should work
stock bool:xs_vec_equal(const Float:vec1[], const Float:vec2[]) stock bool:xs_vec_equal(const Float:vec1[], const Float:vec2[])
@ -409,6 +427,30 @@ stock Float:xs_vec_len(const Float:vec[])
return xs_sqrt(vec[0]*vec[0] + vec[1]*vec[1] + vec[2]*vec[2]); return xs_sqrt(vec[0]*vec[0] + vec[1]*vec[1] + vec[2]*vec[2]);
} }
// Compute 2D vector length
// tested
stock Float:xs_vec_len_2d(const Float:vec[])
{
return xs_sqrt(vec[0]*vec[0] + vec[1]*vec[1]);
}
// Compute distance between two vectors
// tested
stock Float:xs_vec_distance(const Float:vec1[], const Float:vec2[])
{
return xs_sqrt((vec1[0]-vec2[0]) * (vec1[0]-vec2[0]) +
(vec1[1]-vec2[1]) * (vec1[1]-vec2[1]) +
(vec1[2]-vec2[2]) * (vec1[2]-vec2[2]));
}
// Compute distance between two 2D vectors
// tested
stock Float:xs_vec_distance_2d(const Float:vec1[], const Float:vec2[])
{
return xs_sqrt((vec1[0]-vec2[0]) * (vec1[0]-vec2[0]) +
(vec1[1]-vec2[1]) * (vec1[1]-vec2[1]));
}
// Normalize vec // Normalize vec
// tested // tested
stock xs_vec_normalize(const Float:vec[], Float:out[]) stock xs_vec_normalize(const Float:vec[], Float:out[])

11
plugins/plmenu.sma
View File

@ -37,7 +37,7 @@ new g_clcmdNum;
new g_coloredMenus; new g_coloredMenus;
new bool:g_cstrike = false; new bool:g_cstrike = false;
new bool:g_fakemeta = false, m_iMenu, m_bTeamChanged, Menu_ChooseAppearance; new bool:g_fakemeta = false;
new Array:g_bantimes; new Array:g_bantimes;
new Array:g_slapsettings; new Array:g_slapsettings;
@ -127,9 +127,6 @@ public plugin_init()
if (LibraryExists("fakemeta", LibType_Library)) if (LibraryExists("fakemeta", LibType_Library))
{ {
g_fakemeta = true; g_fakemeta = true;
m_iMenu = 205;
m_bTeamChanged = 501;
Menu_ChooseAppearance = 3;
} }
new modname[9]; new modname[9];
@ -831,7 +828,7 @@ public actionTeamMenu(id, key)
{ {
if (g_fakemeta) if (g_fakemeta)
{ {
if (get_pdata_int(player, m_iMenu) == Menu_ChooseAppearance) if (get_ent_data(player, "CBasePlayer", "m_iMenu") == CS_Menu_ChooseAppearance)
{ {
// works for both vgui and old style menus, and send menuselect could close other menus (and since get_user_menu fails to return VGUI and old style classes menus...) // works for both vgui and old style menus, and send menuselect could close other menus (and since get_user_menu fails to return VGUI and old style classes menus...)
engclient_cmd(player, "joinclass", "6"); engclient_cmd(player, "joinclass", "6");
@ -863,7 +860,7 @@ public actionTeamMenu(id, key)
} }
if (g_fakemeta) if (g_fakemeta)
{ {
set_pdata_bool(player, m_bTeamChanged, true); set_ent_data(player, "CBasePlayer", "m_bTeamChanged", true);
} }
new limit_setting; new limit_setting;
if (mp_limitteams) if (mp_limitteams)
@ -906,7 +903,7 @@ public actionTeamMenu(id, key)
} }
if (g_fakemeta) if (g_fakemeta)
{ {
set_pdata_bool(player, m_bTeamChanged, true); set_ent_data(player, "CBasePlayer", "m_bTeamChanged", true);
} }
g_transferingAdmin = 0; g_transferingAdmin = 0;

76
plugins/testsuite/menu_page_callback_test.sma Normal file
View File

@ -0,0 +1,76 @@
#include <amxmodx>
new g_menuHandle;
new bool:g_isCallbackSet = false;
public plugin_init()
{
register_plugin("Menu Pagination Callback Test", "1.0.0", "KliPPy");
register_clcmd("say testmenu", "@Command_TestMenu");
register_clcmd("say togglecallback", "@Command_ToggleCallback");
g_menuHandle = menu_create("Test menu", "@MenuHandler_TestMenu");
menu_additem(g_menuHandle, "Item 1");
menu_additem(g_menuHandle, "Item 2");
menu_additem(g_menuHandle, "Item 3");
menu_additem(g_menuHandle, "Item 4");
menu_additem(g_menuHandle, "Item 5");
menu_additem(g_menuHandle, "Item 6");
menu_additem(g_menuHandle, "Item 7");
menu_additem(g_menuHandle, "item 8");
menu_setprop(g_menuHandle, MPROP_PERPAGE, 2);
}
public plugin_end()
{
menu_destroy(g_menuHandle);
}
@MenuHandler_TestMenu(id, menu, item)
{
if(item == MENU_EXIT)
return PLUGIN_HANDLED;
new dump1, dump2[1], dump3;
new itemName[32];
menu_item_getinfo(menu, item, dump1, dump2, 0, itemName, charsmax(itemName), dump3);
client_print(id, print_chat, "Selected: %s", itemName);
return PLUGIN_HANDLED;
}
@PageCallback_TestMenu(id, status)
{
if(status == MENU_BACK)
client_print(id, print_chat, "Selected: MENU_BACK");
else
client_print(id, print_chat, "Selected: MENU_MORE");
}
@Command_TestMenu(id)
{
menu_display(id, g_menuHandle);
return PLUGIN_HANDLED;
}
@Command_ToggleCallback(id)
{
if(g_isCallbackSet)
{
menu_setprop(g_menuHandle, MPROP_PAGE_CALLBACK, NULL_STRING);
g_isCallbackSet = false;
client_print(id, print_chat, "Callback set to OFF");
}
else
{
menu_setprop(g_menuHandle, MPROP_PAGE_CALLBACK, "@PageCallback_TestMenu");
g_isCallbackSet = true;
client_print(id, print_chat, "Callback set to ON");
}
}

2
public/amtl

@ -1 +1 @@
Subproject commit b0550fd444f7e0cc4f071ee587fc85ff82671502 Subproject commit c91e8560fb00984465a1a916172123b80a76dd04

1
public/auto-string.h
View File

@ -23,6 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <amtl/am-string.h> #include <amtl/am-string.h>
#include <amtl/am-algorithm.h>
namespace ke { namespace ke {

6
public/engine_strucs.h
View File

@ -66,6 +66,12 @@
// This is the packet payload without any header bytes (which are attached for actual sending) // This is the packet payload without any header bytes (which are attached for actual sending)
#define NET_MAX_PAYLOAD 3990 #define NET_MAX_PAYLOAD 3990
typedef enum sv_delta_s
{
sv_packet_nodelta,
sv_packet_delta,
} sv_delta_t;
typedef enum netsrc_s typedef enum netsrc_s
{ {
NS_CLIENT, NS_CLIENT,

44
public/interface_helpers.h Normal file
View File

@ -0,0 +1,44 @@
// vim: set ts=4 sw=4 tw=99 noet:
//
// AMX Mod X, based on AMX Mod by Aleksander Naszko ("OLO").
// Copyright (C) The AMX Mod X Development Team.
//
// This software is licensed under the GNU General Public License, version 3 or higher.
// Additional exceptions apply. For full license details, see LICENSE.txt or visit:
// https://alliedmods.net/amxmodx-license
#pragma once
#include "platform_helpers.h"
#include <amtl/os/am-path.h>
#include <amtl/os/am-shared-library.h>
template <typename T>
bool GET_IFACE(const char* library, T*& var, const char* version, bool add_ext = true)
{
char file[PLATFORM_MAX_PATH];
if (add_ext)
ke::path::Format(file, sizeof(file), "%s.%s", library, PLATFORM_LIB_EXT);
else
ke::SafeStrcpy(file, sizeof(file), library);
auto lib = ke::SharedLib::Open(file);
if (!lib || !lib->valid())
{
return false;
}
auto factory = reinterpret_cast<CreateInterfaceFn>(lib->lookup(CREATEINTERFACE_PROCNAME));
if (factory)
{
var = reinterpret_cast<T*>(factory(version, nullptr));
return true;
}
var = nullptr;
return false;
}

70
public/platform_helpers.h Normal file
View File

@ -0,0 +1,70 @@
// vim: set ts=4 sw=4 tw=99 noet:
//
// AMX Mod X, based on AMX Mod by Aleksander Naszko ("OLO").
// Copyright (C) The AMX Mod X Development Team.
//
// This software is licensed under the GNU General Public License, version 3 or higher.
// Additional exceptions apply. For full license details, see LICENSE.txt or visit:
// https://alliedmods.net/amxmodx-license
#pragma once
#include <interface.h> // Interface (HLSDK)
#define PLATFORM_WINDOWNS_NAME "windows"
#define PLATFORM_LINUX_NAME "linux"
#define PLATFORM_MAC_NAME "mac"
#if defined(WIN32)
# ifndef PLATFORM_WINDOWS
# define PLATFORM_WINDOWS 1
# endif
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# include <windows.h>
# include <direct.h>
# include <io.h>
# define PLATFORM_LIB_EXT "dll"
# define PLATFORM_NAME PLATFORM_WINDOWNS_NAME
# define PLATFORM_SEP_CHAR '\\'
# define PLATFORM_SEP_ALTCHAR '/'
# define PLATFORM_EXTERN_C extern "C" __declspec(dllexport)
#elif defined(__linux__) || defined(__APPLE__)
# if defined(__linux__)
# define PLATFORM_LINUX 1
# define PLATFORM_LIB_EXT "so"
# define PLATFORM_NAME PLATFORM_LINUX_NAME
# define PLATFORM_COMPAT_ALT PLATFORM_MAC_NAME
# elif defined(__APPLE__)
# define PLATFORM_APPLE 1
# define PLATFORM_LIB_EXT "dylib"
# define PLATFORM_NAME PLATFORM_MAC_NAME
# define PLATFORM_COMPAT_ALT PLATFORM_LINUX_NAME
# endif
# ifndef PLATFORM_POSIX
# define PLATFORM_POSIX 1
# endif
# include <stdio.h>
# include <sys/types.h>
# include <sys/stat.h>
# include <errno.h>
# include <unistd.h>
# include <dirent.h>
# include <dlfcn.h>
# if defined(PLATFORM_APPLE)
# include <sys/syslimits.h>
# endif
# define PLATFORM_SEP_CHAR '/'
# define PLATFORM_SEP_ALTCHAR '\\'
# define PLATFORM_EXTERN_C extern "C" __attribute__((visibility("default")))
# define WINAPI
#endif
#define PLATFORM_MAX_PATH 260
#if defined PLATFORM_WINDOWS
typedef HANDLE DirHandle;
#elif defined PLATFORM_POSIX
typedef DIR* DirHandle;
#endif

121
public/resdk/common/hookchains.h Normal file
View File

@ -0,0 +1,121 @@
/*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* 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, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
* link the code of this program with the Half-Life Game Engine ("HL
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
* L.L.C ("Valve"). You must obey the GNU General Public License in all
* respects for all of the code used other than the HL Engine and MODs
* from Valve. If you modify this file, you may extend this exception
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#pragma once
template<typename t_ret, typename ...t_args>
class IHookChain {
protected:
virtual ~IHookChain() {}
public:
virtual t_ret callNext(t_args... args) = 0;
virtual t_ret callOriginal(t_args... args) = 0;
};
template<typename t_ret, typename t_class, typename ...t_args>
class IHookChainClass {
protected:
virtual ~IHookChainClass() {}
public:
virtual t_ret callNext(t_class *, t_args... args) = 0;
virtual t_ret callOriginal(t_class *, t_args... args) = 0;
};
template<typename ...t_args>
class IVoidHookChain
{
protected:
virtual ~IVoidHookChain() {}
public:
virtual void callNext(t_args... args) = 0;
virtual void callOriginal(t_args... args) = 0;
};
template<typename t_class, typename ...t_args>
class IVoidHookChainClass
{
protected:
virtual ~IVoidHookChainClass() {}
public:
virtual void callNext(t_class *, t_args... args) = 0;
virtual void callOriginal(t_class *, t_args... args) = 0;
};
// Specifies priorities for hooks call order in the chain.
// For equal priorities first registered hook will be called first.
enum HookChainPriority
{
HC_PRIORITY_UNINTERRUPTABLE = 255, // Hook will be called before other hooks.
HC_PRIORITY_HIGH = 192, // Hook will be called before hooks with default priority.
HC_PRIORITY_DEFAULT = 128, // Default hook call priority.
HC_PRIORITY_MEDIUM = 64, // Hook will be called after hooks with default priority.
HC_PRIORITY_LOW = 0, // Hook will be called after all other hooks.
};
// Hook chain registry(for hooks [un]registration)
template<typename t_ret, typename ...t_args>
class IHookChainRegistry {
public:
typedef t_ret(*hookfunc_t)(IHookChain<t_ret, t_args...>*, t_args...);
virtual void registerHook(hookfunc_t hook, int priority = HC_PRIORITY_DEFAULT) = 0;
virtual void unregisterHook(hookfunc_t hook) = 0;
};
// Hook chain registry(for hooks [un]registration)
template<typename t_ret, typename t_class, typename ...t_args>
class IHookChainRegistryClass {
public:
typedef t_ret(*hookfunc_t)(IHookChainClass<t_ret, t_class, t_args...>*, t_class *, t_args...);
virtual void registerHook(hookfunc_t hook, int priority = HC_PRIORITY_DEFAULT) = 0;
virtual void unregisterHook(hookfunc_t hook) = 0;
};
// Hook chain registry(for hooks [un]registration)
template<typename ...t_args>
class IVoidHookChainRegistry {
public:
typedef void(*hookfunc_t)(IVoidHookChain<t_args...>*, t_args...);
virtual void registerHook(hookfunc_t hook, int priority = HC_PRIORITY_DEFAULT) = 0;
virtual void unregisterHook(hookfunc_t hook) = 0;
};
// Hook chain registry(for hooks [un]registration)
template<typename t_class, typename ...t_args>
class IVoidHookChainRegistryClass {
public:
typedef void(*hookfunc_t)(IVoidHookChainClass<t_class, t_args...>*, t_class *, t_args...);
virtual void registerHook(hookfunc_t hook, int priority = HC_PRIORITY_DEFAULT) = 0;
virtual void unregisterHook(hookfunc_t hook) = 0;
};

482
public/resdk/cstrike/regamedll_api.h Normal file
View File

@ -0,0 +1,482 @@
/*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* 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, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
* link the code of this program with the Half-Life Game Engine ("HL
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
* L.L.C ("Valve"). You must obey the GNU General Public License in all
* respects for all of the code used other than the HL Engine and MODs
* from Valve. If you modify this file, you may extend this exception
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#pragma once
#include <engine_strucs.h>
#include "regamedll_interfaces.h"
#include "regamedll_const.h"
#include "../common/hookchains.h"
#define REGAMEDLL_API_VERSION_MAJOR 5
#define REGAMEDLL_API_VERSION_MINOR 1
// CBasePlayer::Spawn hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_Spawn;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_Spawn;
// CBasePlayer::Precache hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_Precache;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_Precache;
// CBasePlayer::ObjectCaps hook
typedef IHookChainClass<int, class CBasePlayer> IReGameHook_CBasePlayer_ObjectCaps;
typedef IHookChainRegistryClass<int, class CBasePlayer> IReGameHookRegistry_CBasePlayer_ObjectCaps;
// CBasePlayer::Classify hook
typedef IHookChainClass<int, class CBasePlayer> IReGameHook_CBasePlayer_Classify;
typedef IHookChainRegistryClass<int, class CBasePlayer> IReGameHookRegistry_CBasePlayer_Classify;
// CBasePlayer::TraceAttack hook
typedef IVoidHookChainClass<class CBasePlayer, struct entvars_s *, float, Vector &, TraceResult *, int> IReGameHook_CBasePlayer_TraceAttack;
typedef IVoidHookChainRegistryClass<class CBasePlayer, struct entvars_s *, float, Vector &, TraceResult *, int> IReGameHookRegistry_CBasePlayer_TraceAttack;
// CBasePlayer::TakeDamage hook
typedef IHookChainClass<BOOL, class CBasePlayer, struct entvars_s *, struct entvars_s *, float&, int> IReGameHook_CBasePlayer_TakeDamage;
typedef IHookChainRegistryClass<BOOL, class CBasePlayer, struct entvars_s *, struct entvars_s *, float&, int> IReGameHookRegistry_CBasePlayer_TakeDamage;
// CBasePlayer::TakeHealth hook
typedef IHookChainClass<BOOL, class CBasePlayer, float, int> IReGameHook_CBasePlayer_TakeHealth;
typedef IHookChainRegistryClass<BOOL, class CBasePlayer, float, int> IReGameHookRegistry_CBasePlayer_TakeHealth;
// CBasePlayer::Killed hook
typedef IVoidHookChainClass<class CBasePlayer, struct entvars_s *, int> IReGameHook_CBasePlayer_Killed;
typedef IVoidHookChainRegistryClass<class CBasePlayer, struct entvars_s *, int> IReGameHookRegistry_CBasePlayer_Killed;
// CBasePlayer::AddPoints hook
typedef IVoidHookChainClass<class CBasePlayer, int, BOOL> IReGameHook_CBasePlayer_AddPoints;
typedef IVoidHookChainRegistryClass<class CBasePlayer, int, BOOL> IReGameHookRegistry_CBasePlayer_AddPoints;
// CBasePlayer::AddPointsToTeam hook
typedef IVoidHookChainClass<class CBasePlayer, int, BOOL> IReGameHook_CBasePlayer_AddPointsToTeam;
typedef IVoidHookChainRegistryClass<class CBasePlayer, int, BOOL> IReGameHookRegistry_CBasePlayer_AddPointsToTeam;
// CBasePlayer::AddPlayerItem hook
typedef IHookChainClass<BOOL, class CBasePlayer, class CBasePlayerItem *> IReGameHook_CBasePlayer_AddPlayerItem;
typedef IHookChainRegistryClass<BOOL, class CBasePlayer, class CBasePlayerItem *> IReGameHookRegistry_CBasePlayer_AddPlayerItem;
// CBasePlayer::RemovePlayerItem hook
typedef IHookChainClass<BOOL, class CBasePlayer, class CBasePlayerItem *> IReGameHook_CBasePlayer_RemovePlayerItem;
typedef IHookChainRegistryClass<BOOL, class CBasePlayer, class CBasePlayerItem *> IReGameHookRegistry_CBasePlayer_RemovePlayerItem;
// CBasePlayer::GiveAmmo hook
typedef IHookChainClass<int, class CBasePlayer, int , char *, int> IReGameHook_CBasePlayer_GiveAmmo;
typedef IHookChainRegistryClass<int, class CBasePlayer, int , char *, int> IReGameHookRegistry_CBasePlayer_GiveAmmo;
// CBasePlayer::ResetMaxSpeed hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_ResetMaxSpeed;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_ResetMaxSpeed;
// CBasePlayer::Jump hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_Jump;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_Jump;
// CBasePlayer::Duck hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_Duck;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_Duck;
// CBasePlayer::PreThink hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_PreThink;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_PreThink;
// CBasePlayer::PostThink hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_PostThink;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_PostThink;
// CBasePlayer::UpdateClientData hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_UpdateClientData;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_UpdateClientData;
// CBasePlayer::ImpulseCommands hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_ImpulseCommands;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_ImpulseCommands;
// CBasePlayer::RoundRespawn hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_RoundRespawn;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_RoundRespawn;
// CBasePlayer::Blind hook
typedef IVoidHookChainClass<class CBasePlayer, float, float, float, int> IReGameHook_CBasePlayer_Blind;
typedef IVoidHookChainRegistryClass<class CBasePlayer, float, float, float, int> IReGameHookRegistry_CBasePlayer_Blind;
// CBasePlayer::Observer_IsValidTarget hook
typedef IHookChainClass<class CBasePlayer *, class CBasePlayer, int, bool> IReGameHook_CBasePlayer_Observer_IsValidTarget;
typedef IHookChainRegistryClass<class CBasePlayer *, class CBasePlayer, int, bool> IReGameHookRegistry_CBasePlayer_Observer_IsValidTarget;
// CBasePlayer::SetAnimation hook
typedef IVoidHookChainClass<class CBasePlayer, PLAYER_ANIM> IReGameHook_CBasePlayer_SetAnimation;
typedef IVoidHookChainRegistryClass<class CBasePlayer, PLAYER_ANIM> IReGameHookRegistry_CBasePlayer_SetAnimation;
// CBasePlayer::GiveDefaultItems hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_GiveDefaultItems;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_GiveDefaultItems;
// CBasePlayer::GiveNamedItem hook
typedef IHookChainClass<class CBaseEntity *, class CBasePlayer, const char *> IReGameHook_CBasePlayer_GiveNamedItem;
typedef IHookChainRegistryClass<class CBaseEntity *, class CBasePlayer, const char *> IReGameHookRegistry_CBasePlayer_GiveNamedItem;
// CBasePlayer::AddAccount hook
typedef IVoidHookChainClass<class CBasePlayer, int, RewardType, bool> IReGameHook_CBasePlayer_AddAccount;
typedef IVoidHookChainRegistryClass<class CBasePlayer, int, RewardType, bool> IReGameHookRegistry_CBasePlayer_AddAccount;
// CBasePlayer::GiveShield hook
typedef IVoidHookChainClass<class CBasePlayer, bool> IReGameHook_CBasePlayer_GiveShield;
typedef IVoidHookChainRegistryClass<class CBasePlayer, bool> IReGameHookRegistry_CBasePlayer_GiveShield;
// CBasePlayer:SetClientUserInfoModel hook
typedef IVoidHookChainClass<class CBasePlayer, char *, char *> IReGameHook_CBasePlayer_SetClientUserInfoModel;
typedef IVoidHookChainRegistryClass<class CBasePlayer, char *, char *> IReGameHookRegistry_CBasePlayer_SetClientUserInfoModel;
// CBasePlayer:SetClientUserInfoName hook
typedef IHookChainClass<bool, class CBasePlayer, char *, char *> IReGameHook_CBasePlayer_SetClientUserInfoName;
typedef IHookChainRegistryClass<bool, class CBasePlayer, char *, char *> IReGameHookRegistry_CBasePlayer_SetClientUserInfoName;
// CBasePlayer::HasRestrictItem hook
typedef IHookChainClass<bool, class CBasePlayer, ItemID, ItemRestType> IReGameHook_CBasePlayer_HasRestrictItem;
typedef IHookChainRegistryClass<bool, class CBasePlayer, ItemID, ItemRestType> IReGameHookRegistry_CBasePlayer_HasRestrictItem;
// CBasePlayer::DropPlayerItem hook
typedef IVoidHookChainClass<class CBasePlayer, const char *> IReGameHook_CBasePlayer_DropPlayerItem;
typedef IVoidHookChainRegistryClass<class CBasePlayer, const char *> IReGameHookRegistry_CBasePlayer_DropPlayerItem;
// CBasePlayer::DropShield hook
typedef IVoidHookChainClass<class CBasePlayer, bool> IReGameHook_CBasePlayer_DropShield;
typedef IVoidHookChainRegistryClass<class CBasePlayer, bool> IReGameHookRegistry_CBasePlayer_DropShield;
// CBasePlayer::OnSpawnEquip hook
typedef IVoidHookChainClass<class CBasePlayer, bool, bool> IReGameHook_CBasePlayer_OnSpawnEquip;
typedef IVoidHookChainRegistryClass<class CBasePlayer, bool, bool> IReGameHookRegistry_CBasePlayer_OnSpawnEquip;
// CBasePlayer::Radio hook
typedef IVoidHookChainClass<class CBasePlayer, const char *, const char *, short, bool> IReGameHook_CBasePlayer_Radio;
typedef IVoidHookChainRegistryClass<class CBasePlayer, const char *, const char *, short, bool> IReGameHookRegistry_CBasePlayer_Radio;
// CBasePlayer::Disappear hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_Disappear;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_Disappear;
// CBasePlayer::MakeVIP hook
typedef IVoidHookChainClass<class CBasePlayer> IReGameHook_CBasePlayer_MakeVIP;
typedef IVoidHookChainRegistryClass<class CBasePlayer> IReGameHookRegistry_CBasePlayer_MakeVIP;
// CBasePlayer::MakeBomber hook
typedef IHookChainClass<bool, class CBasePlayer> IReGameHook_CBasePlayer_MakeBomber;
typedef IHookChainRegistryClass<bool, class CBasePlayer> IReGameHookRegistry_CBasePlayer_MakeBomber;
// CBasePlayer::StartObserver hook
typedef IVoidHookChainClass<class CBasePlayer, Vector &, Vector &> IReGameHook_CBasePlayer_StartObserver;
typedef IVoidHookChainRegistryClass<class CBasePlayer, Vector &, Vector &> IReGameHookRegistry_CBasePlayer_StartObserver;
// CBasePlayer::GetIntoGame hook
typedef IHookChainClass<bool, class CBasePlayer> IReGameHook_CBasePlayer_GetIntoGame;
typedef IHookChainRegistryClass<bool, class CBasePlayer> IReGameHookRegistry_CBasePlayer_GetIntoGame;
// CBaseAnimating::ResetSequenceInfo hook
typedef IVoidHookChainClass<class CBaseAnimating> IReGameHook_CBaseAnimating_ResetSequenceInfo;
typedef IVoidHookChainRegistryClass<class CBaseAnimating> IReGameHookRegistry_CBaseAnimating_ResetSequenceInfo;
// GetForceCamera hook
typedef IHookChain<int, class CBasePlayer *> IReGameHook_GetForceCamera;
typedef IHookChainRegistry<int, class CBasePlayer *> IReGameHookRegistry_GetForceCamera;
// PlayerBlind hook
typedef IVoidHookChain<class CBasePlayer *, struct entvars_s *, struct entvars_s *, float, float, int, Vector &> IReGameHook_PlayerBlind;
typedef IVoidHookChainRegistry<class CBasePlayer *, struct entvars_s *, struct entvars_s *, float, float, int, Vector &> IReGameHookRegistry_PlayerBlind;
// RadiusFlash_TraceLine hook
typedef IVoidHookChain<class CBasePlayer *, struct entvars_s *, struct entvars_s *, Vector &, Vector &, TraceResult *> IReGameHook_RadiusFlash_TraceLine;
typedef IVoidHookChainRegistry<class CBasePlayer *, struct entvars_s *, struct entvars_s *, Vector &, Vector &, TraceResult *> IReGameHookRegistry_RadiusFlash_TraceLine;
// RoundEnd hook
typedef IHookChain<bool, int, ScenarioEventEndRound, float> IReGameHook_RoundEnd;
typedef IHookChainRegistry<bool, int, ScenarioEventEndRound, float> IReGameHookRegistry_RoundEnd;
// InstallGameRules hook
typedef IHookChain<class CGameRules *> IReGameHook_InstallGameRules;
typedef IHookChainRegistry<class CGameRules *> IReGameHookRegistry_InstallGameRules;
// PM_Init hook
typedef IVoidHookChain<struct playermove_s *> IReGameHook_PM_Init;
typedef IVoidHookChainRegistry<struct playermove_s *> IReGameHookRegistry_PM_Init;
// PM_Move hook
typedef IVoidHookChain<struct playermove_s *, int> IReGameHook_PM_Move;
typedef IVoidHookChainRegistry<struct playermove_s *, int> IReGameHookRegistry_PM_Move;
// PM_AirMove hook
typedef IVoidHookChain<int> IReGameHook_PM_AirMove;
typedef IVoidHookChainRegistry<int> IReGameHookRegistry_PM_AirMove;
// HandleMenu_ChooseAppearance hook
typedef IVoidHookChain<class CBasePlayer *, int> IReGameHook_HandleMenu_ChooseAppearance;
typedef IVoidHookChainRegistry<class CBasePlayer *, int> IReGameHookRegistry_HandleMenu_ChooseAppearance;
// HandleMenu_ChooseTeam hook
typedef IHookChain<BOOL, class CBasePlayer *, int> IReGameHook_HandleMenu_ChooseTeam;
typedef IHookChainRegistry<BOOL, class CBasePlayer *, int> IReGameHookRegistry_HandleMenu_ChooseTeam;
// ShowMenu hook
typedef IVoidHookChain<class CBasePlayer *, int, int, BOOL, char *> IReGameHook_ShowMenu;
typedef IVoidHookChainRegistry<class CBasePlayer *, int, int, BOOL, char *> IReGameHookRegistry_ShowMenu;
// ShowVGUIMenu hook
typedef IVoidHookChain<class CBasePlayer *, int, int, char *> IReGameHook_ShowVGUIMenu;
typedef IVoidHookChainRegistry<class CBasePlayer *, int, int, char *> IReGameHookRegistry_ShowVGUIMenu;
// BuyGunAmmo hook
typedef IHookChain<bool, class CBasePlayer *, class CBasePlayerItem *, bool> IReGameHook_BuyGunAmmo;
typedef IHookChainRegistry<bool, class CBasePlayer *, class CBasePlayerItem *, bool> IReGameHookRegistry_BuyGunAmmo;
// BuyWeaponByWeaponID hook
typedef IHookChain<class CBaseEntity *, class CBasePlayer *, WeaponIdType> IReGameHook_BuyWeaponByWeaponID;
typedef IHookChainRegistry<class CBaseEntity *, class CBasePlayer *, WeaponIdType> IReGameHookRegistry_BuyWeaponByWeaponID;
// InternalCommand hook
typedef IVoidHookChain<edict_t *, const char *, const char *> IReGameHook_InternalCommand;
typedef IVoidHookChainRegistry<edict_t *, const char *, const char *> IReGameHookRegistry_InternalCommand;
// CHalfLifeMultiplay::FShouldSwitchWeapon hook
typedef IHookChain<BOOL, class CBasePlayer *, class CBasePlayerItem *> IReGameHook_CSGameRules_FShouldSwitchWeapon;
typedef IHookChainRegistry<BOOL, class CBasePlayer *, class CBasePlayerItem *> IReGameHookRegistry_CSGameRules_FShouldSwitchWeapon;
// CHalfLifeMultiplay::GetNextBestWeapon hook
typedef IHookChain<BOOL, class CBasePlayer *, class CBasePlayerItem *> IReGameHook_CSGameRules_GetNextBestWeapon;
typedef IHookChainRegistry<BOOL, class CBasePlayer *, class CBasePlayerItem *> IReGameHookRegistry_CSGameRules_GetNextBestWeapon;
// CHalfLifeMultiplay::FlPlayerFallDamage hook
typedef IHookChain<float, class CBasePlayer *> IReGameHook_CSGameRules_FlPlayerFallDamage;
typedef IHookChainRegistry<float, class CBasePlayer *> IReGameHookRegistry_CSGameRules_FlPlayerFallDamage;
// CHalfLifeMultiplay::FPlayerCanTakeDamage hook
typedef IHookChain<BOOL, class CBasePlayer *, CBaseEntity *> IReGameHook_CSGameRules_FPlayerCanTakeDamage;
typedef IHookChainRegistry<BOOL, class CBasePlayer *, CBaseEntity *> IReGameHookRegistry_CSGameRules_FPlayerCanTakeDamage;
// CHalfLifeMultiplay::PlayerSpawn hook
typedef IVoidHookChain<class CBasePlayer *> IReGameHook_CSGameRules_PlayerSpawn;
typedef IVoidHookChainRegistry<class CBasePlayer *> IReGameHookRegistry_CSGameRules_PlayerSpawn;
// CHalfLifeMultiplay::FPlayerCanRespawn hook
typedef IHookChain<BOOL, class CBasePlayer *> IReGameHook_CSGameRules_FPlayerCanRespawn;
typedef IHookChainRegistry<BOOL, class CBasePlayer *> IReGameHookRegistry_CSGameRules_FPlayerCanRespawn;
// CHalfLifeMultiplay::GetPlayerSpawnSpot hook
typedef IHookChain<struct edict_s *, class CBasePlayer *> IReGameHook_CSGameRules_GetPlayerSpawnSpot;
typedef IHookChainRegistry<struct edict_s *, class CBasePlayer *> IReGameHookRegistry_CSGameRules_GetPlayerSpawnSpot;
// CHalfLifeMultiplay::ClientUserInfoChanged hook
typedef IVoidHookChain<class CBasePlayer *, char *> IReGameHook_CSGameRules_ClientUserInfoChanged;
typedef IVoidHookChainRegistry<class CBasePlayer *, char *> IReGameHookRegistry_CSGameRules_ClientUserInfoChanged;
// CHalfLifeMultiplay::PlayerKilled hook
typedef IVoidHookChain<class CBasePlayer *, struct entvars_s *, struct entvars_s *> IReGameHook_CSGameRules_PlayerKilled;
typedef IVoidHookChainRegistry<class CBasePlayer *, struct entvars_s *, struct entvars_s *> IReGameHookRegistry_CSGameRules_PlayerKilled;
// CHalfLifeMultiplay::DeathNotice hook
typedef IVoidHookChain<class CBasePlayer *, struct entvars_s *, struct entvars_s *> IReGameHook_CSGameRules_DeathNotice;
typedef IVoidHookChainRegistry<class CBasePlayer *, struct entvars_s *, struct entvars_s *> IReGameHookRegistry_CSGameRules_DeathNotice;
// CHalfLifeMultiplay::CanHavePlayerItem hook
typedef IHookChain<BOOL, class CBasePlayer *, class CBasePlayerItem *> IReGameHook_CSGameRules_CanHavePlayerItem;
typedef IHookChainRegistry<BOOL, class CBasePlayer *, class CBasePlayerItem *> IReGameHookRegistry_CSGameRules_CanHavePlayerItem;
// CHalfLifeMultiplay::DeadPlayerWeapons hook
typedef IHookChain<int, class CBasePlayer *> IReGameHook_CSGameRules_DeadPlayerWeapons;
typedef IHookChainRegistry<int, class CBasePlayer *> IReGameHookRegistry_CSGameRules_DeadPlayerWeapons;
// CHalfLifeMultiplay::ServerDeactivate hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_ServerDeactivate;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_ServerDeactivate;
// CHalfLifeMultiplay::CheckMapConditions hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_CheckMapConditions;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_CheckMapConditions;
// CHalfLifeMultiplay::CleanUpMap hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_CleanUpMap;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_CleanUpMap;
// CHalfLifeMultiplay::RestartRound hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_RestartRound;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_RestartRound;
// CHalfLifeMultiplay::CheckWinConditions hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_CheckWinConditions;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_CheckWinConditions;
// CHalfLifeMultiplay::RemoveGuns hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_RemoveGuns;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_RemoveGuns;
// CHalfLifeMultiplay::GiveC4 hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_GiveC4;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_GiveC4;
// CHalfLifeMultiplay::ChangeLevel hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_ChangeLevel;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_ChangeLevel;
// CHalfLifeMultiplay::GoToIntermission hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_GoToIntermission;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_GoToIntermission;
// CHalfLifeMultiplay::BalanceTeams hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_BalanceTeams;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_BalanceTeams;
// CHalfLifeMultiplay::OnRoundFreezeEnd hook
typedef IVoidHookChain<> IReGameHook_CSGameRules_OnRoundFreezeEnd;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_CSGameRules_OnRoundFreezeEnd;
// PM_UpdateStepSound hook
typedef IVoidHookChain<> IReGameHook_PM_UpdateStepSound;
typedef IVoidHookChainRegistry<> IReGameHookRegistry_PM_UpdateStepSound;
class IReGameHookchains {
public:
virtual ~IReGameHookchains() {}
// CBasePlayer virtual
virtual IReGameHookRegistry_CBasePlayer_Spawn* CBasePlayer_Spawn() = 0;
virtual IReGameHookRegistry_CBasePlayer_Precache* CBasePlayer_Precache() = 0;
virtual IReGameHookRegistry_CBasePlayer_ObjectCaps* CBasePlayer_ObjectCaps() = 0;
virtual IReGameHookRegistry_CBasePlayer_Classify* CBasePlayer_Classify() = 0;
virtual IReGameHookRegistry_CBasePlayer_TraceAttack* CBasePlayer_TraceAttack() = 0;
virtual IReGameHookRegistry_CBasePlayer_TakeDamage* CBasePlayer_TakeDamage() = 0;
virtual IReGameHookRegistry_CBasePlayer_TakeHealth* CBasePlayer_TakeHealth() = 0;
virtual IReGameHookRegistry_CBasePlayer_Killed* CBasePlayer_Killed() = 0;
virtual IReGameHookRegistry_CBasePlayer_AddPoints* CBasePlayer_AddPoints() = 0;
virtual IReGameHookRegistry_CBasePlayer_AddPointsToTeam* CBasePlayer_AddPointsToTeam() = 0;
virtual IReGameHookRegistry_CBasePlayer_AddPlayerItem* CBasePlayer_AddPlayerItem() = 0;
virtual IReGameHookRegistry_CBasePlayer_RemovePlayerItem* CBasePlayer_RemovePlayerItem() = 0;
virtual IReGameHookRegistry_CBasePlayer_GiveAmmo* CBasePlayer_GiveAmmo() = 0;
virtual IReGameHookRegistry_CBasePlayer_ResetMaxSpeed* CBasePlayer_ResetMaxSpeed() = 0;
virtual IReGameHookRegistry_CBasePlayer_Jump* CBasePlayer_Jump() = 0;
virtual IReGameHookRegistry_CBasePlayer_Duck* CBasePlayer_Duck() = 0;
virtual IReGameHookRegistry_CBasePlayer_PreThink* CBasePlayer_PreThink() = 0;
virtual IReGameHookRegistry_CBasePlayer_PostThink* CBasePlayer_PostThink() = 0;
virtual IReGameHookRegistry_CBasePlayer_UpdateClientData* CBasePlayer_UpdateClientData() = 0;
virtual IReGameHookRegistry_CBasePlayer_ImpulseCommands* CBasePlayer_ImpulseCommands() = 0;
virtual IReGameHookRegistry_CBasePlayer_RoundRespawn* CBasePlayer_RoundRespawn() = 0;
virtual IReGameHookRegistry_CBasePlayer_Blind* CBasePlayer_Blind() = 0;
virtual IReGameHookRegistry_CBasePlayer_Observer_IsValidTarget* CBasePlayer_Observer_IsValidTarget() = 0;
virtual IReGameHookRegistry_CBasePlayer_SetAnimation* CBasePlayer_SetAnimation() = 0;
virtual IReGameHookRegistry_CBasePlayer_GiveDefaultItems* CBasePlayer_GiveDefaultItems() = 0;
virtual IReGameHookRegistry_CBasePlayer_GiveNamedItem* CBasePlayer_GiveNamedItem() = 0;
virtual IReGameHookRegistry_CBasePlayer_AddAccount* CBasePlayer_AddAccount() = 0;
virtual IReGameHookRegistry_CBasePlayer_GiveShield* CBasePlayer_GiveShield() = 0;
virtual IReGameHookRegistry_CBasePlayer_SetClientUserInfoModel* CBasePlayer_SetClientUserInfoModel() = 0;
virtual IReGameHookRegistry_CBasePlayer_SetClientUserInfoName* CBasePlayer_SetClientUserInfoName() = 0;
virtual IReGameHookRegistry_CBasePlayer_HasRestrictItem* CBasePlayer_HasRestrictItem() = 0;
virtual IReGameHookRegistry_CBasePlayer_DropPlayerItem* CBasePlayer_DropPlayerItem() = 0;
virtual IReGameHookRegistry_CBasePlayer_DropShield* CBasePlayer_DropShield() = 0;
virtual IReGameHookRegistry_CBasePlayer_OnSpawnEquip* CBasePlayer_OnSpawnEquip() = 0;
virtual IReGameHookRegistry_CBasePlayer_Radio* CBasePlayer_Radio() = 0;
virtual IReGameHookRegistry_CBasePlayer_Disappear* CBasePlayer_Disappear() = 0;
virtual IReGameHookRegistry_CBasePlayer_MakeVIP* CBasePlayer_MakeVIP() = 0;
virtual IReGameHookRegistry_CBasePlayer_MakeBomber* CBasePlayer_MakeBomber() = 0;
virtual IReGameHookRegistry_CBasePlayer_StartObserver* CBasePlayer_StartObserver() = 0;
virtual IReGameHookRegistry_CBasePlayer_GetIntoGame* CBasePlayer_GetIntoGame() = 0;
virtual IReGameHookRegistry_CBaseAnimating_ResetSequenceInfo* CBaseAnimating_ResetSequenceInfo() = 0;
virtual IReGameHookRegistry_GetForceCamera* GetForceCamera() = 0;
virtual IReGameHookRegistry_PlayerBlind* PlayerBlind() = 0;
virtual IReGameHookRegistry_RadiusFlash_TraceLine* RadiusFlash_TraceLine() = 0;
virtual IReGameHookRegistry_RoundEnd* RoundEnd() = 0;
virtual IReGameHookRegistry_InstallGameRules* InstallGameRules() = 0;
virtual IReGameHookRegistry_PM_Init* PM_Init() = 0;
virtual IReGameHookRegistry_PM_Move* PM_Move() = 0;
virtual IReGameHookRegistry_PM_AirMove* PM_AirMove() = 0;
virtual IReGameHookRegistry_HandleMenu_ChooseAppearance* HandleMenu_ChooseAppearance() = 0;
virtual IReGameHookRegistry_HandleMenu_ChooseTeam* HandleMenu_ChooseTeam() = 0;
virtual IReGameHookRegistry_ShowMenu* ShowMenu() = 0;
virtual IReGameHookRegistry_ShowVGUIMenu* ShowVGUIMenu() = 0;
virtual IReGameHookRegistry_BuyGunAmmo* BuyGunAmmo() = 0;
virtual IReGameHookRegistry_BuyWeaponByWeaponID* BuyWeaponByWeaponID() = 0;
virtual IReGameHookRegistry_InternalCommand* InternalCommand() = 0;
virtual IReGameHookRegistry_CSGameRules_FShouldSwitchWeapon* CSGameRules_FShouldSwitchWeapon() = 0;
virtual IReGameHookRegistry_CSGameRules_GetNextBestWeapon* CSGameRules_GetNextBestWeapon() = 0;
virtual IReGameHookRegistry_CSGameRules_FlPlayerFallDamage* CSGameRules_FlPlayerFallDamage() = 0;
virtual IReGameHookRegistry_CSGameRules_FPlayerCanTakeDamage* CSGameRules_FPlayerCanTakeDamage() = 0;
virtual IReGameHookRegistry_CSGameRules_PlayerSpawn* CSGameRules_PlayerSpawn() = 0;
virtual IReGameHookRegistry_CSGameRules_FPlayerCanRespawn* CSGameRules_FPlayerCanRespawn() = 0;
virtual IReGameHookRegistry_CSGameRules_GetPlayerSpawnSpot* CSGameRules_GetPlayerSpawnSpot() = 0;
virtual IReGameHookRegistry_CSGameRules_ClientUserInfoChanged* CSGameRules_ClientUserInfoChanged() = 0;
virtual IReGameHookRegistry_CSGameRules_PlayerKilled* CSGameRules_PlayerKilled() = 0;
virtual IReGameHookRegistry_CSGameRules_DeathNotice* CSGameRules_DeathNotice() = 0;
virtual IReGameHookRegistry_CSGameRules_CanHavePlayerItem* CSGameRules_CanHavePlayerItem() = 0;
virtual IReGameHookRegistry_CSGameRules_DeadPlayerWeapons* CSGameRules_DeadPlayerWeapons() = 0;
virtual IReGameHookRegistry_CSGameRules_ServerDeactivate* CSGameRules_ServerDeactivate() = 0;
virtual IReGameHookRegistry_CSGameRules_CheckMapConditions* CSGameRules_CheckMapConditions() = 0;
virtual IReGameHookRegistry_CSGameRules_CleanUpMap* CSGameRules_CleanUpMap() = 0;
virtual IReGameHookRegistry_CSGameRules_RestartRound* CSGameRules_RestartRound() = 0;
virtual IReGameHookRegistry_CSGameRules_CheckWinConditions* CSGameRules_CheckWinConditions() = 0;
virtual IReGameHookRegistry_CSGameRules_RemoveGuns* CSGameRules_RemoveGuns() = 0;
virtual IReGameHookRegistry_CSGameRules_GiveC4* CSGameRules_GiveC4() = 0;
virtual IReGameHookRegistry_CSGameRules_ChangeLevel* CSGameRules_ChangeLevel() = 0;
virtual IReGameHookRegistry_CSGameRules_GoToIntermission* CSGameRules_GoToIntermission() = 0;
virtual IReGameHookRegistry_CSGameRules_BalanceTeams* CSGameRules_BalanceTeams() = 0;
virtual IReGameHookRegistry_CSGameRules_OnRoundFreezeEnd* CSGameRules_OnRoundFreezeEnd() = 0;
virtual IReGameHookRegistry_PM_UpdateStepSound* PM_UpdateStepSound() = 0;
};
struct ReGameFuncs_t {
struct edict_s *(*CREATE_NAMED_ENTITY2)(string_t iClass);
void (*ChangeString)(char *&dest, const char *source);
void (*RadiusDamage)(Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, float flRadius, int iClassIgnore, int bitsDamageType);
void (*ClearMultiDamage)();
void (*ApplyMultiDamage)(entvars_t *pevInflictor, entvars_t *pevAttacker);
void (*AddMultiDamage)(entvars_t *pevInflictor, CBaseEntity *pEntity, float flDamage, int bitsDamageType);
class CBaseEntity *(*UTIL_FindEntityByString)(class CBaseEntity *pStartEntity, const char *szKeyword, const char *szValue);
void (*AddEntityHashValue)(entvars_t *pev, const char *value, hash_types_e fieldType);
void (*RemoveEntityHashValue)(entvars_t *pev, const char *value, hash_types_e fieldType);
int (*Cmd_Argc)();
const char *(*Cmd_Argv)(int i);
};
class IReGameApi {
public:
virtual ~IReGameApi() {}
virtual int GetMajorVersion() = 0;
virtual int GetMinorVersion() = 0;
virtual const ReGameFuncs_t* GetFuncs() = 0;
virtual IReGameHookchains* GetHookchains() = 0;
virtual class CGameRules* GetGameRules() = 0;
virtual struct WeaponInfoStruct* GetWeaponInfo(int weaponID) = 0;
virtual struct WeaponInfoStruct* GetWeaponInfo(const char* weaponName) = 0;
virtual struct playermove_s* GetPlayerMove() = 0;
virtual struct WeaponSlotInfo* GetWeaponSlot(WeaponIdType weaponID) = 0;
virtual struct WeaponSlotInfo* GetWeaponSlot(const char* weaponName) = 0;
virtual struct ItemInfo* GetItemInfo(WeaponIdType weaponID) = 0;
virtual struct AmmoInfo* GetAmmoInfo(AmmoType ammoID) = 0;
};
#define VRE_GAMEDLL_API_VERSION "VRE_GAMEDLL_API_VERSION001"

740
public/resdk/cstrike/regamedll_const.h Normal file
View File

@ -0,0 +1,740 @@
/*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* 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, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
* link the code of this program with the Half-Life Game Engine ("HL
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
* L.L.C ("Valve"). You must obey the GNU General Public License in all
* respects for all of the code used other than the HL Engine and MODs
* from Valve. If you modify this file, you may extend this exception
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#pragma once
// custom enum
enum ArmorType
{
ARMOR_NONE, // no armor
ARMOR_KEVLAR, // body vest only
ARMOR_VESTHELM, // vest and helmet
};
enum ArmouryItemPack
{
ARMOURY_MP5NAVY,
ARMOURY_TMP,
ARMOURY_P90,
ARMOURY_MAC10,
ARMOURY_AK47,
ARMOURY_SG552,
ARMOURY_M4A1,
ARMOURY_AUG,
ARMOURY_SCOUT,
ARMOURY_G3SG1,
ARMOURY_AWP,
ARMOURY_M3,
ARMOURY_XM1014,
ARMOURY_M249,
ARMOURY_FLASHBANG,
ARMOURY_HEGRENADE,
ARMOURY_KEVLAR,
ARMOURY_ASSAULT,
ARMOURY_SMOKEGRENADE,
ARMOURY_GLOCK18,
ARMOURY_USP,
ARMOURY_ELITE,
ARMOURY_FIVESEVEN,
ARMOURY_P228,
ARMOURY_DEAGLE,
ARMOURY_FAMAS,
ARMOURY_SG550,
ARMOURY_GALIL,
ARMOURY_UMP45,
ARMOURY_SHIELD
};
struct AmmoInfo
{
const char *pszName;
int iId;
};
struct MULTIDAMAGE
{
CBaseEntity *pEntity;
float amount;
int type;
};
enum ItemRestType
{
ITEM_TYPE_BUYING, // when a player buying items
ITEM_TYPE_TOUCHED, // when the player touches with a weaponbox or armoury_entity
ITEM_TYPE_EQUIPPED // when a entity game_player_equip gives item to player or default item's on player spawn
};
// constant items
#define ITEM_ID_ANTIDOTE 2
#define ITEM_ID_SECURITY 3
enum ItemID
{
ITEM_NONE = -1,
ITEM_SHIELDGUN,
ITEM_P228,
ITEM_GLOCK,
ITEM_SCOUT,
ITEM_HEGRENADE,
ITEM_XM1014,
ITEM_C4,
ITEM_MAC10,
ITEM_AUG,
ITEM_SMOKEGRENADE,
ITEM_ELITE,
ITEM_FIVESEVEN,
ITEM_UMP45,
ITEM_SG550,
ITEM_GALIL,
ITEM_FAMAS,
ITEM_USP,
ITEM_GLOCK18,
ITEM_AWP,
ITEM_MP5N,
ITEM_M249,
ITEM_M3,
ITEM_M4A1,
ITEM_TMP,
ITEM_G3SG1,
ITEM_FLASHBANG,
ITEM_DEAGLE,
ITEM_SG552,
ITEM_AK47,
ITEM_KNIFE,
ITEM_P90,
ITEM_NVG,
ITEM_DEFUSEKIT,
ITEM_KEVLAR,
ITEM_ASSAULT,
ITEM_LONGJUMP,
ITEM_SODACAN,
ITEM_HEALTHKIT,
ITEM_ANTIDOTE,
ITEM_BATTERY
};
// custom enum
enum RewardType
{
RT_NONE,
RT_ROUND_BONUS,
RT_PLAYER_RESET,
RT_PLAYER_JOIN,
RT_PLAYER_SPEC_JOIN,
RT_PLAYER_BOUGHT_SOMETHING,
RT_HOSTAGE_TOOK,
RT_HOSTAGE_RESCUED,
RT_HOSTAGE_DAMAGED,
RT_HOSTAGE_KILLED,
RT_TEAMMATES_KILLED,
RT_ENEMY_KILLED,
RT_INTO_GAME,
RT_VIP_KILLED,
RT_VIP_RESCUED_MYSELF
};
enum PLAYER_ANIM
{
PLAYER_IDLE,
PLAYER_WALK,
PLAYER_JUMP,
PLAYER_SUPERJUMP,
PLAYER_DIE,
PLAYER_ATTACK1,
PLAYER_ATTACK2,
PLAYER_FLINCH,
PLAYER_LARGE_FLINCH,
PLAYER_RELOAD,
PLAYER_HOLDBOMB
};
enum TeamName
{
UNASSIGNED,
TERRORIST,
CT,
SPECTATOR,
};
enum ModelName
{
MODEL_UNASSIGNED,
MODEL_URBAN,
MODEL_TERROR,
MODEL_LEET,
MODEL_ARCTIC,
MODEL_GSG9,
MODEL_GIGN,
MODEL_SAS,
MODEL_GUERILLA,
MODEL_VIP,
MODEL_MILITIA,
MODEL_SPETSNAZ,
MODEL_AUTO
};
enum JoinState
{
JOINED,
SHOWLTEXT,
READINGLTEXT,
SHOWTEAMSELECT,
PICKINGTEAM,
GETINTOGAME
};
enum TrackCommands
{
CMD_SAY = 0,
CMD_SAYTEAM,
CMD_FULLUPDATE,
CMD_VOTE,
CMD_VOTEMAP,
CMD_LISTMAPS,
CMD_LISTPLAYERS,
CMD_NIGHTVISION,
COMMANDS_TO_TRACK,
};
struct RebuyStruct
{
int m_primaryWeapon;
int m_primaryAmmo;
int m_secondaryWeapon;
int m_secondaryAmmo;
int m_heGrenade;
int m_flashbang;
int m_smokeGrenade;
int m_defuser;
int m_nightVision;
ArmorType m_armor;
};
enum ThrowDirection
{
THROW_NONE,
THROW_FORWARD,
THROW_BACKWARD,
THROW_HITVEL,
THROW_BOMB,
THROW_GRENADE,
THROW_HITVEL_MINUS_AIRVEL
};
enum sbar_data
{
SBAR_ID_TARGETTYPE = 1,
SBAR_ID_TARGETNAME,
SBAR_ID_TARGETHEALTH,
SBAR_END
};
enum
{
WINSTATUS_CTS = 1,
WINSTATUS_TERRORISTS,
WINSTATUS_DRAW,
};
// custom enum
// used for EndRoundMessage() logged messages
enum ScenarioEventEndRound
{
ROUND_NONE,
ROUND_TARGET_BOMB,
ROUND_VIP_ESCAPED,
ROUND_VIP_ASSASSINATED,
ROUND_TERRORISTS_ESCAPED,
ROUND_CTS_PREVENT_ESCAPE,
ROUND_ESCAPING_TERRORISTS_NEUTRALIZED,
ROUND_BOMB_DEFUSED,
ROUND_CTS_WIN,
ROUND_TERRORISTS_WIN,
ROUND_END_DRAW,
ROUND_ALL_HOSTAGES_RESCUED,
ROUND_TARGET_SAVED,
ROUND_HOSTAGE_NOT_RESCUED,
ROUND_TERRORISTS_NOT_ESCAPED,
ROUND_VIP_NOT_ESCAPED,
ROUND_GAME_COMMENCE,
ROUND_GAME_RESTART,
ROUND_GAME_OVER
};
enum RewardRules
{
RR_CTS_WIN,
RR_TERRORISTS_WIN,
RR_TARGET_BOMB,
RR_VIP_ESCAPED,
RR_VIP_ASSASSINATED,
RR_TERRORISTS_ESCAPED,
RR_CTS_PREVENT_ESCAPE,
RR_ESCAPING_TERRORISTS_NEUTRALIZED,
RR_BOMB_DEFUSED,
RR_BOMB_PLANTED,
RR_BOMB_EXPLODED,
RR_ALL_HOSTAGES_RESCUED,
RR_TARGET_BOMB_SAVED,
RR_HOSTAGE_NOT_RESCUED,
RR_VIP_NOT_ESCAPED,
RR_LOSER_BONUS_DEFAULT,
RR_LOSER_BONUS_MIN,
RR_LOSER_BONUS_MAX,
RR_LOSER_BONUS_ADD,
RR_RESCUED_HOSTAGE,
RR_TOOK_HOSTAGE_ACC,
RR_TOOK_HOSTAGE,
RR_END
};
// custom enum
enum RewardAccount
{
REWARD_TARGET_BOMB = 3500,
REWARD_VIP_ESCAPED = 3500,
REWARD_VIP_ASSASSINATED = 3250,
REWARD_TERRORISTS_ESCAPED = 3150,
REWARD_CTS_PREVENT_ESCAPE = 3500,
REWARD_ESCAPING_TERRORISTS_NEUTRALIZED = 3250,
REWARD_BOMB_DEFUSED = 3250,
REWARD_BOMB_PLANTED = 800,
REWARD_BOMB_EXPLODED = 3250,
REWARD_CTS_WIN = 3000,
REWARD_TERRORISTS_WIN = 3000,
REWARD_ALL_HOSTAGES_RESCUED = 2500,
// the end round was by the expiration time
REWARD_TARGET_BOMB_SAVED = 3250,
REWARD_HOSTAGE_NOT_RESCUED = 3250,
REWARD_VIP_NOT_ESCAPED = 3250,
// loser bonus
REWARD_LOSER_BONUS_DEFAULT = 1400,
REWARD_LOSER_BONUS_MIN = 1500,
REWARD_LOSER_BONUS_MAX = 3000,
REWARD_LOSER_BONUS_ADD = 500,
REWARD_RESCUED_HOSTAGE = 750,
REWARD_KILLED_ENEMY = 300,
REWARD_KILLED_VIP = 2500,
REWARD_VIP_HAVE_SELF_RESCUED = 2500,
REWARD_TAKEN_HOSTAGE = 1000,
REWARD_TOOK_HOSTAGE_ACC = 100,
REWARD_TOOK_HOSTAGE = 150,
};
// custom enum
enum PaybackForBadThing
{
PAYBACK_FOR_KILLED_TEAMMATES = -3300,
};
// custom enum
enum InfoMapBuyParam
{
BUYING_EVERYONE = 0,
BUYING_ONLY_CTS,
BUYING_ONLY_TERRORISTS,
BUYING_NO_ONE,
};
// weapon respawning return codes
enum
{
GR_NONE = 0,
GR_WEAPON_RESPAWN_YES,
GR_WEAPON_RESPAWN_NO,
GR_AMMO_RESPAWN_YES,
GR_AMMO_RESPAWN_NO,
GR_ITEM_RESPAWN_YES,
GR_ITEM_RESPAWN_NO,
GR_PLR_DROP_GUN_ALL,
GR_PLR_DROP_GUN_ACTIVE,
GR_PLR_DROP_GUN_NO,
GR_PLR_DROP_AMMO_ALL,
GR_PLR_DROP_AMMO_ACTIVE,
GR_PLR_DROP_AMMO_NO,
};
// custom enum
enum
{
SCENARIO_BLOCK_TIME_EXPRIRED = (1 << 0), // flag "a"
SCENARIO_BLOCK_NEED_PLAYERS = (1 << 1), // flag "b"
SCENARIO_BLOCK_VIP_ESCAPE = (1 << 2), // flag "c"
SCENARIO_BLOCK_PRISON_ESCAPE = (1 << 3), // flag "d"
SCENARIO_BLOCK_BOMB = (1 << 4), // flag "e"
SCENARIO_BLOCK_TEAM_EXTERMINATION = (1 << 5), // flag "f"
SCENARIO_BLOCK_HOSTAGE_RESCUE = (1 << 6), // flag "g"
};
// Player relationship return codes
enum
{
GR_NOTTEAMMATE = 0,
GR_TEAMMATE,
GR_ENEMY,
GR_ALLY,
GR_NEUTRAL,
};
enum WeaponIdType
{
WEAPON_NONE,
WEAPON_P228,
WEAPON_GLOCK,
WEAPON_SCOUT,
WEAPON_HEGRENADE,
WEAPON_XM1014,
WEAPON_C4,
WEAPON_MAC10,
WEAPON_AUG,
WEAPON_SMOKEGRENADE,
WEAPON_ELITE,
WEAPON_FIVESEVEN,
WEAPON_UMP45,
WEAPON_SG550,
WEAPON_GALIL,
WEAPON_FAMAS,
WEAPON_USP,
WEAPON_GLOCK18,
WEAPON_AWP,
WEAPON_MP5N,
WEAPON_M249,
WEAPON_M3,
WEAPON_M4A1,
WEAPON_TMP,
WEAPON_G3SG1,
WEAPON_FLASHBANG,
WEAPON_DEAGLE,
WEAPON_SG552,
WEAPON_AK47,
WEAPON_KNIFE,
WEAPON_P90,
WEAPON_SHIELDGUN = 99
};
enum AutoBuyClassType
{
AUTOBUYCLASS_NONE = 0,
AUTOBUYCLASS_PRIMARY = (1 << 0),
AUTOBUYCLASS_SECONDARY = (1 << 1),
AUTOBUYCLASS_AMMO = (1 << 2),
AUTOBUYCLASS_ARMOR = (1 << 3),
AUTOBUYCLASS_DEFUSER = (1 << 4),
AUTOBUYCLASS_PISTOL = (1 << 5),
AUTOBUYCLASS_SMG = (1 << 6),
AUTOBUYCLASS_RIFLE = (1 << 7),
AUTOBUYCLASS_SNIPERRIFLE = (1 << 8),
AUTOBUYCLASS_SHOTGUN = (1 << 9),
AUTOBUYCLASS_MACHINEGUN = (1 << 10),
AUTOBUYCLASS_GRENADE = (1 << 11),
AUTOBUYCLASS_NIGHTVISION = (1 << 12),
AUTOBUYCLASS_SHIELD = (1 << 13),
};
enum AmmoCostType
{
AMMO_338MAG_PRICE = 125,
AMMO_357SIG_PRICE = 50,
AMMO_45ACP_PRICE = 25,
AMMO_50AE_PRICE = 40,
AMMO_556MM_PRICE = 60,
AMMO_57MM_PRICE = 50,
AMMO_762MM_PRICE = 80,
AMMO_9MM_PRICE = 20,
AMMO_BUCKSHOT_PRICE = 65,
};
// custom enum
// the default amount of ammo that comes with each gun when it spawns
enum ClipGiveDefault
{
P228_DEFAULT_GIVE = 13,
GLOCK18_DEFAULT_GIVE = 20,
SCOUT_DEFAULT_GIVE = 10,
HEGRENADE_DEFAULT_GIVE = 1,
XM1014_DEFAULT_GIVE = 7,
C4_DEFAULT_GIVE = 1,
MAC10_DEFAULT_GIVE = 30,
AUG_DEFAULT_GIVE = 30,
SMOKEGRENADE_DEFAULT_GIVE = 1,
ELITE_DEFAULT_GIVE = 30,
FIVESEVEN_DEFAULT_GIVE = 20,
UMP45_DEFAULT_GIVE = 25,
SG550_DEFAULT_GIVE = 30,
GALIL_DEFAULT_GIVE = 35,
FAMAS_DEFAULT_GIVE = 25,
USP_DEFAULT_GIVE = 12,
AWP_DEFAULT_GIVE = 10,
MP5NAVY_DEFAULT_GIVE = 30,
M249_DEFAULT_GIVE = 100,
M3_DEFAULT_GIVE = 8,
M4A1_DEFAULT_GIVE = 30,
TMP_DEFAULT_GIVE = 30,
G3SG1_DEFAULT_GIVE = 20,
FLASHBANG_DEFAULT_GIVE = 1,
DEAGLE_DEFAULT_GIVE = 7,
SG552_DEFAULT_GIVE = 30,
AK47_DEFAULT_GIVE = 30,
/*KNIFE_DEFAULT_GIVE = 1,*/
P90_DEFAULT_GIVE = 50,
};
enum ClipSizeType
{
P228_MAX_CLIP = 13,
GLOCK18_MAX_CLIP = 20,
SCOUT_MAX_CLIP = 10,
XM1014_MAX_CLIP = 7,
MAC10_MAX_CLIP = 30,
AUG_MAX_CLIP = 30,
ELITE_MAX_CLIP = 30,
FIVESEVEN_MAX_CLIP = 20,
UMP45_MAX_CLIP = 25,
SG550_MAX_CLIP = 30,
GALIL_MAX_CLIP = 35,
FAMAS_MAX_CLIP = 25,
USP_MAX_CLIP = 12,
AWP_MAX_CLIP = 10,
MP5N_MAX_CLIP = 30,
M249_MAX_CLIP = 100,
M3_MAX_CLIP = 8,
M4A1_MAX_CLIP = 30,
TMP_MAX_CLIP = 30,
G3SG1_MAX_CLIP = 20,
DEAGLE_MAX_CLIP = 7,
SG552_MAX_CLIP = 30,
AK47_MAX_CLIP = 30,
P90_MAX_CLIP = 50,
};
enum WeightWeapon
{
P228_WEIGHT = 5,
GLOCK18_WEIGHT = 5,
SCOUT_WEIGHT = 30,
HEGRENADE_WEIGHT = 2,
XM1014_WEIGHT = 20,
C4_WEIGHT = 3,
MAC10_WEIGHT = 25,
AUG_WEIGHT = 25,
SMOKEGRENADE_WEIGHT = 1,
ELITE_WEIGHT = 5,
FIVESEVEN_WEIGHT = 5,
UMP45_WEIGHT = 25,
SG550_WEIGHT = 20,
GALIL_WEIGHT = 25,
FAMAS_WEIGHT = 75,
USP_WEIGHT = 5,
AWP_WEIGHT = 30,
MP5NAVY_WEIGHT = 25,
M249_WEIGHT = 25,
M3_WEIGHT = 20,
M4A1_WEIGHT = 25,
TMP_WEIGHT = 25,
G3SG1_WEIGHT = 20,
FLASHBANG_WEIGHT = 1,
DEAGLE_WEIGHT = 7,
SG552_WEIGHT = 25,
AK47_WEIGHT = 25,
P90_WEIGHT = 26,
KNIFE_WEIGHT = 0,
};
enum MaxAmmoType
{
MAX_AMMO_BUCKSHOT = 32,
MAX_AMMO_9MM = 120,
MAX_AMMO_556NATO = 90,
MAX_AMMO_556NATOBOX = 200,
MAX_AMMO_762NATO = 90,
MAX_AMMO_45ACP = 100,
MAX_AMMO_50AE = 35,
MAX_AMMO_338MAGNUM = 30,
MAX_AMMO_57MM = 100,
MAX_AMMO_357SIG = 52,
// custom
MAX_AMMO_SMOKEGRENADE = 1,
MAX_AMMO_HEGRENADE = 1,
MAX_AMMO_FLASHBANG = 2,
};
enum AmmoType
{
AMMO_NONE,
AMMO_338MAGNUM,
AMMO_762NATO,
AMMO_556NATOBOX,
AMMO_556NATO,
AMMO_BUCKSHOT,
AMMO_45ACP,
AMMO_57MM,
AMMO_50AE,
AMMO_357SIG,
AMMO_9MM,
AMMO_FLASHBANG,
AMMO_HEGRENADE,
AMMO_SMOKEGRENADE,
AMMO_C4,
AMMO_MAX_TYPES
};
enum WeaponClassType
{
WEAPONCLASS_NONE,
WEAPONCLASS_KNIFE,
WEAPONCLASS_PISTOL,
WEAPONCLASS_GRENADE,
WEAPONCLASS_SUBMACHINEGUN,
WEAPONCLASS_SHOTGUN,
WEAPONCLASS_MACHINEGUN,
WEAPONCLASS_RIFLE,
WEAPONCLASS_SNIPERRIFLE,
WEAPONCLASS_MAX,
};
enum AmmoBuyAmount
{
AMMO_338MAG_BUY = 10,
AMMO_357SIG_BUY = 13,
AMMO_45ACP_BUY = 12,
AMMO_50AE_BUY = 7,
AMMO_556NATO_BUY = 30,
AMMO_556NATOBOX_BUY = 30,
AMMO_57MM_BUY = 50,
AMMO_762NATO_BUY = 30,
AMMO_9MM_BUY = 30,
AMMO_BUCKSHOT_BUY = 8,
};
enum shieldgun_e
{
SHIELDGUN_IDLE,
SHIELDGUN_SHOOT1,
SHIELDGUN_SHOOT2,
SHIELDGUN_SHOOT_EMPTY,
SHIELDGUN_RELOAD,
SHIELDGUN_DRAW,
SHIELDGUN_DRAWN_IDLE,
SHIELDGUN_UP,
SHIELDGUN_DOWN,
};
// custom
enum shieldgren_e
{
SHIELDREN_IDLE = 4,
SHIELDREN_UP,
SHIELDREN_DOWN
};
enum InventorySlotType
{
NONE_SLOT,
PRIMARY_WEAPON_SLOT,
PISTOL_SLOT,
KNIFE_SLOT,
GRENADE_SLOT,
C4_SLOT,
};
enum Bullet
{
BULLET_NONE,
BULLET_PLAYER_9MM,
BULLET_PLAYER_MP5,
BULLET_PLAYER_357,
BULLET_PLAYER_BUCKSHOT,
BULLET_PLAYER_CROWBAR,
BULLET_MONSTER_9MM,
BULLET_MONSTER_MP5,
BULLET_MONSTER_12MM,
BULLET_PLAYER_45ACP,
BULLET_PLAYER_338MAG,
BULLET_PLAYER_762MM,
BULLET_PLAYER_556MM,
BULLET_PLAYER_50AE,
BULLET_PLAYER_57MM,
BULLET_PLAYER_357SIG,
};
struct WeaponStruct
{
int m_type;
int m_price;
int m_side;
int m_slot;
int m_ammoPrice;
};
struct AutoBuyInfoStruct
{
AutoBuyClassType m_class;
char *m_command;
char *m_classname;
};
struct WeaponAliasInfo
{
char *alias;
WeaponIdType id;
};
struct WeaponBuyAliasInfo
{
char *alias;
WeaponIdType id;
char *failName;
};
struct WeaponClassAliasInfo
{
char *alias;
WeaponClassType id;
};
struct WeaponSlotInfo
{
WeaponIdType id;
InventorySlotType slot;
const char *weaponName;
};
enum hash_types_e { CLASSNAME };

303
public/resdk/cstrike/regamedll_interfaces.h Normal file
View File

@ -0,0 +1,303 @@
/*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* 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, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
* link the code of this program with the Half-Life Game Engine ("HL
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
* L.L.C ("Valve"). You must obey the GNU General Public License in all
* respects for all of the code used other than the HL Engine and MODs
* from Valve. If you modify this file, you may extend this exception
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#pragma once
#include "regamedll_const.h"
class CBaseEntity;
class CBasePlayer;
// Implementation wrapper
class CCSEntity {
public:
virtual ~CCSEntity() {}
virtual void FireBullets(int iShots, Vector &vecSrc, Vector &vecDirShooting, Vector &vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker);
virtual Vector FireBullets3(Vector &vecSrc, Vector &vecDirShooting, float vecSpread, float flDistance, int iPenetration, int iBulletType, int iDamage, float flRangeModifier, entvars_t *pevAttacker, bool bPistol, int shared_rand);
public:
CBaseEntity *m_pContainingEntity;
};
class CCSDelay: public CCSEntity {};
class CCSAnimating: public CCSDelay {};
class CCSPlayerItem: public CCSAnimating {};
class CCSToggle: public CCSAnimating {};
class CCSMonster: public CCSToggle {};
class CCSWeaponBox: public CCSEntity {};
class CCSArmoury: public CCSEntity {};
class CCSPlayer: public CCSMonster {
public:
CCSPlayer() : m_bForceShowMenu(false)
{
m_szModel[0] = '\0';
}
virtual bool IsConnected() const;
virtual void SetAnimation(PLAYER_ANIM playerAnim);
virtual void AddAccount(int amount, RewardType type = RT_NONE, bool bTrackChange = true);
virtual CBaseEntity *GiveNamedItem(const char *pszName);
virtual CBaseEntity *GiveNamedItemEx(const char *pszName);
virtual void GiveDefaultItems();
virtual void GiveShield(bool bDeploy = true);
virtual void DropShield(bool bDeploy = true);
virtual void DropPlayerItem(const char *pszItemName);
virtual void RemoveShield();
virtual void RemoveAllItems(bool bRemoveSuit);
virtual bool RemovePlayerItem(const char* pszItemName);
virtual void SetPlayerModel(bool bHasC4);
virtual void SetPlayerModelEx(const char *modelName);
virtual void SetNewPlayerModel(const char *modelName);
virtual void ClientCommand(const char *cmd, const char *arg1 = nullptr, const char *arg2 = nullptr, const char *arg3 = nullptr);
virtual void SetProgressBarTime(int time);
virtual void SetProgressBarTime2(int time, float timeElapsed);
virtual struct edict_s *EntSelectSpawnPoint();
virtual void SetBombIcon(bool bFlash = false);
virtual void SetScoreAttrib(CBasePlayer *dest);
virtual void SendItemStatus();
virtual void ReloadWeapons(CBasePlayerItem *pWeapon = nullptr, bool bForceReload = false, bool bForceRefill = false);
virtual void Observer_SetMode(int iMode);
virtual bool SelectSpawnSpot(const char *pEntClassName, CBaseEntity* &pSpot);
virtual bool SwitchWeapon(CBasePlayerItem *pWeapon);
virtual void SwitchTeam();
virtual bool JoinTeam(TeamName team);
virtual void StartObserver(Vector& vecPosition, Vector& vecViewAngle);
virtual void TeamChangeUpdate();
virtual void DropSecondary();
virtual void DropPrimary();
virtual bool HasPlayerItem(CBasePlayerItem *pCheckItem);
virtual bool HasNamedPlayerItem(const char *pszItemName);
virtual CBasePlayerItem *GetItemById(WeaponIdType weaponID);
virtual CBasePlayerItem *GetItemByName(const char *itemName);
virtual void Disappear();
virtual void MakeVIP();
virtual bool MakeBomber();
CBasePlayer *BasePlayer() const;
public:
char m_szModel[32];
bool m_bForceShowMenu;
};
class CAPI_Bot: public CCSPlayer {};
class CAPI_CSBot: public CAPI_Bot {};
class CCSShield: public CCSEntity {};
class CCSDeadHEV: public CCSMonster {};
class CCSSprayCan: public CCSEntity {};
class CCSBloodSplat: public CCSEntity {};
class CCSPlayerWeapon: public CCSPlayerItem {};
class CCSWorld: public CCSEntity {};
class CCSDecal: public CCSEntity {};
class CCSCorpse: public CCSEntity {};
class CCSGrenade: public CCSMonster {};
class CCSAirtank: public CCSGrenade {};
class CCSPlayerAmmo: public CCSEntity {};
class CCS9MMAmmo: public CCSPlayerAmmo {};
class CCSBuckShotAmmo: public CCSPlayerAmmo {};
class CCS556NatoAmmo: public CCSPlayerAmmo {};
class CCS556NatoBoxAmmo: public CCSPlayerAmmo {};
class CCS762NatoAmmo: public CCSPlayerAmmo {};
class CCS45ACPAmmo: public CCSPlayerAmmo {};
class CCS50AEAmmo: public CCSPlayerAmmo {};
class CCS338MagnumAmmo: public CCSPlayerAmmo {};
class CCS57MMAmmo: public CCSPlayerAmmo {};
class CCS357SIGAmmo: public CCSPlayerAmmo {};
class CCSFuncWall: public CCSEntity {};
class CCSFuncWallToggle: public CCSFuncWall {};
class CCSFuncConveyor: public CCSFuncWall {};
class CCSFuncIllusionary: public CCSToggle {};
class CCSFuncMonsterClip: public CCSFuncWall {};
class CCSFuncRotating: public CCSEntity {};
class CCSPendulum: public CCSEntity {};
class CCSPointEntity: public CCSEntity {};
class CCSStripWeapons: public CCSPointEntity {};
class CCSInfoIntermission: public CCSPointEntity {};
class CCSRevertSaved: public CCSPointEntity {};
class CCSEnvGlobal: public CCSPointEntity {};
class CCSMultiSource: public CCSPointEntity {};
class CCSButton: public CCSToggle {};
class CCSRotButton: public CCSButton {};
class CCSMomentaryRotButton: public CCSToggle {};
class CCSEnvSpark: public CCSEntity {};
class CCSButtonTarget: public CCSEntity {};
class CCSDoor: public CCSToggle {};
class CCSRotDoor: public CCSDoor {};
class CCSMomentaryDoor: public CCSToggle {};
class CCSGib: public CCSEntity {};
class CCSBubbling: public CCSEntity {};
class CCSBeam: public CCSEntity {};
class CCSLightning: public CCSBeam {};
class CCSLaser: public CCSBeam {};
class CCSGlow: public CCSPointEntity {};
class CCSSprite: public CCSPointEntity {};
class CCSBombGlow: public CCSSprite {};
class CCSGibShooter: public CCSDelay {};
class CCSEnvShooter: public CCSGibShooter {};
class CCSTestEffect: public CCSDelay {};
class CCSBlood: public CCSPointEntity {};
class CCSShake: public CCSPointEntity {};
class CCSFade: public CCSPointEntity {};
class CCSMessage: public CCSPointEntity {};
class CCSEnvFunnel: public CCSDelay {};
class CCSEnvBeverage: public CCSDelay {};
class CCSItemSoda: public CCSEntity {};
class CCSShower: public CCSEntity {};
class CCSEnvExplosion: public CCSMonster {};
class CCSBreakable: public CCSDelay {};
class CCSPushable: public CCSBreakable {};
class CCSFuncTank: public CCSEntity {};
class CCSFuncTankGun: public CCSFuncTank {};
class CCSFuncTankLaser: public CCSFuncTank {};
class CCSFuncTankRocket: public CCSFuncTank {};
class CCSFuncTankMortar: public CCSFuncTank {};
class CCSFuncTankControls: public CCSEntity {};
class CCSRecharge: public CCSToggle {};
class CCSCycler: public CCSMonster {};
class CCSGenericCycler: public CCSCycler {};
class CCSCyclerProbe: public CCSCycler {};
class CCSCyclerSprite: public CCSEntity {};
class CCSWeaponCycler: public CCSPlayerWeapon {};
class CCSWreckage: public CCSMonster {};
class CCSWorldItem: public CCSEntity {};
class CCSItem: public CCSEntity {};
class CCSHealthKit: public CCSItem {};
class CCSWallHealth: public CCSToggle {};
class CCSItemSuit: public CCSItem {};
class CCSItemBattery: public CCSItem {};
class CCSItemAntidote: public CCSItem {};
class CCSItemSecurity: public CCSItem {};
class CCSItemLongJump: public CCSItem {};
class CCSItemKevlar: public CCSItem {};
class CCSItemAssaultSuit: public CCSItem {};
class CCSItemThighPack: public CCSItem {};
class CCSGrenCatch: public CCSEntity {};
class CCSFuncWeaponCheck: public CCSEntity {};
class CCSHostage: public CCSMonster {};
class CCSLight: public CCSPointEntity {};
class CCSEnvLight: public CCSLight {};
class CCSRuleEntity: public CCSEntity {};
class CCSRulePointEntity: public CCSRuleEntity {};
class CCSRuleBrushEntity: public CCSRuleEntity {};
class CCSGameScore: public CCSRulePointEntity {};
class CCSGameEnd: public CCSRulePointEntity {};
class CCSGameText: public CCSRulePointEntity {};
class CCSGameTeamMaster: public CCSRulePointEntity {};
class CCSGameTeamSet: public CCSRulePointEntity {};
class CCSGamePlayerZone: public CCSRuleBrushEntity {};
class CCSGamePlayerHurt: public CCSRulePointEntity {};
class CCSGameCounter: public CCSRulePointEntity {};
class CCSGameCounterSet: public CCSRulePointEntity {};
class CCSGamePlayerEquip: public CCSRulePointEntity {};
class CCSGamePlayerTeam: public CCSRulePointEntity {};
class CCSFuncMortarField: public CCSToggle {};
class CCSMortar: public CCSGrenade {};
class CCSMapInfo: public CCSPointEntity {};
class CCSPathCorner: public CCSPointEntity {};
class CCSPathTrack: public CCSPointEntity {};
class CCSFuncTrackTrain: public CCSEntity {};
class CCSFuncVehicleControls: public CCSEntity {};
class CCSFuncVehicle: public CCSEntity {};
class CCSPlatTrain: public CCSToggle {};
class CCSFuncPlat: public CCSPlatTrain {};
class CCSPlatTrigger: public CCSEntity {};
class CCSFuncPlatRot: public CCSFuncPlat {};
class CCSFuncTrain: public CCSPlatTrain {};
class CCSFuncTrainControls: public CCSEntity {};
class CCSFuncTrackChange: public CCSFuncPlatRot {};
class CCSFuncTrackAuto: public CCSFuncTrackChange {};
class CCSGunTarget: public CCSMonster {};
class CCSAmbientGeneric: public CCSEntity {};
class CCSEnvSound: public CCSPointEntity {};
class CCSSpeaker: public CCSEntity {};
class CCSSoundEnt: public CCSEntity {};
class CCSUSP: public CCSPlayerWeapon {};
class CCSMP5N: public CCSPlayerWeapon {};
class CCSSG552: public CCSPlayerWeapon {};
class CCSAK47: public CCSPlayerWeapon {};
class CCSAUG: public CCSPlayerWeapon {};
class CCSAWP: public CCSPlayerWeapon {};
class CCSC4: public CCSPlayerWeapon {};
class CCSDEAGLE: public CCSPlayerWeapon {};
class CCSFlashbang: public CCSPlayerWeapon {};
class CCSG3SG1: public CCSPlayerWeapon {};
class CCSGLOCK18: public CCSPlayerWeapon {};
class CCSHEGrenade: public CCSPlayerWeapon {};
class CCSKnife: public CCSPlayerWeapon {};
class CCSM249: public CCSPlayerWeapon {};
class CCSM3: public CCSPlayerWeapon {};
class CCSM4A1: public CCSPlayerWeapon {};
class CCSMAC10: public CCSPlayerWeapon {};
class CCSP228: public CCSPlayerWeapon {};
class CCSP90: public CCSPlayerWeapon {};
class CCSSCOUT: public CCSPlayerWeapon {};
class CCSSmokeGrenade: public CCSPlayerWeapon {};
class CCSTMP: public CCSPlayerWeapon {};
class CCSXM1014: public CCSPlayerWeapon {};
class CCSELITE: public CCSPlayerWeapon {};
class CCSFiveSeven: public CCSPlayerWeapon {};
class CCSUMP45: public CCSPlayerWeapon {};
class CCSSG550: public CCSPlayerWeapon {};
class CCSGalil: public CCSPlayerWeapon {};
class CCSFamas: public CCSPlayerWeapon {};
class CCSNullEntity: public CCSEntity {};
class CCSDMStart: public CCSPointEntity {};
class CCSFrictionModifier: public CCSEntity {};
class CCSAutoTrigger: public CCSDelay {};
class CCSTriggerRelay: public CCSDelay {};
class CCSMultiManager: public CCSToggle {};
class CCSRenderFxManager: public CCSEntity {};
class CCSTrigger: public CCSToggle {};
class CCSTriggerHurt: public CCSTrigger {};
class CCSTriggerMonsterJump: public CCSTrigger {};
class CCSTriggerCDAudio: public CCSTrigger {};
class CCSTargetCDAudio: public CCSPointEntity {};
class CCSTriggerMultiple: public CCSTrigger {};
class CCSTriggerOnce: public CCSTriggerMultiple {};
class CCSTriggerCounter: public CCSTrigger {};
class CCSTriggerVolume: public CCSPointEntity {};
class CCSFireAndDie: public CCSDelay {};
class CCSChangeLevel: public CCSTrigger {};
class CCSLadder: public CCSTrigger {};
class CCSTriggerPush: public CCSTrigger {};
class CCSTriggerTeleport: public CCSTrigger {};
class CCSBuyZone: public CCSTrigger {};
class CCSBombTarget: public CCSTrigger {};
class CCSHostageRescue: public CCSTrigger {};
class CCSEscapeZone: public CCSTrigger {};
class CCSVIP_SafetyZone: public CCSTrigger {};
class CCSTriggerSave: public CCSTrigger {};
class CCSTriggerEndSection: public CCSTrigger {};
class CCSTriggerGravity: public CCSTrigger {};
class CCSTriggerChangeTarget: public CCSDelay {};
class CCSTriggerCamera: public CCSDelay {};
class CCSWeather: public CCSTrigger {};
class CCSClientFog: public CCSEntity {};
inline CBasePlayer *CCSPlayer::BasePlayer() const {
return reinterpret_cast<CBasePlayer *>(this->m_pContainingEntity);
}

61
public/resdk/engine/FlightRecorder.h Normal file
View File

@ -0,0 +1,61 @@
/*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* 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, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
* link the code of this program with the Half-Life Game Engine ("HL
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
* L.L.C ("Valve"). You must obey the GNU General Public License in all
* respects for all of the code used other than the HL Engine and MODs
* from Valve. If you modify this file, you may extend this exception
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#pragma once
#include <archtypes.h>
class IRehldsFlightRecorder
{
public:
virtual ~IRehldsFlightRecorder() { }
virtual uint16 RegisterMessage(const char* module, const char *message, unsigned int version, bool inOut) = 0;
virtual void StartMessage(uint16 msg, bool entrance) = 0;
virtual void EndMessage(uint16 msg, bool entrance) = 0;
virtual void WriteInt8(int8 v) = 0;
virtual void WriteUInt8(uint8 v) = 0;
virtual void WriteInt16(int16 v) = 0;
virtual void WriteUInt16(uint16 v) = 0;
virtual void WriteInt32(int32 v) = 0;
virtual void WriteUInt32(uint32 v) = 0;
virtual void WriteInt64(int64 v) = 0;
virtual void WriteUInt64(uint64 v) = 0;
virtual void WriteFloat(float v) = 0;
virtual void WriteDouble(double v) = 0;
virtual void WriteString(const char* s) = 0;
virtual void WriteBuffer(const void* data ,unsigned int len) = 0;
};

47
public/resdk/engine/cmd_rehlds.h Normal file
View File

@ -0,0 +1,47 @@
/*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* 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, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
* link the code of this program with the Half-Life Game Engine ("HL
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
* L.L.C ("Valve"). You must obey the GNU General Public License in all
* respects for all of the code used other than the HL Engine and MODs
* from Valve. If you modify this file, you may extend this exception
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#pragma once
typedef void(*xcommand_t)(void);
typedef struct cmd_function_s
{
struct cmd_function_s *next;
char *name;
xcommand_t function;
int flags;
} cmd_function_t;
typedef enum cmd_source_s
{
src_client = 0, // came in over a net connection as a clc_stringcmd. host_client will be valid during this state.
src_command = 1, // from the command buffer.
} cmd_source_t;
#define FCMD_HUD_COMMAND BIT(0)
#define FCMD_GAME_COMMAND BIT(1)
#define FCMD_WRAPPER_COMMAND BIT(2)

300
public/resdk/engine/rehlds_api.h Normal file
View File

@ -0,0 +1,300 @@
/*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* 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, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
* link the code of this program with the Half-Life Game Engine ("HL
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
* L.L.C ("Valve"). You must obey the GNU General Public License in all
* respects for all of the code used other than the HL Engine and MODs
* from Valve. If you modify this file, you may extend this exception
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#pragma once
#include <engine_strucs.h>
#include <com_model.h>
#include "cmd_rehlds.h"
#include "rehlds_interfaces.h"
#include "FlightRecorder.h"
#include "../common/hookchains.h"
#define REHLDS_API_VERSION_MAJOR 3
#define REHLDS_API_VERSION_MINOR 0
//Steam_NotifyClientConnect hook
typedef IHookChain<qboolean, IGameClient*, const void*, unsigned int> IRehldsHook_Steam_NotifyClientConnect;
typedef IHookChainRegistry<qboolean, IGameClient*, const void*, unsigned int> IRehldsHookRegistry_Steam_NotifyClientConnect;
//SV_ConnectClient hook
typedef IVoidHookChain<> IRehldsHook_SV_ConnectClient;
typedef IVoidHookChainRegistry<> IRehldsHookRegistry_SV_ConnectClient;
//SV_GetIDString hook
typedef IHookChain<char*, USERID_t*> IRehldsHook_SV_GetIDString;
typedef IHookChainRegistry<char*, USERID_t*> IRehldsHookRegistry_SV_GetIDString;
//SV_SendServerinfo hook
typedef IVoidHookChain<sizebuf_t*, IGameClient*> IRehldsHook_SV_SendServerinfo;
typedef IVoidHookChainRegistry<sizebuf_t*, IGameClient*> IRehldsHookRegistry_SV_SendServerinfo;
//SV_CheckProtocol hook
typedef IHookChain<int, netadr_t*, int> IRehldsHook_SV_CheckProtocol;
typedef IHookChainRegistry<int, netadr_t*, int> IRehldsHookRegistry_SV_CheckProtocol;
//SVC_GetChallenge_mod hook
typedef IVoidHookChain<char*, int> IRehldsHook_SVC_GetChallenge_mod;
typedef IVoidHookChainRegistry<char*, int> IRehldsHookRegistry_SVC_GetChallenge_mod;
//SV_CheckKeyInfo hook
typedef IHookChain<int, netadr_t*, char*, uint16*, int*, char*, char*> IRehldsHook_SV_CheckKeyInfo;
typedef IHookChainRegistry<int, netadr_t*, char*, uint16*, int*, char*, char*> IRehldsHookRegistry_SV_CheckKeyInfo;
//SV_CheckIPRestrictions hook
typedef IHookChain<int, netadr_t*, int> IRehldsHook_SV_CheckIPRestrictions;
typedef IHookChainRegistry<int, netadr_t*, int> IRehldsHookRegistry_SV_CheckIPRestrictions;
//SV_FinishCertificateCheck hook
typedef IHookChain<int, netadr_t*, int, char*, char*> IRehldsHook_SV_FinishCertificateCheck;
typedef IHookChainRegistry<int, netadr_t*, int, char*, char*> IRehldsHookRegistry_SV_FinishCertificateCheck;
//Steam_NotifyBotConnect hook
typedef IHookChain<qboolean, IGameClient*> IRehldsHook_Steam_NotifyBotConnect;
typedef IHookChainRegistry<qboolean, IGameClient*> IRehldsHookRegistry_Steam_NotifyBotConnect;
//SerializeSteamId
typedef IVoidHookChain<USERID_t*, USERID_t*> IRehldsHook_SerializeSteamId;
typedef IVoidHookChainRegistry<USERID_t*, USERID_t*> IRehldsHookRegistry_SerializeSteamId;
//SV_CompareUserID hook
typedef IHookChain<qboolean, USERID_t*, USERID_t*> IRehldsHook_SV_CompareUserID;
typedef IHookChainRegistry<qboolean, USERID_t*, USERID_t*> IRehldsHookRegistry_SV_CompareUserID;
//Steam_NotifyClientDisconnect
typedef IVoidHookChain<IGameClient*> IRehldsHook_Steam_NotifyClientDisconnect;
typedef IVoidHookChainRegistry<IGameClient*> IRehldsHookRegistry_Steam_NotifyClientDisconnect;
//PreProcessPacket
typedef IHookChain<bool, uint8*, unsigned int, const netadr_t&> IRehldsHook_PreprocessPacket;
typedef IHookChainRegistry<bool, uint8*, unsigned int, const netadr_t&> IRehldsHookRegistry_PreprocessPacket;
//ValidateCommand
typedef IHookChain<bool, const char*, cmd_source_t, IGameClient*> IRehldsHook_ValidateCommand;
typedef IHookChainRegistry<bool, const char*, cmd_source_t, IGameClient*> IRehldsHookRegistry_ValidateCommand;
//ExecuteServerStringCmd
typedef IVoidHookChain<const char*, cmd_source_t, IGameClient*> IRehldsHook_ExecuteServerStringCmd;
typedef IVoidHookChainRegistry<const char*, cmd_source_t, IGameClient*> IRehldsHookRegistry_ExecuteServerStringCmd;
//ClientConnected
typedef IVoidHookChain<IGameClient*> IRehldsHook_ClientConnected;
typedef IVoidHookChainRegistry<IGameClient*> IRehldsHookRegistry_ClientConnected;
//HandleNetCommand
typedef IVoidHookChain<IGameClient*, int8> IRehldsHook_HandleNetCommand;
typedef IVoidHookChainRegistry<IGameClient*, int8> IRehldsHookRegistry_HandleNetCommand;
//Mod_LoadBrushModel
typedef IVoidHookChain<model_t*, void*> IRehldsHook_Mod_LoadBrushModel;
typedef IVoidHookChainRegistry<model_t*, void*> IRehldsHookRegistry_Mod_LoadBrushModel;
//Mod_LoadStudioModel
typedef IVoidHookChain<model_t*, void*> IRehldsHook_Mod_LoadStudioModel;
typedef IVoidHookChainRegistry<model_t*, void*> IRehldsHookRegistry_Mod_LoadStudioModel;
//SV_EmitEvents hook
typedef IVoidHookChain<IGameClient *, struct packet_entities_s *, sizebuf_t *> IRehldsHook_SV_EmitEvents;
typedef IVoidHookChainRegistry<IGameClient *, struct packet_entities_s *, sizebuf_t *> IRehldsHookRegistry_SV_EmitEvents;
//EV_PlayReliableEvent hook
typedef IVoidHookChain<IGameClient *, int, unsigned short, float, struct event_args_s *> IRehldsHook_EV_PlayReliableEvent;
typedef IVoidHookChainRegistry<IGameClient *, int, unsigned short, float, struct event_args_s *> IRehldsHookRegistry_EV_PlayReliableEvent;
//SV_StartSound hook
typedef IVoidHookChain<int , edict_t *, int, const char *, int, float, int, int> IRehldsHook_SV_StartSound;
typedef IVoidHookChainRegistry<int , edict_t *, int, const char *, int, float, int, int> IRehldsHookRegistry_SV_StartSound;
//PF_Remove_I hook
typedef IVoidHookChain<edict_t *> IRehldsHook_PF_Remove_I;
typedef IVoidHookChainRegistry<edict_t *> IRehldsHookRegistry_PF_Remove_I;
//PF_BuildSoundMsg_I hook
typedef IVoidHookChain<edict_t *, int, const char *, float, float, int, int, int, int, const float *, edict_t *> IRehldsHook_PF_BuildSoundMsg_I;
typedef IVoidHookChainRegistry<edict_t *, int, const char *, float, float, int, int, int, int, const float *, edict_t *> IRehldsHookRegistry_PF_BuildSoundMsg_I;
//SV_WriteFullClientUpdate hook
typedef IVoidHookChain<IGameClient *, char *, size_t, sizebuf_t *, IGameClient *> IRehldsHook_SV_WriteFullClientUpdate;
typedef IVoidHookChainRegistry<IGameClient *, char *, size_t, sizebuf_t *, IGameClient *> IRehldsHookRegistry_SV_WriteFullClientUpdate;
//SV_CheckConsistencyResponse hook
typedef IHookChain<bool, IGameClient *, resource_t *, uint32> IRehldsHook_SV_CheckConsistencyResponse;
typedef IHookChainRegistry<bool, IGameClient *, resource_t *, uint32> IRehldsHookRegistry_SV_CheckConsistencyResponse;
//SV_DropClient hook
typedef IVoidHookChain<IGameClient*, bool, const char*> IRehldsHook_SV_DropClient;
typedef IVoidHookChainRegistry<IGameClient*, bool, const char*> IRehldsHookRegistry_SV_DropClient;
//SV_ActivateServer hook
typedef IVoidHookChain<int> IRehldsHook_SV_ActivateServer;
typedef IVoidHookChainRegistry<int> IRehldsHookRegistry_SV_ActivateServer;
//SV_WriteVoiceCodec hook
typedef IVoidHookChain<sizebuf_t *> IRehldsHook_SV_WriteVoiceCodec;
typedef IVoidHookChainRegistry<sizebuf_t *> IRehldsHookRegistry_SV_WriteVoiceCodec;
//Steam_GSGetSteamID hook
typedef IHookChain<uint64> IRehldsHook_Steam_GSGetSteamID;
typedef IHookChainRegistry<uint64> IRehldsHookRegistry_Steam_GSGetSteamID;
//SV_TransferConsistencyInfo hook
typedef IHookChain<int> IRehldsHook_SV_TransferConsistencyInfo;
typedef IHookChainRegistry<int> IRehldsHookRegistry_SV_TransferConsistencyInfo;
//Steam_GSBUpdateUserData hook
typedef IHookChain<bool, uint64, const char *, uint32> IRehldsHook_Steam_GSBUpdateUserData;
typedef IHookChainRegistry<bool, uint64, const char *, uint32> IRehldsHookRegistry_Steam_GSBUpdateUserData;
//Cvar_DirectSet hook
typedef IVoidHookChain<struct cvar_s *, const char *> IRehldsHook_Cvar_DirectSet;
typedef IVoidHookChainRegistry<struct cvar_s *, const char *> IRehldsHookRegistry_Cvar_DirectSet;
//SV_EstablishTimeBase hook
typedef IVoidHookChain<IGameClient *, struct usercmd_s *, int, int, int> IRehldsHook_SV_EstablishTimeBase;
typedef IVoidHookChainRegistry<IGameClient *, struct usercmd_s *, int, int, int> IRehldsHookRegistry_SV_EstablishTimeBase;
//SV_Spawn_f hook
typedef IVoidHookChain<> IRehldsHook_SV_Spawn_f;
typedef IVoidHookChainRegistry<> IRehldsHookRegistry_SV_Spawn_f;
//SV_CreatePacketEntities hook
typedef IHookChain<int, enum sv_delta_s, IGameClient *, struct packet_entities_s *, struct sizebuf_s *> IRehldsHook_SV_CreatePacketEntities;
typedef IHookChainRegistry<int, enum sv_delta_s, IGameClient *, struct packet_entities_s *, struct sizebuf_s *> IRehldsHookRegistry_SV_CreatePacketEntities;
//SV_EmitSound2 hook
typedef IHookChain<bool, edict_t *, IGameClient *, int, const char*, float, float, int, int, int, const float*> IRehldsHook_SV_EmitSound2;
typedef IHookChainRegistry<bool, edict_t *, IGameClient *, int, const char*, float, float, int, int, int, const float*> IRehldsHookRegistry_SV_EmitSound2;
class IRehldsHookchains {
public:
virtual ~IRehldsHookchains() { }
virtual IRehldsHookRegistry_Steam_NotifyClientConnect* Steam_NotifyClientConnect() = 0;
virtual IRehldsHookRegistry_SV_ConnectClient* SV_ConnectClient() = 0;
virtual IRehldsHookRegistry_SV_GetIDString* SV_GetIDString() = 0;
virtual IRehldsHookRegistry_SV_SendServerinfo* SV_SendServerinfo() = 0;
virtual IRehldsHookRegistry_SV_CheckProtocol* SV_CheckProtocol() = 0;
virtual IRehldsHookRegistry_SVC_GetChallenge_mod* SVC_GetChallenge_mod() = 0;
virtual IRehldsHookRegistry_SV_CheckKeyInfo* SV_CheckKeyInfo() = 0;
virtual IRehldsHookRegistry_SV_CheckIPRestrictions* SV_CheckIPRestrictions() = 0;
virtual IRehldsHookRegistry_SV_FinishCertificateCheck* SV_FinishCertificateCheck() = 0;
virtual IRehldsHookRegistry_Steam_NotifyBotConnect* Steam_NotifyBotConnect() = 0;
virtual IRehldsHookRegistry_SerializeSteamId* SerializeSteamId() = 0;
virtual IRehldsHookRegistry_SV_CompareUserID* SV_CompareUserID() = 0;
virtual IRehldsHookRegistry_Steam_NotifyClientDisconnect* Steam_NotifyClientDisconnect() = 0;
virtual IRehldsHookRegistry_PreprocessPacket* PreprocessPacket() = 0;
virtual IRehldsHookRegistry_ValidateCommand* ValidateCommand() = 0;
virtual IRehldsHookRegistry_ClientConnected* ClientConnected() = 0;
virtual IRehldsHookRegistry_HandleNetCommand* HandleNetCommand() = 0;
virtual IRehldsHookRegistry_Mod_LoadBrushModel* Mod_LoadBrushModel() = 0;
virtual IRehldsHookRegistry_Mod_LoadStudioModel* Mod_LoadStudioModel() = 0;
virtual IRehldsHookRegistry_ExecuteServerStringCmd* ExecuteServerStringCmd() = 0;
virtual IRehldsHookRegistry_SV_EmitEvents* SV_EmitEvents() = 0;
virtual IRehldsHookRegistry_EV_PlayReliableEvent* EV_PlayReliableEvent() = 0;
virtual IRehldsHookRegistry_SV_StartSound* SV_StartSound() = 0;
virtual IRehldsHookRegistry_PF_Remove_I* PF_Remove_I() = 0;
virtual IRehldsHookRegistry_PF_BuildSoundMsg_I* PF_BuildSoundMsg_I() = 0;
virtual IRehldsHookRegistry_SV_WriteFullClientUpdate* SV_WriteFullClientUpdate() = 0;
virtual IRehldsHookRegistry_SV_CheckConsistencyResponse* SV_CheckConsistencyResponse() = 0;
virtual IRehldsHookRegistry_SV_DropClient* SV_DropClient() = 0;
virtual IRehldsHookRegistry_SV_ActivateServer* SV_ActivateServer() = 0;
virtual IRehldsHookRegistry_SV_WriteVoiceCodec* SV_WriteVoiceCodec() = 0;
virtual IRehldsHookRegistry_Steam_GSGetSteamID* Steam_GSGetSteamID() = 0;
virtual IRehldsHookRegistry_SV_TransferConsistencyInfo* SV_TransferConsistencyInfo() = 0;
virtual IRehldsHookRegistry_Steam_GSBUpdateUserData* Steam_GSBUpdateUserData() = 0;
virtual IRehldsHookRegistry_Cvar_DirectSet* Cvar_DirectSet() = 0;
virtual IRehldsHookRegistry_SV_EstablishTimeBase* SV_EstablishTimeBase() = 0;
virtual IRehldsHookRegistry_SV_Spawn_f* SV_Spawn_f() = 0;
virtual IRehldsHookRegistry_SV_CreatePacketEntities* SV_CreatePacketEntities() = 0;
virtual IRehldsHookRegistry_SV_EmitSound2* SV_EmitSound2() = 0;
};
struct RehldsFuncs_t {
void(*DropClient)(IGameClient* cl, bool crash, const char* fmt, ...);
void(*RejectConnection)(netadr_t *adr, char *fmt, ...);
qboolean(*SteamNotifyBotConnect)(IGameClient* cl);
sizebuf_t*(*GetNetMessage)();
IGameClient*(*GetHostClient)();
int*(*GetMsgReadCount)();
qboolean(*FilterUser)(USERID_t*);
void(*NET_SendPacket)(unsigned int length, void *data, const netadr_t &to);
void(*TokenizeString)(char* s);
bool(*CheckChallenge)(const netadr_t& adr, int challenge);
void(*SendUserReg)(sizebuf_t* msg);
void(*WriteDeltaDescriptionsToClient)(sizebuf_t* msg);
void(*SetMoveVars)();
void(*WriteMovevarsToClient)(sizebuf_t* msg);
char*(*GetClientFallback)();
int*(*GetAllowCheats)();
bool(*GSBSecure)();
int(*GetBuildNumber)();
double(*GetRealTime)();
int*(*GetMsgBadRead)();
cmd_source_t*(*GetCmdSource)();
void(*Log)(const char* prefix, const char* msg);
DLL_FUNCTIONS *(*GetEntityInterface)();
void(*EV_PlayReliableEvent)(IGameClient *cl, int entindex, unsigned short eventindex, float delay, struct event_args_s *pargs);
int(*SV_LookupSoundIndex)(const char *sample);
void(*MSG_StartBitWriting)(sizebuf_t *buf);
void(*MSG_WriteBits)(uint32 data, int numbits);
void(*MSG_WriteBitVec3Coord)(const float *fa);
void(*MSG_EndBitWriting)(sizebuf_t *buf);
void*(*SZ_GetSpace)(sizebuf_t *buf, int length);
cvar_t*(*GetCvarVars)();
int (*SV_GetChallenge)(const netadr_t& adr);
void (*SV_AddResource)(resourcetype_t type, const char *name, int size, unsigned char flags, int index);
int(*MSG_ReadShort)(void);
int(*MSG_ReadBuf)(int iSize, void *pbuf);
void(*MSG_WriteBuf)(sizebuf_t *sb, int iSize, void *buf);
void(*MSG_WriteByte)(sizebuf_t *sb, int c);
void(*MSG_WriteShort)(sizebuf_t *sb, int c);
void(*MSG_WriteString)(sizebuf_t *sb, const char *s);
void*(*GetPluginApi)(const char *name);
void(*RegisterPluginApi)(const char *name, void *impl);
qboolean(*SV_FileInConsistencyList)(const char *filename, struct consistency_s **ppconsist);
qboolean(*Steam_NotifyClientConnect)(IGameClient *cl, const void *pvSteam2Key, unsigned int ucbSteam2Key);
void(*Steam_NotifyClientDisconnect)(IGameClient* cl);
void(*SV_StartSound)(int recipients, edict_t *entity, int channel, const char *sample, int volume, float attenuation, int flags, int pitch);
bool(*SV_EmitSound2)(edict_t *entity, IGameClient *receiver, int channel, const char *sample, float volume, float attenuation, int flags, int pitch, int emitFlags, const float *pOrigin);
void(*SV_UpdateUserInfo)(IGameClient *pGameClient);
bool(*StripUnprintableAndSpace)(char *pch);
};
class IRehldsApi {
public:
virtual ~IRehldsApi() { }
virtual int GetMajorVersion() = 0;
virtual int GetMinorVersion() = 0;
virtual const RehldsFuncs_t* GetFuncs() = 0;
virtual IRehldsHookchains* GetHookchains() = 0;
virtual IRehldsServerStatic* GetServerStatic() = 0;
virtual IRehldsServerData* GetServerData() = 0;
virtual IRehldsFlightRecorder* GetFlightRecorder() = 0;
};
#define VREHLDS_HLDS_API_VERSION "VREHLDS_HLDS_API_VERSION001"

109
public/resdk/engine/rehlds_interfaces.h Normal file
View File

@ -0,0 +1,109 @@
/*
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* 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, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, the author gives permission to
* link the code of this program with the Half-Life Game Engine ("HL
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
* L.L.C ("Valve"). You must obey the GNU General Public License in all
* respects for all of the code used other than the HL Engine and MODs
* from Valve. If you modify this file, you may extend this exception
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#pragma once
class INetChan;
class IGameClient;
#include <archtypes.h>
#include <const.h>
class INetChan;
class IGameClient;
class IGameClient {
public:
virtual int GetId() = 0;
virtual bool IsActive() = 0;
virtual void SetActive(bool active) = 0;
virtual bool IsSpawned() = 0;
virtual void SetSpawned(bool spawned) = 0;
virtual INetChan* GetNetChan() = 0;
virtual sizebuf_t* GetDatagram() = 0;
virtual edict_t* GetEdict() = 0;
virtual USERID_t* GetNetworkUserID() = 0;
virtual const char* GetName() = 0;
virtual bool IsConnected() = 0;
virtual void SetConnected(bool connected) = 0;
virtual uint32 GetVoiceStream(int stream_id) = 0;
virtual void SetLastVoiceTime(double time) = 0;
virtual double GetLastVoiceTime() = 0;
virtual bool GetLoopback() = 0;
virtual struct usercmd_s *GetLastCmd() = 0;
};
class INetChan {
public:
virtual const netadr_t* GetRemoteAdr() = 0;
virtual sizebuf_t* GetMessageBuf() = 0;
};
class IRehldsServerStatic {
public:
virtual ~IRehldsServerStatic() { }
virtual int GetMaxClients() = 0;
virtual bool IsLogActive() = 0;
virtual IGameClient* GetClient(int id) = 0;
virtual client_t* GetClient_t(int id) = 0;
virtual int GetIndexOfClient_t(client_t* client) = 0;
};
class IRehldsServerData {
public:
virtual ~IRehldsServerData() { }
virtual const char* GetModelName() = 0;
virtual const char* GetName() = 0;
virtual uint32 GetWorldmapCrc() = 0;
virtual uint8* GetClientDllMd5() = 0;
virtual sizebuf_t* GetDatagram() = 0;
virtual sizebuf_t* GetReliableDatagram() = 0;
virtual void SetModelName(const char* modelname) = 0;
virtual void SetConsistencyNum(int num) = 0;
virtual int GetConsistencyNum() = 0;
virtual int GetResourcesNum() = 0;
virtual int GetDecalNameNum() = 0;
virtual double GetTime() = 0;
virtual void SetResourcesNum(int num) = 0;
virtual struct resource_s *GetResource(int index) = 0;
virtual void SetName(const char* name) = 0;
virtual class ISteamGameServer *GetSteamGameServer() = 0;
virtual struct netadr_s *GetNetFrom() = 0;
};

29
public/resdk/mod_regamedll_api.cpp Normal file
View File

@ -0,0 +1,29 @@
#include "mod_regamedll_api.h"
IReGameApi* ReGameApi;
const ReGameFuncs_t* ReGameFuncs;
IReGameHookchains * ReGameHookchains;
bool RegamedllApi_Init()
{
auto library = GET_GAME_INFO(PLID, GINFO_DLL_FULLPATH);
if (!library || !GET_IFACE<IReGameApi>(library, ReGameApi, VRE_GAMEDLL_API_VERSION, false) || !ReGameApi)
{
return false;
}
auto majorVersion = ReGameApi->GetMajorVersion();
auto minorVersion = ReGameApi->GetMinorVersion();
if (majorVersion != REGAMEDLL_API_VERSION_MAJOR || minorVersion < REGAMEDLL_API_VERSION_MINOR)
{
return false;
}
ReGameFuncs = ReGameApi->GetFuncs();
ReGameHookchains = ReGameApi->GetHookchains();
return true;
}

11
public/resdk/mod_regamedll_api.h Normal file
View File

@ -0,0 +1,11 @@
#pragma once
#include <interface_helpers.h>
#include <resdk/cstrike/regamedll_api.h>
extern IReGameApi* ReGameApi;
extern const ReGameFuncs_t* ReGameFuncs;
extern IReGameHookchains* ReGameHookchains;
extern bool RegamedllApi_Init();

42
public/resdk/mod_rehlds_api.cpp Normal file
View File

@ -0,0 +1,42 @@
#include "mod_rehlds_api.h"
IRehldsApi* RehldsApi;
const RehldsFuncs_t* RehldsFuncs;
IRehldsServerData* RehldsData;
IRehldsHookchains* RehldsHookchains;
IRehldsServerStatic* RehldsSvs;
bool RehldsApi_Init()
{
if (!IS_DEDICATED_SERVER())
{
return false;
}
#if defined(PLATFORM_WINDOWS)
auto library = "swds";
#elif defined(PLATFORM_POSIX)
auto library = "engine_i486";
#endif
if (!GET_IFACE<IRehldsApi>(library, RehldsApi, VREHLDS_HLDS_API_VERSION) || !RehldsApi)
{
return false;
}
auto majorVersion = RehldsApi->GetMajorVersion();
auto minorVersion = RehldsApi->GetMinorVersion();
if (majorVersion != REHLDS_API_VERSION_MAJOR || minorVersion < REHLDS_API_VERSION_MINOR)
{
return false;
}
RehldsFuncs = RehldsApi->GetFuncs();
RehldsData = RehldsApi->GetServerData();
RehldsHookchains = RehldsApi->GetHookchains();
RehldsSvs = RehldsApi->GetServerStatic();
return true;
}

12
public/resdk/mod_rehlds_api.h Normal file
View File

@ -0,0 +1,12 @@
#pragma once
#include <interface_helpers.h>
#include "engine/rehlds_api.h"
extern IRehldsApi* RehldsApi;
extern const RehldsFuncs_t* RehldsFuncs;
extern IRehldsServerData* RehldsData;
extern IRehldsHookchains* RehldsHookchains;
extern IRehldsServerStatic* RehldsSvs;
extern bool RehldsApi_Init();

367
public/sh_string.h
View File

@ -1,367 +0,0 @@
/* ======== SourceMM ========
* Copyright (C) 2004-2005 Metamod:Source Development Team
* No warranties of any kind
*
* License: zlib/libpng
*
* Author(s): David "BAILOPAN" Anderson
* ============================
*/
/* AMX Mod X
*
* by the AMX Mod X Development Team
*/
#ifndef _INCLUDE_CSTRING_H
#define _INCLUDE_CSTRING_H
#include <string.h>
#include <stdio.h>
//namespace SourceHook
//{
class String
{
public:
String()
{
v = NULL;
a_size = 0;
//assign("");
}
~String()
{
if (v)
delete [] v;
}
String(const char *src)
{
v = NULL;
a_size = 0;
assign(src);
}
String(const String &src)
{
v = NULL;
a_size = 0;
assign(src.c_str());
}
const char *c_str() { return v?v:""; }
const char *c_str() const { return v?v:""; }
void append(const char *t)
{
Grow(size() + strlen(t) + 1);
strcat(v, t);
}
void append(const char c)
{
size_t len = size();
Grow(len + 2);
v[len] = c;
v[len + 1] = '\0';
}
void append(String &d)
{
append(d.c_str());
}
void assign(const String &src)
{
assign(src.c_str());
}
void assign(const char *d)
{
if (!d)
{
clear();
} else {
Grow(strlen(d) + 1, false);
strcpy(v, d);
}
}
void clear()
{
if (v)
v[0] = '\0';
}
int compare (const char *d)
{
if (!v)
return strcmp("", d);
else
return strcmp(v, d);
}
//Added this for amxx inclusion
bool empty()
{
if (!v)
return true;
if (v[0] == '\0')
return true;
return false;
}
size_t size()
{
if (v)
return strlen(v);
else
return 0;
}
int find(const char c, int index = 0)
{
int len = static_cast<int>(size());
if (len < 1)
return npos;
if (index >= len || index < 0)
return npos;
int i = 0;
for (i=index; i<len; i++)
{
if (v[i] == c)
{
return i;
}
}
return npos;
}
bool is_space(int c)
{
if (c == '\f' || c == '\n' ||
c == '\t' || c == '\r' ||
c == '\v' || c == ' ')
{
return true;
}
return false;
}
void trim()
{
if (!v)
return;
unsigned int i = 0;
unsigned int j = 0;
size_t len = strlen(v);
if (len == 1)
{
if (is_space(v[i]))
{
clear();
return;
}
}
unsigned char c0 = v[0];
if (is_space(c0))
{
for (i=0; i<len; i++)
{
if (!is_space(v[i]) || (is_space(v[i]) && ((unsigned char)i==len-1)))
{
erase(0, i);
break;
}
}
}
len = strlen(v);
if (len < 1)
{
return;
}
if (is_space(v[len-1]))
{
for (i=len-1; i<len; i--)
{
if (!is_space(v[i])
|| (is_space(v[i]) && i==0))
{
erase(i+1, j);
break;
}
j++;
}
}
if (len == 1)
{
if (is_space(v[0]))
{
clear();
return;
}
}
}
void erase(unsigned int start, int num = npos)
{
if (!v)
return;
unsigned int i = 0;
size_t len = size();
//check for bounds
if (num == npos || start+num > len-start)
num = len - start;
//do the erasing
bool copyflag = false;
for (i=0; i<len; i++)
{
if (i>=start && i<start+num)
{
if (i+num < len)
{
v[i] = v[i+num];
} else {
v[i] = 0;
}
copyflag = true;
} else if (copyflag) {
if (i+num < len)
{
v[i] = v[i+num];
} else {
v[i] = 0;
}
}
}
len -= num;
v[len] = 0;
}
String substr(unsigned int index, int num = npos)
{
if (!v)
{
String b("");
return b;
}
String ns;
size_t len = size();
if (index >= len || !v)
return ns;
if (num == npos)
{
num = len - index;
} else if (index+num >= len) {
num = len - index;
}
unsigned int i = 0;
unsigned int nslen = num + 2;
ns.Grow(nslen);
for (i=index; i<index+num; i++)
ns.append(v[i]);
return ns;
}
void toLower()
{
if (!v)
return;
unsigned int i = 0;
size_t len = strlen(v);
for (i=0; i<len; i++)
{
if (v[i] >= 65 && v[i] <= 90)
v[i] &= ~(1<<5);
}
}
String & operator = (const String &src)
{
assign(src);
return *this;
}
String & operator = (const char *src)
{
assign(src);
return *this;
}
char operator [] (unsigned int index)
{
if (index > size() || !v)
{
return -1;
} else {
return v[index];
}
}
int at(int a)
{
if (a < 0 || a >= (int)size() || !v)
return -1;
return v[a];
}
bool at(int at, char c)
{
if (at < 0 || at >= (int)size() || !v)
return false;
v[at] = c;
return true;
}
private:
void Grow(unsigned int d, bool copy=true)
{
if (d <= a_size)
return;
char *n = new char[d + 1];
if (copy && v)
strcpy(n, v);
if (v)
delete [] v;
else
strcpy(n, "");
v = n;
a_size = d + 1;
}
char *v;
unsigned int a_size;
public:
static const int npos = -1;
};
//}; //NAMESPACE
#endif //_INCLUDE_CSTRING_H

0
amxmodx/sh_tinyhash.h → public/sh_tinyhash.h
View File

333
public/sm_queue.h
View File

@ -1,333 +0,0 @@
/**
* vim: set ts=4 :
* =============================================================================
* SourceMod
* 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 <http://www.gnu.org/licenses/>.
*
* 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 <http://www.sourcemod.net/license.php>.
*
* Version: $Id$
*/
#ifndef _INCLUDE_SM_QUEUE_H
#define _INCLUDE_SM_QUEUE_H
#include <new>
#include <stdlib.h>
#include <sh_stack.h>
//using namespace SourceHook;
/*
A circular, doubly-linked List with one sentinel node
Empty:
m_Head = sentinel
m_Head->next = m_Head;
m_Head->prev = m_Head;
One element:
m_Head = sentinel
m_Head->next = node1
m_Head->prev = node1
node1->next = m_Head
node1->prev = m_Head
Two elements:
m_Head = sentinel
m_Head->next = node1
m_Head->prev = node2
node1->next = node2
node1->prev = m_Head
node2->next = m_Head
node2->prev = node1
*/
template <class T>
class Queue
{
public:
class iterator;
friend class iterator;
class QueueNode
{
public:
T obj;
QueueNode *next;
QueueNode *prev;
};
private:
// Initializes the sentinel node.
QueueNode *_Initialize()
{
QueueNode *n = (QueueNode *)malloc(sizeof(QueueNode));
n->next = n;
n->prev = n;
return n;
}
public:
Queue() : m_Head(_Initialize()), m_Size(0)
{
}
Queue(const Queue &src) : m_Head(_Initialize()), m_Size(0)
{
iterator iter;
for (iter=src.begin(); iter!=src.end(); iter++)
{
push_back( (*iter) );
}
}
~Queue()
{
clear();
// Don't forget to free the sentinel
if (m_Head)
{
free(m_Head);
m_Head = NULL;
}
while (!m_FreeNodes.empty())
{
free(m_FreeNodes.front());
m_FreeNodes.pop();
}
}
void push(const T &obj)
{
QueueNode *node;
if (m_FreeNodes.empty())
{
node = (QueueNode *)malloc(sizeof(QueueNode));
} else {
node = m_FreeNodes.front();
m_FreeNodes.pop();
}
/* Copy the object */
new (&node->obj) T(obj);
/* Install into the Queue */
node->prev = m_Head->prev;
node->next = m_Head;
m_Head->prev->next = node;
m_Head->prev = node;
m_Size++;
}
size_t size() const
{
return m_Size;
}
void clear()
{
QueueNode *node = m_Head->next;
QueueNode *temp;
m_Head->next = m_Head;
m_Head->prev = m_Head;
// Iterate through the nodes until we find g_Head (the sentinel) again
while (node != m_Head)
{
temp = node->next;
node->obj.~T();
m_FreeNodes.push(node);
node = temp;
}
m_Size = 0;
}
bool empty() const
{
return (m_Size == 0);
}
private:
QueueNode *m_Head;
size_t m_Size;
CStack<QueueNode *> m_FreeNodes;
public:
class iterator
{
friend class Queue;
public:
iterator()
{
m_This = NULL;
}
iterator(const Queue &src)
{
m_This = src.m_Head;
}
iterator(QueueNode *n) : m_This(n)
{
}
iterator(const iterator &where)
{
m_This = where.m_This;
}
//pre decrement
iterator & operator--()
{
if (m_This)
m_This = m_This->prev;
return *this;
}
//post decrement
iterator operator--(int)
{
iterator old(*this);
if (m_This)
m_This = m_This->prev;
return old;
}
//pre increment
iterator & operator++()
{
if (m_This)
m_This = m_This->next;
return *this;
}
//post increment
iterator operator++(int)
{
iterator old(*this);
if (m_This)
m_This = m_This->next;
return old;
}
const T & operator * () const
{
return m_This->obj;
}
T & operator * ()
{
return m_This->obj;
}
T * operator -> ()
{
return &(m_This->obj);
}
const T * operator -> () const
{
return &(m_This->obj);
}
bool operator != (const iterator &where) const
{
return (m_This != where.m_This);
}
bool operator ==(const iterator &where) const
{
return (m_This == where.m_This);
}
private:
QueueNode *m_This;
};
public:
iterator begin() const
{
return iterator(m_Head->next);
}
iterator end() const
{
return iterator(m_Head);
}
iterator erase(iterator &where)
{
QueueNode *pNode = where.m_This;
iterator iter(where);
iter++;
// Works for all cases: empty Queue, erasing first element, erasing tail, erasing in the middle...
pNode->prev->next = pNode->next;
pNode->next->prev = pNode->prev;
pNode->obj.~T();
m_FreeNodes.push(pNode);
m_Size--;
return iter;
}
public:
void remove(const T & obj)
{
iterator b;
for (b=begin(); b!=end(); b++)
{
if ( (*b) == obj )
{
erase( b );
break;
}
}
}
template <typename U>
iterator find(const U & equ) const
{
iterator iter;
for (iter=begin(); iter!=end(); iter++)
{
if ( (*iter) == equ )
{
return iter;
}
}
return end();
}
Queue & operator =(const Queue &src)
{
clear();
iterator iter;
for (iter=src.begin(); iter!=src.end(); iter++)
{
push_back( (*iter) );
}
return *this;
}
public:
T & first() const
{
iterator i = begin();
return (*i);
}
void pop()
{
iterator iter = begin();
erase(iter);
}
};
#endif //_INCLUDE_SM_QUEUE_H

1
support/PackageScript
View File

@ -268,6 +268,7 @@ scripting_files = [
'testsuite/textparse_test.cfg', 'testsuite/textparse_test.cfg',
'testsuite/textparse_test.ini', 'testsuite/textparse_test.ini',
'testsuite/request_frame_test.sma', 'testsuite/request_frame_test.sma',
'testsuite/menu_page_callback_test.sma',
'include/amxconst.inc', 'include/amxconst.inc',
'include/amxmisc.inc', 'include/amxmisc.inc',
'include/amxmodx.inc', 'include/amxmodx.inc',