markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed typos in messsage processing

Browse source 
fixed loadlibrary code
fixed game identification in chatter
This commit is contained in:
jeefo 2016-03-13 11:58:35 +03:00
commit 730ce7a1d4
5 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/engine.h
View file

@ -179,7 +179,7 @@ public:
void TerminateTranslator (void);
// do actual network message processing
void ProcessMesageCapture (void *ptr);
void ProcessMessageCapture (void *ptr);
// public inlines
public:
@ -244,7 +244,7 @@ public:
}
// gets the player team
inline int GetTeam (edict_t *ent)
FORCEINLINE int GetTeam (edict_t *ent)
{
extern Client g_clients[MAX_ENGINE_PLAYERS];
@ -282,7 +282,7 @@ public:
}
// find registered message id
inline int FindMessageId (int type)
FORCEINLINE int FindMessageId (int type)
{
return m_msgBlock.regMsgs[type];
}

13
include/platform.h
View file

@ -137,18 +137,21 @@ public:
return m_ptr;
}
inline void *GetFuncAddr (const char *function)
template <typename R> R GetFuncAddr (const char *function)
{
if (!IsLoaded ())
return NULL;
#ifdef PLATFORM_WIN32
return reinterpret_cast <void *> (GetProcAddress (static_cast <HMODULE> (m_ptr), function));
return reinterpret_cast <R> (GetProcAddress (static_cast <HMODULE> (m_ptr), function));
#else
return reinterpret_cast <void *> (dlsym (m_ptr, function));
return reinterpret_cast <R> (dlsym (m_ptr, function));
#endif
}
inline void *GetHandle (void)
template <typename R> R GetHandle (void)
{
return m_ptr;
return (R) m_ptr;
}
inline bool IsLoaded (void) const

4
source/chatlib.cpp
View file

