reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2025-01-28 22:48:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile

Browse Source
This commit is contained in:
s1lentq 2016-07-14 23:02:33 +07:00
parent 4a2029194b
commit 552a1d1bb4
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
regamedll/dlls/cbase.h
View File

@ -275,7 +275,7 @@ public:
virtual void Blocked(CBaseEntity *pOther) { if (m_pfnBlocked) (this->*m_pfnBlocked)(pOther); } virtual void Blocked(CBaseEntity *pOther) { if (m_pfnBlocked) (this->*m_pfnBlocked)(pOther); }
virtual CBaseEntity *Respawn() { return NULL; } virtual CBaseEntity *Respawn() { return NULL; }
#ifndef REGAMEDLL_FIXES #ifndef REGAMEDLL_ADD
// used by monsters that are created by the MonsterMaker // used by monsters that are created by the MonsterMaker
virtual void UpdateOwner() {} virtual void UpdateOwner() {}
#else #else
@ -313,7 +313,12 @@ public:
public: public:
// allow engine to allocate instance data // allow engine to allocate instance data
void *operator new(size_t stAllocateBlock, entvars_t *pevnew) { return ALLOC_PRIVATE(ENT(pevnew), stAllocateBlock); } void *operator new(size_t stAllocateBlock, entvars_t *pevnew) { return ALLOC_PRIVATE(ENT(pevnew), stAllocateBlock); }
// don't use this.
#if _MSC_VER >= 1200 // only build this code if MSVC++ 6.0 or higher
void operator delete(void *pMem, entvars_t *pevnew) { pevnew->flags |= FL_KILLME; } void operator delete(void *pMem, entvars_t *pevnew) { pevnew->flags |= FL_KILLME; }
#endif
void UpdateOnRemove(); void UpdateOnRemove();
void EXPORT SUB_Remove(); void EXPORT SUB_Remove();
void EXPORT SUB_DoNothing(); void EXPORT SUB_DoNothing();

2
regamedll/dlls/mapinfo.cpp
View File

@ -13,8 +13,8 @@ CMapInfo::CMapInfo()
// Should only be one of these. // Should only be one of these.
ALERT(at_warning, "Warning: Multiple info_map_parameters entities in map!\n"); ALERT(at_warning, "Warning: Multiple info_map_parameters entities in map!\n");
} }
#endif
else else
#endif
{ {
g_pMapInfo = this; g_pMapInfo = this;
} }

5
regamedll/regamedll/precompiled.h
View File

@ -3,6 +3,7 @@
#include "version/appversion.h" #include "version/appversion.h"
#include "osconfig.h" #include "osconfig.h"
#include "basetypes.h"
#include "asmlib.h" #include "asmlib.h"
#include "sse_mathfun.h" #include "sse_mathfun.h"
@ -26,12 +27,8 @@
#include "tier0/dbg.h" #include "tier0/dbg.h"
#include "dlls.h" #include "dlls.h"
#include "basetypes.h"
#include "interface.h" #include "interface.h"
#include "hookchains_impl.h" #include "hookchains_impl.h"
#include "regamedll.h" #include "regamedll.h"
#include "regamedll_interfaces.h" #include "regamedll_interfaces.h"