Browse Source

fix undefined symbols and conflicts on OpenWatcom

hl_urbicide
mittorn 5 years ago
parent
commit
9a08968453
  1. 1
      cl_dll/hl/hl_baseentity.cpp
  2. 4
      cl_dll/util.cpp
  3. 7
      dlls/nodes.cpp
  4. 2
      dlls/util.cpp

1
cl_dll/hl/hl_baseentity.cpp

@ -347,3 +347,4 @@ int CBasePlayerWeapon::ExtractClipAmmo( CBasePlayerWeapon *pWeapon ) { return 0;
void CBasePlayerWeapon::RetireWeapon( void ) { } void CBasePlayerWeapon::RetireWeapon( void ) { }
void CSoundEnt::InsertSound( int iType, const Vector &vecOrigin, int iVolume, float flDuration ) {} void CSoundEnt::InsertSound( int iType, const Vector &vecOrigin, int iVolume, float flDuration ) {}
void RadiusDamage( Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, float flRadius, int iClassIgnore, int bitsDamageType ){} void RadiusDamage( Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, float flRadius, int iClassIgnore, int bitsDamageType ){}
void CSprite::AnimateUntilDead( void ) {}

4
cl_dll/util.cpp

@ -33,10 +33,10 @@
#ifndef M_PI_F #ifndef M_PI_F
#define M_PI_F (float)M_PI #define M_PI_F (float)M_PI
#endif #endif
extern vec3_t vec3_origin; extern vec3_t vec3_origin;
#ifdef _MSC_VER // if C++ mangling differs from C symbol name
#if defined _MSC_VER || defined __WATCOMC__
vec3_t vec3_origin; vec3_t vec3_origin;
#endif #endif

7
dlls/nodes.cpp

@ -42,10 +42,13 @@ CGraph WorldGraph;
LINK_ENTITY_TO_CLASS( info_node, CNodeEnt ) LINK_ENTITY_TO_CLASS( info_node, CNodeEnt )
LINK_ENTITY_TO_CLASS( info_node_air, CNodeEnt ) LINK_ENTITY_TO_CLASS( info_node_air, CNodeEnt )
#if !defined _WIN32 #ifdef __DOS__
#include <direct.h>
#define CreateDirectoryA(p, n) mkdir(p)
#elif !defined _WIN32
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#define CreateDirectoryA(p, n) mkdir(p, 0777) #define CreateDirectoryA(p, n) mkdir(p,777)
#endif #endif
//========================================================= //=========================================================

2
dlls/util.cpp

@ -1729,7 +1729,7 @@ void CSaveRestoreBuffer::BufferRewind( int size )
m_pdata->size -= size; m_pdata->size -= size;
} }
#ifndef _WIN32 #if !defined _WIN32 && !defined __WATCOMC__
extern "C" { extern "C" {
unsigned _rotr( unsigned val, int shift ) unsigned _rotr( unsigned val, int shift )
{ {

Loading…
Cancel
Save