Fix build.

This commit is contained in:
Night Owl 2017-04-10 23:14:18 +05:00
parent 1ceb22e151
commit 77a0af7c4f
5 changed files with 9 additions and 9 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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