Timer message hooked. Made g_iIsAg variable wide available.

LevShisterov · Mar 16, 2017 · 5b36c9c · 5b36c9c
1 parent 5ffd8f4
commit 5b36c9c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 5 deletions.
diff --git a/cl_dll/cdll_int.cpp b/cl_dll/cdll_int.cpp
@@ -50,8 +50,6 @@ TeamFortressViewport *gViewPort = NULL;
 PVOID hVehHandler = NULL;
 bool g_bDllDetaching = false;
 
-extern "C" int g_iIsAg;
-
 void InitInput (void);
 void ShutdownInput (void);
 void EV_HookEvents( void );

diff --git a/cl_dll/cl_dll.h b/cl_dll/cl_dll.h
@@ -37,3 +37,5 @@ typedef int (*pfnUserMsgHook)(const char *pszName, int iSize, void *pbuf);
 #include "../dlls/cdll_dll.h"
 
 extern cl_enginefunc_t gEngfuncs;
+
+extern "C" int g_iIsAg;
diff --git a/cl_dll/hud.h b/cl_dll/hud.h
@@ -525,6 +525,8 @@ class CHudTimer: public CHudBase
 	void Think(void);
 	int Draw(float flTime);
 
+	static int MsgFunc_Timer(const char *pszName, int iSize, void *pbuf);
+
 	void DoResync(void);
 	void ReadDemoTimerBuffer(int type, const unsigned char *buffer);
 	void CustomTimerCommand(void);

diff --git a/cl_dll/hud_timer.cpp b/cl_dll/hud_timer.cpp
@@ -42,8 +42,13 @@ enum RulesRequestStatus
 SOCKET g_timerSocket = NULL;	// We will declare socket here to not include winsocks in hud.h
 
 
+DECLARE_MESSAGE(m_Timer, Timer)
+
 int CHudTimer::Init(void)
 {
+	if (g_iIsAg)
+		HOOK_MESSAGE(Timer);
+
 	gHUD.AddHudElem(this);
 
 	m_iFlags |= HUD_ACTIVE;
@@ -86,6 +91,15 @@ int CHudTimer::VidInit(void)
 	return 1;
 };
 
+int CHudTimer::MsgFunc_Timer(const char *pszName, int iSize, void *pbuf)
+{
+	//BEGIN_READ(pbuf, iSize);
+	//int timelimit = READ_LONG();
+	//int effectiveTime = READ_LONG();
+
+	return 1;
+}
+
 void CHudTimer::DoResync(void)
 {
 	m_bDelayTimeleftReading = true;

diff --git a/cl_dll/view.cpp b/cl_dll/view.cpp
@@ -34,7 +34,6 @@ extern "C"
 	float	vecNewViewOrigin[3];
 	int		iHasNewViewOrigin;
 	int		iIsSpectator;
-	extern	int g_iIsAg;
 }
 
 #ifndef M_PI

diff --git a/dlls/h_export.cpp b/dlls/h_export.cpp
@@ -29,8 +29,6 @@
 enginefuncs_t g_engfuncs;
 globalvars_t  *gpGlobals;
 
-extern "C" int g_iIsAg;
-
 #ifdef _WIN32
 
 // Required DLL entry point

diff --git a/dlls/util.h b/dlls/util.h
@@ -26,6 +26,7 @@
 inline void MESSAGE_BEGIN( int msg_dest, int msg_type, const float *pOrigin, entvars_t *ent );  // implementation later in this file
 
 extern globalvars_t				*gpGlobals;
+extern "C" int g_iIsAg;
 
 // Use this instead of ALLOC_STRING on constant strings
 #define STRING(offset)		(const char *)(gpGlobals->pStringBase + (int)offset)