@ -290,14 +290,14 @@ void Bot::PrepareChatMessage (char *text)
}
else if (*pattern == 'd')
{
if (g_gameFlags == GAME_CZERO)
if (g_gameFlags & GAME_CZERO)
{
if (Random.Long (1, 100) < 30)
strcat (m_tempStrings, "CZ");
else
strcat (m_tempStrings, "Condition Zero");
}
else if (g_gameFlags == GAME_CSTRIKE16 || g_gameFlags == GAME_LEGACY)
else if ((g_gameFlags & GAME_CSTRIKE16) || (g_gameFlags & GAME_LEGACY))
{
if (Random.Long (1, 100) < 30)
strcat (m_tempStrings, "CS");

2
source/engine.cpp
View file

@ -584,7 +584,7 @@ void Engine::TerminateTranslator (void)
m_language.RemoveAll ();
}
void Engine::ProcessMesageCapture (void *ptr)
void Engine::ProcessMessageCapture (void *ptr)
{
if (m_msgBlock.msg == NETMSG_UNDEFINED)
return;

36
source/interface.cpp
View file

@ -2518,7 +2518,7 @@ void pfnMessageEnd_Post (void)
void pfnWriteByte (int value)
{
// if this message is for a bot, call the client message function...
engine.ProcessMesageCapture ((void *) &value);
engine.ProcessMessageCapture ((void *) &value);
if (g_isMetamod)
RETURN_META (MRES_IGNORED);
@ -2529,7 +2529,7 @@ void pfnWriteByte (int value)
void pfnWriteChar (int value)
{
// if this message is for a bot, call the client message function...
engine.ProcessMesageCapture ((void *) &value);
engine.ProcessMessageCapture ((void *) &value);
if (g_isMetamod)
RETURN_META (MRES_IGNORED);
@ -2540,7 +2540,7 @@ void pfnWriteChar (int value)
void pfnWriteShort (int value)
{
// if this message is for a bot, call the client message function...
engine.ProcessMesageCapture ((void *) &value);
engine.ProcessMessageCapture ((void *) &value);
if (g_isMetamod)
RETURN_META (MRES_IGNORED);
@ -2551,7 +2551,7 @@ void pfnWriteShort (int value)
void pfnWriteLong (int value)
{
// if this message is for a bot, call the client message function...
engine.ProcessMesageCapture ((void *) &value);
engine.ProcessMessageCapture ((void *) &value);
if (g_isMetamod)
RETURN_META (MRES_IGNORED);
@ -2562,7 +2562,7 @@ void pfnWriteLong (int value)
void pfnWriteAngle (float value)
{
// if this message is for a bot, call the client message function...
engine.ProcessMesageCapture ((void *) &value);
engine.ProcessMessageCapture ((void *) &value);
if (g_isMetamod)
RETURN_META (MRES_IGNORED);
@ -2573,7 +2573,7 @@ void pfnWriteAngle (float value)
void pfnWriteCoord (float value)
{
// if this message is for a bot, call the client message function...
engine.ProcessMesageCapture ((void *) &value);
engine.ProcessMessageCapture ((void *) &value);
if (g_isMetamod)
RETURN_META (MRES_IGNORED);
@ -2584,7 +2584,7 @@ void pfnWriteCoord (float value)
void pfnWriteString (const char *sz)
{
// if this message is for a bot, call the client message function...
engine.ProcessMesageCapture ((void *) sz);
engine.ProcessMessageCapture ((void *) sz);
if (g_isMetamod)
RETURN_META (MRES_IGNORED);
@ -2595,7 +2595,7 @@ void pfnWriteString (const char *sz)
void pfnWriteEntity (int value)
{
// if this message is for a bot, call the client message function...
engine.ProcessMesageCapture ((void *) &value);
engine.ProcessMessageCapture ((void *) &value);
if (g_isMetamod)
RETURN_META (MRES_IGNORED);
@ -3097,10 +3097,10 @@ DLL_GIVEFNPTRSTODLL GiveFnptrsToDll (enginefuncs_t *functionTable, globalvars_t
AddLogEntry (true, LL_FATAL | LL_IGNORE, "Mod that you has started, not supported by this bot (gamedir: %s)", engine.GetModName ());
#endif
g_funcPointers = static_cast <FuncPointers_t> (g_gameLib->GetFuncAddr ("GiveFnptrsToDll"));
g_entityAPI = static_cast <EntityAPI_t> (g_gameLib->GetFuncAddr ("GetEntityAPI"));
g_getNewEntityAPI = static_cast <NewEntityAPI_t> (g_gameLib->GetFuncAddr ("GetNewDLLFunctions"));
g_serverBlendingAPI = static_cast <BlendAPI_t> (g_gameLib->GetFuncAddr ("Server_GetBlendingInterface"));
g_funcPointers = g_gameLib->GetFuncAddr <FuncPointers_t> ("GiveFnptrsToDll");
g_entityAPI = g_gameLib->GetFuncAddr <EntityAPI_t> ("GetEntityAPI");
g_getNewEntityAPI = g_gameLib->GetFuncAddr <NewEntityAPI_t> ("GetNewDLLFunctions");
g_serverBlendingAPI = g_gameLib->GetFuncAddr <BlendAPI_t> ("Server_GetBlendingInterface");
if (!g_funcPointers || !g_entityAPI)
TerminateOnMalloc ();
@ -3126,22 +3126,22 @@ DLL_ENTRYPOINT
DLL_RETENTRY; // the return data type is OS specific too
}
void LinkEntity_Helper (EntityPtr_t *addr, const char *name, entvars_t *pev)
void LinkEntity_Helper (EntityPtr_t &addr, const char *name, entvars_t *pev)
{
if (*addr == NULL)
*addr = static_cast <EntityPtr_t> (g_gameLib->GetFuncAddr (name));
if (addr == NULL)
addr = g_gameLib->GetFuncAddr <EntityPtr_t > (name);
if (*addr == NULL)
if (addr == NULL)
return;
(*addr) (pev);
addr (pev);
}
#define LINK_ENTITY(entityName) \
SHARED_LIBRARAY_EXPORT void entityName (entvars_t *pev) \
{ \
static EntityPtr_t addr; \
LinkEntity_Helper (&addr, #entityName, pev); \
LinkEntity_Helper (addr, #entityName, pev); \
} \
// entities in counter-strike...