UNLOZE/sm-ext-sourcetvmanager
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass the right SourceTV instance index in forwards

Browse Source
This commit is contained in:
Peace-Maker 2016-03-06 12:26:45 +01:00
parent fabdbe7d12
commit 10910e8b8e
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
forwards.cpp
View File

@ -31,6 +31,7 @@
#include "extension.h" #include "extension.h"
#include "forwards.h" #include "forwards.h"
#include "hltvserverwrapper.h"
CForwardManager g_pSTVForwards; CForwardManager g_pSTVForwards;
@ -196,13 +197,13 @@ void CForwardManager::UnhookClient(IClient *client)
void CForwardManager::CallOnServerStart(IHLTVServer *server) void CForwardManager::CallOnServerStart(IHLTVServer *server)
{ {
m_ServerStartFwd->PushCell(0); // TODO: Get right hltvinstance m_ServerStartFwd->PushCell(g_HLTVServers.GetInstanceNumber(server));
m_ServerStartFwd->Execute(); m_ServerStartFwd->Execute();
} }
void CForwardManager::CallOnServerShutdown(IHLTVServer *server) void CForwardManager::CallOnServerShutdown(IHLTVServer *server)
{ {
m_ServerShutdownFwd->PushCell(0); // TODO: Get right hltvinstance m_ServerShutdownFwd->PushCell(g_HLTVServers.GetInstanceNumber(server));
m_ServerShutdownFwd->Execute(); m_ServerShutdownFwd->Execute();
} }
@ -365,7 +366,13 @@ void CForwardManager::OnStartRecording_Post(const char *filename, bool bContinuo
if (m_StartRecordingFwd->GetFunctionCount() == 0) if (m_StartRecordingFwd->GetFunctionCount() == 0)
RETURN_META(MRES_IGNORED); RETURN_META(MRES_IGNORED);
m_StartRecordingFwd->PushCell(0); // TODO: Get current hltvserver index IDemoRecorder *recorder = META_IFACEPTR(IDemoRecorder);
HLTVServerWrapper *wrapper = g_HLTVServers.GetWrapper(recorder);
int instance = -1;
if (wrapper)
instance = wrapper->GetInstanceNumber();
m_StartRecordingFwd->PushCell(instance);
m_StartRecordingFwd->PushString(filename); m_StartRecordingFwd->PushString(filename);
m_StartRecordingFwd->Execute(); m_StartRecordingFwd->Execute();
@ -387,7 +394,12 @@ void CForwardManager::OnStopRecording_Post()
char *pDemoFile = (char *)recorder->GetDemoFile(); char *pDemoFile = (char *)recorder->GetDemoFile();
m_StopRecordingFwd->PushCell(0); // TODO: Get current hltvserver index HLTVServerWrapper *wrapper = g_HLTVServers.GetWrapper(recorder);
int instance = -1;
if (wrapper)
instance = wrapper->GetInstanceNumber();
m_StopRecordingFwd->PushCell(instance);
m_StopRecordingFwd->PushString(pDemoFile); m_StopRecordingFwd->PushString(pDemoFile);
m_StopRecordingFwd->PushCell(recorder->GetRecordingTick()); m_StopRecordingFwd->PushCell(recorder->GetRecordingTick());
m_StopRecordingFwd->Execute(); m_StopRecordingFwd->Execute();

11
hltvserverwrapper.cpp
View File

@ -277,6 +277,17 @@ HLTVServerWrapper *HLTVServerWrapperManager::GetWrapper(IHLTVServer *hltvserver)
return nullptr; return nullptr;
} }
HLTVServerWrapper *HLTVServerWrapperManager::GetWrapper(IDemoRecorder *demorecorder)
{
for (unsigned int i = 0; i < m_HLTVServers.length(); i++)
{
HLTVServerWrapper *wrapper = m_HLTVServers[i];
if (wrapper->GetDemoRecorder() == demorecorder)
return wrapper;
}
return nullptr;
}
int HLTVServerWrapperManager::GetInstanceNumber(IHLTVServer *hltvserver) int HLTVServerWrapperManager::GetInstanceNumber(IHLTVServer *hltvserver)
{ {
#if SOURCE_ENGINE == SE_CSGO #if SOURCE_ENGINE == SE_CSGO

1
hltvserverwrapper.h
View File

@ -73,6 +73,7 @@ public:
void AddServer(IHLTVServer *hltvserver); void AddServer(IHLTVServer *hltvserver);
void RemoveServer(IHLTVServer *hltvserver, bool bInformPlugins); void RemoveServer(IHLTVServer *hltvserver, bool bInformPlugins);
HLTVServerWrapper *GetWrapper(IHLTVServer *hltvserver); HLTVServerWrapper *GetWrapper(IHLTVServer *hltvserver);
HLTVServerWrapper *GetWrapper(IDemoRecorder *demorecorder);
int GetInstanceNumber(IHLTVServer *hltvserver); int GetInstanceNumber(IHLTVServer *hltvserver);
IDemoRecorder *GetDemoRecorderPtr(IHLTVServer *hltv); IDemoRecorder *GetDemoRecorderPtr(IHLTVServer *hltv);