From 77a0af7c4f81764a7040a87e84feea6b0794ff70 Mon Sep 17 00:00:00 2001
From: Night Owl <sepulkarium45@yahoo.com>
Date: Mon, 10 Apr 2017 23:14:18 +0500
Subject: [PATCH] Fix build.

---
 cl_dll/CMakeLists.txt  | 2 +-
 dlls/aghl/agglobal.cpp | 2 +-
 dlls/player.h          | 2 +-
 ministl/algo.h         | 4 ++--
 ministl/defalloc.h     | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cl_dll/CMakeLists.txt b/cl_dll/CMakeLists.txt
index 2905e2e0..aaa7886c 100644
--- a/cl_dll/CMakeLists.txt
+++ b/cl_dll/CMakeLists.txt
@@ -80,7 +80,7 @@ set (CLDLL_SOURCES
 	input_xash3d.cpp
 	scoreboard.cpp
 	MOTD.cpp)
-include_directories (. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_shared ../game_shared ../public dmc ../dlls/dmc )
+include_directories (. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_shared ../game_shared ../public dmc ../dlls/dmc ../dlls/dmc .. ../dlls/aghl )
 
 if(USE_VOICEMGR)
 	#set(CLDLL_SOURCES
diff --git a/dlls/aghl/agglobal.cpp b/dlls/aghl/agglobal.cpp
index 0ac0f94f..8b37696d 100644
--- a/dlls/aghl/agglobal.cpp
+++ b/dlls/aghl/agglobal.cpp
@@ -13,7 +13,7 @@
 #include "agglobal.h"
 #include "gamerules.h"
 
-extern DLL_GLOBAL g_fGameOver;
+extern DLL_GLOBAL BOOL g_fGameOver;
 
 //TITLES FOR HALF-LIFE
 // Position command $position x y 
diff --git a/dlls/player.h b/dlls/player.h
index 3a533545..4b27d536 100644
--- a/dlls/player.h
+++ b/dlls/player.h
@@ -15,7 +15,7 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-//#include "pm_materials.h"
+#include "pm_materials.h"
 
 #define PLAYER_FATAL_FALL_SPEED		1024// approx 60 feet
 #define PLAYER_MAX_SAFE_FALL_SPEED	580// approx 20 feet
diff --git a/ministl/algo.h b/ministl/algo.h
index 23c7b42d..dcd636a6 100644
--- a/ministl/algo.h
+++ b/ministl/algo.h
@@ -77,7 +77,7 @@ void count_if(InputIterator first, InputIterator last, Predicate pred,
     while (first != last)
 	if (pred(*first++)) ++n;
 }
-
+/*
 template<class _II, class	_OI, class _Uop> inline
 	_OI	transform(_II _F, _II _L, _OI _X, _Uop _U)
 {for (;	_F != _L; ++_F,	++_X)
@@ -90,6 +90,6 @@ template<class _II1, class _II2, class _OI,	class _Bop>	inline
 *_X	= _B(*_F1, *_F2);
 return (_X); }
 // TEMPLATE	FUNCTION replace
-
+*/
 #endif
 
diff --git a/ministl/defalloc.h b/ministl/defalloc.h
index e59746bf..7c60166b 100644
--- a/ministl/defalloc.h
+++ b/ministl/defalloc.h
@@ -73,11 +73,11 @@ static inline void destroy(unsigned long**, unsigned long**) {}
 static inline void destroy(float**, float**) {}
 static inline void destroy(double**, double**) {}
 
-#ifdef __GNUG__
+/*#ifdef __GNUG__
 static inline void *operator new(size_t, void *place) { return place; }
 static inline void *operator new[](size_t, void *place) { return place; }
-#else
-#include <new.h>
-#endif
+#else*/
+#include <new>
+//#endif
 
 #endif