YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-23 21:24:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into opfor

Browse Source
This commit is contained in:
Andrey Akhmichin 2021-06-08 04:21:20 +05:00
commit b0e4b1740c
58 changed files with 274 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
.github/workflows/.github.yml vendored Normal file
View File

@ -0,0 +1,45 @@
name: build
on: [push, pull_request]
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: ubuntu-latest
cc: gcc
cxx: g++
- os: ubuntu-latest
cc: clang
cxx: clang++
env:
CC: ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Get SDL2 headers
uses: actions/checkout@v2
with:
repository: libsdl-org/SDL
ref: release-2.0.9
path: SDL2
- name: Link SDL2 headers into system path
run: |
sudo ln -s "$GITHUB_WORKSPACE/SDL2/include" /usr/local/include/SDL2
- name: Install dependencies
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get -y install gcc-multilib g++-multilib
- name: Build with xash3d-fwgs input
run: |
cmake -B build -S . -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined" && cmake --build build --target all
- name: Build with goldsource input
run: |
cmake -B build-gs -S . -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined" -DGOLDSOURCE_SUPPORT=ON && cmake --build build-gs --target all

2
README.md
View File

@ -1,4 +1,4 @@
# Half-Life SDK for Xash3D [![Build Status](https://travis-ci.org/FWGS/hlsdk-xash3d.svg)](https://travis-ci.org/FWGS/hlsdk-xash3d) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/FWGS/hlsdk-xash3d?svg=true)](https://ci.appveyor.com/project/a1batross/hlsdk-xash3d) # Half-Life SDK for Xash3D [![Build Status](https://github.com/FWGS/hlsdk-xash3d/actions/workflows/.github.yml/badge.svg?branch=master)](https://github.com/FWGS/hlsdk-xash3d/actions/workflows/.github.yml) [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/FWGS/hlsdk-xash3d?svg=true)](https://ci.appveyor.com/project/a1batross/hlsdk-xash3d)
Half-Life SDK for Xash3D & GoldSource with some fixes. Half-Life SDK for Xash3D & GoldSource with some fixes.

2
cl_dll/ev_hldm.cpp
View File

@ -1172,7 +1172,7 @@ enum crowbar_e
CROWBAR_ATTACK2MISS, CROWBAR_ATTACK2MISS,
CROWBAR_ATTACK2HIT, CROWBAR_ATTACK2HIT,
CROWBAR_ATTACK3MISS, CROWBAR_ATTACK3MISS,
#ifndef CROWBAR_IDLE_ANIM #if !CROWBAR_IDLE_ANIM
CROWBAR_ATTACK3HIT CROWBAR_ATTACK3HIT
#else #else
CROWBAR_ATTACK3HIT, CROWBAR_ATTACK3HIT,

8
cl_dll/in_camera.cpp
View File

@ -148,7 +148,7 @@ void DLLEXPORT CAM_Think( void )
float dist; float dist;
vec3_t camAngles; vec3_t camAngles;
float flSensitivity; float flSensitivity;
#ifdef LATER #if LATER
int i; int i;
#endif #endif
vec3_t viewangles; vec3_t viewangles;
@ -168,7 +168,7 @@ void DLLEXPORT CAM_Think( void )
if( !cam_thirdperson ) if( !cam_thirdperson )
return; return;
#ifdef LATER #if LATER
if( cam_contain->value ) if( cam_contain->value )
{ {
gEngfuncs.GetClientOrigin( origin ); gEngfuncs.GetClientOrigin( origin );
@ -315,7 +315,7 @@ void DLLEXPORT CAM_Think( void )
cam_old_mouse_y = cam_mouse.y * gHUD.GetSensitivity(); cam_old_mouse_y = cam_mouse.y * gHUD.GetSensitivity();
SetCursorPos( gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY() ); SetCursorPos( gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY() );
} }
#ifdef LATER #if LATER
if( cam_contain->value ) if( cam_contain->value )
{ {
// check new ideal // check new ideal
@ -368,7 +368,7 @@ void DLLEXPORT CAM_Think( void )
else else
camAngles[2] += ( cam_idealdist->value - camAngles[2] ) * 0.25f; camAngles[2] += ( cam_idealdist->value - camAngles[2] ) * 0.25f;
} }
#ifdef LATER #if LATER
if( cam_contain->value ) if( cam_contain->value )
{ {
// Test new position // Test new position

2
cl_dll/in_defs.h
View File

@ -16,7 +16,7 @@
// fall over // fall over
#define ROLL 2 #define ROLL 2
#ifdef _WIN32 #if _WIN32
#define HSPRITE HSPRITE_win32 #define HSPRITE HSPRITE_win32
#include <windows.h> #include <windows.h>
#undef HSPRITE #undef HSPRITE

60
cl_dll/input_goldsource.cpp
View File

@ -23,7 +23,7 @@
#include "keydefs.h" #include "keydefs.h"
#include "view.h" #include "view.h"
#ifndef _WIN32 #if !_WIN32
#define USE_SDL2 #define USE_SDL2
#endif #endif
@ -114,7 +114,7 @@ static SDLFunction sdlFunctions[] = {
}; };
#endif #endif
#ifdef _WIN32 #if _WIN32
#include <process.h> #include <process.h>
#else #else
typedef unsigned int DWORD; typedef unsigned int DWORD;
@ -149,14 +149,14 @@ extern cvar_t *cl_forwardspeed;
extern cvar_t *cl_pitchspeed; extern cvar_t *cl_pitchspeed;
extern cvar_t *cl_movespeedkey; extern cvar_t *cl_movespeedkey;
#ifdef _WIN32 #if _WIN32
static double s_flRawInputUpdateTime = 0.0f; static double s_flRawInputUpdateTime = 0.0f;
static bool m_bRawInput = false; static bool m_bRawInput = false;
static bool m_bMouseThread = false; static bool m_bMouseThread = false;
bool isMouseRelative = false; bool isMouseRelative = false;
#endif #endif
#ifdef _WIN32 #if _WIN32
#include "progdefs.h" #include "progdefs.h"
extern globalvars_t *gpGlobals; extern globalvars_t *gpGlobals;
#endif #endif
@ -184,7 +184,7 @@ static cvar_t *m_customaccel_max;
//Mouse move is raised to this power before being scaled by scale factor //Mouse move is raised to this power before being scaled by scale factor
static cvar_t *m_customaccel_exponent; static cvar_t *m_customaccel_exponent;
#ifdef _WIN32 #if _WIN32
// if threaded mouse is enabled then the time to sleep between polls // if threaded mouse is enabled then the time to sleep between polls
static cvar_t *m_mousethread_sleep; static cvar_t *m_mousethread_sleep;
#endif #endif
@ -276,7 +276,7 @@ cvar_t *joy_wwhack2;
int joy_avail, joy_advancedinit, joy_haspov; int joy_avail, joy_advancedinit, joy_haspov;
#ifdef _WIN32 #if _WIN32
unsigned int s_hMouseThreadId = 0; unsigned int s_hMouseThreadId = 0;
HANDLE s_hMouseThread = 0; HANDLE s_hMouseThread = 0;
HANDLE s_hMouseQuitEvent = 0; HANDLE s_hMouseQuitEvent = 0;
@ -300,7 +300,7 @@ void Force_CenterView_f (void)
} }
} }
#ifdef _WIN32 #if _WIN32
LONG mouseThreadActive = 0; LONG mouseThreadActive = 0;
LONG mouseThreadCenterX = 0; LONG mouseThreadCenterX = 0;
@ -382,14 +382,14 @@ void IN_SetMouseMode(bool enable)
if(enable) if(enable)
{ {
#ifdef _WIN32 #if _WIN32
if (mouseparmsvalid) if (mouseparmsvalid)
restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0); restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0);
m_bRawInput = CVAR_GET_FLOAT( "m_rawinput" ) != 0; m_bRawInput = CVAR_GET_FLOAT( "m_rawinput" ) != 0;
if(m_bRawInput) if(m_bRawInput)
{ {
#ifdef USE_SDL2 #if USE_SDL2
safe_pfnSDL_SetRelativeMouseMode(SDL_TRUE); safe_pfnSDL_SetRelativeMouseMode(SDL_TRUE);
#endif #endif
isMouseRelative = true; isMouseRelative = true;
@ -402,10 +402,10 @@ void IN_SetMouseMode(bool enable)
} }
else else
{ {
#ifdef _WIN32 #if _WIN32
if(isMouseRelative) if(isMouseRelative)
{ {
#ifdef USE_SDL2 #if USE_SDL2
safe_pfnSDL_SetRelativeMouseMode(SDL_FALSE); safe_pfnSDL_SetRelativeMouseMode(SDL_FALSE);
#endif #endif
isMouseRelative = false; isMouseRelative = false;
@ -423,7 +423,7 @@ void IN_SetMouseMode(bool enable)
void IN_SetVisibleMouse(bool visible) void IN_SetVisibleMouse(bool visible)
{ {
#ifdef _WIN32 #if _WIN32
bool lockEntered = MouseThread_ActiveLock_Enter(); bool lockEntered = MouseThread_ActiveLock_Enter();
#endif #endif
@ -431,7 +431,7 @@ void IN_SetVisibleMouse(bool visible)
IN_SetMouseMode(!visible); IN_SetMouseMode(!visible);
#ifdef _WIN32 #if _WIN32
UpdateMouseThreadActive(); UpdateMouseThreadActive();
if(lockEntered) MouseThread_ActiveLock_Exit(); if(lockEntered) MouseThread_ActiveLock_Exit();
#endif #endif
@ -448,7 +448,7 @@ void GoldSourceInput::IN_ActivateMouse (void)
{ {
if (mouseinitialized) if (mouseinitialized)
{ {
#ifdef _WIN32 #if _WIN32
bool lockEntered = MouseThread_ActiveLock_Enter(); bool lockEntered = MouseThread_ActiveLock_Enter();
#endif #endif
@ -456,7 +456,7 @@ void GoldSourceInput::IN_ActivateMouse (void)
mouseactive = 1; mouseactive = 1;
#ifdef _WIN32 #if _WIN32
UpdateMouseThreadActive(); UpdateMouseThreadActive();
if(lockEntered) MouseThread_ActiveLock_Exit(); if(lockEntered) MouseThread_ActiveLock_Exit();
#endif #endif
@ -476,7 +476,7 @@ void GoldSourceInput::IN_DeactivateMouse (void)
{ {
if (mouseinitialized) if (mouseinitialized)
{ {
#ifdef _WIN32 #if _WIN32
bool lockEntered = MouseThread_ActiveLock_Enter(); bool lockEntered = MouseThread_ActiveLock_Enter();
#endif #endif
@ -484,7 +484,7 @@ void GoldSourceInput::IN_DeactivateMouse (void)
mouseactive = 0; mouseactive = 0;
#ifdef _WIN32 #if _WIN32
UpdateMouseThreadActive(); UpdateMouseThreadActive();
if(lockEntered) MouseThread_ActiveLock_Exit(); if(lockEntered) MouseThread_ActiveLock_Exit();
#endif #endif
@ -502,7 +502,7 @@ void GoldSourceInput::IN_StartupMouse (void)
return; return;
mouseinitialized = 1; mouseinitialized = 1;
#ifdef _WIN32 #if _WIN32
mouseparmsvalid = SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0); mouseparmsvalid = SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0);
if (mouseparmsvalid) if (mouseparmsvalid)
@ -537,7 +537,7 @@ void GoldSourceInput::IN_Shutdown (void)
{ {
IN_DeactivateMouse (); IN_DeactivateMouse ();
#ifdef _WIN32 #if _WIN32
if ( s_hMouseQuitEvent ) if ( s_hMouseQuitEvent )
{ {
SetEvent( s_hMouseQuitEvent ); SetEvent( s_hMouseQuitEvent );
@ -597,7 +597,7 @@ FIXME: Call through to engine?
void IN_ResetMouse( void ) void IN_ResetMouse( void )
{ {
// no work to do in SDL // no work to do in SDL
#ifdef _WIN32 #if _WIN32
// reset only if mouse is active and not in visible mode: // reset only if mouse is active and not in visible mode:
if(mouseactive && !iVisibleMouse && gEngfuncs.GetWindowCenterX && gEngfuncs.GetWindowCenterY) if(mouseactive && !iVisibleMouse && gEngfuncs.GetWindowCenterX && gEngfuncs.GetWindowCenterY)
{ {
@ -712,7 +712,7 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY)
if(active) if(active)
{ {
int deltaX, deltaY; int deltaX, deltaY;
#ifdef _WIN32 #if _WIN32
if ( !m_bRawInput ) if ( !m_bRawInput )
{ {
if ( m_bMouseThread ) if ( m_bMouseThread )
@ -746,7 +746,7 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY)
#endif #endif
} }
#ifdef _WIN32 #if _WIN32
if ( !m_bRawInput ) if ( !m_bRawInput )
{ {
if ( m_bMouseThread ) if ( m_bMouseThread )
@ -771,7 +771,7 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY)
my_accum = 0; my_accum = 0;
// reset mouse position if required, so there is room to move: // reset mouse position if required, so there is room to move:
#ifdef _WIN32 #if _WIN32
// do not reset if mousethread would do it: // do not reset if mousethread would do it:
if ( m_bRawInput || !m_bMouseThread ) if ( m_bRawInput || !m_bMouseThread )
#else #else
@ -779,7 +779,7 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY)
#endif #endif
IN_ResetMouse(); IN_ResetMouse();
#ifdef _WIN32 #if _WIN32
// update m_bRawInput occasionally: // update m_bRawInput occasionally:
if ( gpGlobals && gpGlobals->time - s_flRawInputUpdateTime > 1.0f ) if ( gpGlobals && gpGlobals->time - s_flRawInputUpdateTime > 1.0f )
{ {
@ -791,14 +791,14 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY)
if(m_bRawInput && !isMouseRelative) if(m_bRawInput && !isMouseRelative)
{ {
#ifdef USE_SDL2 #if USE_SDL2
safe_pfnSDL_SetRelativeMouseMode(SDL_TRUE); safe_pfnSDL_SetRelativeMouseMode(SDL_TRUE);
#endif #endif
isMouseRelative = true; isMouseRelative = true;
} }
else if(!m_bRawInput && isMouseRelative) else if(!m_bRawInput && isMouseRelative)
{ {
#ifdef USE_SDL2 #if USE_SDL2
safe_pfnSDL_SetRelativeMouseMode(SDL_FALSE); safe_pfnSDL_SetRelativeMouseMode(SDL_FALSE);
#endif #endif
isMouseRelative = false; isMouseRelative = false;
@ -928,7 +928,7 @@ void GoldSourceInput::IN_Accumulate (void)
{ {
if (mouseactive) if (mouseactive)
{ {
#ifdef _WIN32 #if _WIN32
if ( !m_bRawInput ) if ( !m_bRawInput )
{ {
if ( !m_bMouseThread ) if ( !m_bMouseThread )
@ -956,7 +956,7 @@ void GoldSourceInput::IN_Accumulate (void)
} }
// force the mouse to the center, so there's room to move // force the mouse to the center, so there's room to move
#ifdef _WIN32 #if _WIN32
// do not reset if mousethread would do it: // do not reset if mousethread would do it:
if ( m_bRawInput || !m_bMouseThread ) if ( m_bRawInput || !m_bMouseThread )
#else #else
@ -1570,7 +1570,7 @@ void GoldSourceInput::IN_Init (void)
m_customaccel_max = gEngfuncs.pfnRegisterVariable ( "m_customaccel_max", "0", FCVAR_ARCHIVE ); m_customaccel_max = gEngfuncs.pfnRegisterVariable ( "m_customaccel_max", "0", FCVAR_ARCHIVE );
m_customaccel_exponent = gEngfuncs.pfnRegisterVariable ( "m_customaccel_exponent", "1", FCVAR_ARCHIVE ); m_customaccel_exponent = gEngfuncs.pfnRegisterVariable ( "m_customaccel_exponent", "1", FCVAR_ARCHIVE );
#ifdef _WIN32 #if _WIN32
m_bRawInput = CVAR_GET_FLOAT( "m_rawinput" ) != 0; m_bRawInput = CVAR_GET_FLOAT( "m_rawinput" ) != 0;
m_bMouseThread = gEngfuncs.CheckParm ("-mousethread", NULL ) != NULL; m_bMouseThread = gEngfuncs.CheckParm ("-mousethread", NULL ) != NULL;
m_mousethread_sleep = gEngfuncs.pfnRegisterVariable ( "m_mousethread_sleep", "1", FCVAR_ARCHIVE ); // default to less than 1000 Hz m_mousethread_sleep = gEngfuncs.pfnRegisterVariable ( "m_mousethread_sleep", "1", FCVAR_ARCHIVE ); // default to less than 1000 Hz
@ -1601,7 +1601,7 @@ void GoldSourceInput::IN_Init (void)
#endif #endif
#ifdef USE_SDL2 #ifdef USE_SDL2
#ifdef __APPLE__ #if __APPLE__
#define SDL2_FULL_LIBNAME "libsdl2-2.0.0.dylib" #define SDL2_FULL_LIBNAME "libsdl2-2.0.0.dylib"
#else #else
#define SDL2_FULL_LIBNAME "libSDL2-2.0.so.0" #define SDL2_FULL_LIBNAME "libSDL2-2.0.so.0"

2
cl_dll/tf_defs.h
View File

@ -46,7 +46,7 @@
// Debug Options // Debug Options
//#define MAP_DEBUG // Debug for Map code. I suggest running in a hi-res //#define MAP_DEBUG // Debug for Map code. I suggest running in a hi-res
// mode and/or piping the output from the server to a file. // mode and/or piping the output from the server to a file.
#ifdef MAP_DEBUG #if MAP_DEBUG
#define MDEBUG(x) x #define MDEBUG(x) x
#else #else
#define MDEBUG(x) #define MDEBUG(x)

2
dlls/AI_BaseNPC_Schedule.cpp
View File

@ -181,7 +181,7 @@ BOOL CBaseMonster :: FScheduleValid ( void )
if ( HasConditions( m_pSchedule->iInterruptMask | bits_COND_SCHEDULE_DONE | bits_COND_TASK_FAILED ) ) if ( HasConditions( m_pSchedule->iInterruptMask | bits_COND_SCHEDULE_DONE | bits_COND_TASK_FAILED ) )
{ {
#ifdef DEBUG #if DEBUG
if ( HasConditions ( bits_COND_TASK_FAILED ) && m_failSchedule == SCHED_NONE ) if ( HasConditions ( bits_COND_TASK_FAILED ) && m_failSchedule == SCHED_NONE )
{ {
// fail! Send a visual indicator. // fail! Send a visual indicator.

2
dlls/apache.cpp
View File

@ -12,7 +12,7 @@
* use or distribution of this code by or to any unlicensed person is illegal. * use or distribution of this code by or to any unlicensed person is illegal.
* *
****/ ****/
#ifndef OEM_BUILD #if !OEM_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"

4
dlls/barnacle.cpp
View File

@ -59,7 +59,7 @@ public:
// FIXME: need a custom barnacle model with non-generic hitgroup // FIXME: need a custom barnacle model with non-generic hitgroup
// otherwise we can apply to damage to tongue instead of body // otherwise we can apply to damage to tongue instead of body
#ifdef BARNACLE_FIX_VISIBILITY #if BARNACLE_FIX_VISIBILITY
void SetObjectCollisionBox( void ) void SetObjectCollisionBox( void )
{ {
pev->absmin = pev->origin + Vector( -16.0f, -16.0f, -m_flCachedLength ); pev->absmin = pev->origin + Vector( -16.0f, -16.0f, -m_flCachedLength );
@ -162,7 +162,7 @@ void CBarnacle::BarnacleThink( void )
CBaseEntity *pTouchEnt; CBaseEntity *pTouchEnt;
CBaseMonster *pVictim; CBaseMonster *pVictim;
float flLength; float flLength;
#ifdef BARNACLE_FIX_VISIBILITY #if BARNACLE_FIX_VISIBILITY
if( m_flCachedLength != ( m_flAltitude + m_flTongueAdj ) || ( pev->absmin.z != pev->origin.z + -m_flCachedLength ) ) if( m_flCachedLength != ( m_flAltitude + m_flTongueAdj ) || ( pev->absmin.z != pev->origin.z + -m_flCachedLength ) )
{ {
// recalc collision box here to avoid barnacle disappears bug // recalc collision box here to avoid barnacle disappears bug

2
dlls/bigmomma.cpp
View File

@ -12,7 +12,7 @@
* use or distribution of this code by or to any unlicensed person is illegal. * use or distribution of this code by or to any unlicensed person is illegal.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
//========================================================= //=========================================================
// monster template // monster template

4
dlls/cbase.cpp
View File

@ -98,7 +98,7 @@ static DLL_FUNCTIONS gFunctionTable =
static void SetObjectCollisionBox( entvars_t *pev ); static void SetObjectCollisionBox( entvars_t *pev );
#ifndef _WIN32 #if !_WIN32
extern "C" { extern "C" {
#endif #endif
int GetEntityAPI( DLL_FUNCTIONS *pFunctionTable, int interfaceVersion ) int GetEntityAPI( DLL_FUNCTIONS *pFunctionTable, int interfaceVersion )
@ -125,7 +125,7 @@ int GetEntityAPI2( DLL_FUNCTIONS *pFunctionTable, int *interfaceVersion )
return TRUE; return TRUE;
} }
#ifndef _WIN32 #if !_WIN32
} }
#endif #endif

4
dlls/cbase.h
View File

@ -312,7 +312,7 @@ public:
} }
// Ugly code to lookup all functions to make sure they are exported when set. // Ugly code to lookup all functions to make sure they are exported when set.
#ifdef _DEBUG #if _DEBUG
void FunctionCheck( void *pFunction, char *name ) void FunctionCheck( void *pFunction, char *name )
{ {
if( pFunction && !NAME_FOR_FUNCTION( pFunction ) ) if( pFunction && !NAME_FOR_FUNCTION( pFunction ) )
@ -396,7 +396,7 @@ public:
// Normally it's illegal to cast a pointer to a member function of a derived class to a pointer to a // Normally it's illegal to cast a pointer to a member function of a derived class to a pointer to a
// member function of a base class. static_cast is a sleezy way around that problem. // member function of a base class. static_cast is a sleezy way around that problem.
#ifdef _DEBUG #if _DEBUG
#define SetThink( a ) ThinkSet( static_cast <void (CBaseEntity::*)(void)> (a), #a ) #define SetThink( a ) ThinkSet( static_cast <void (CBaseEntity::*)(void)> (a), #a )
#define SetTouch( a ) TouchSet( static_cast <void (CBaseEntity::*)(CBaseEntity *)> (a), #a ) #define SetTouch( a ) TouchSet( static_cast <void (CBaseEntity::*)(CBaseEntity *)> (a), #a )

8
dlls/client.cpp
View File

@ -210,7 +210,7 @@ void ClientPutInServer( edict_t *pEntity )
pPlayer->pev->iuser2 = 0; pPlayer->pev->iuser2 = 0;
} }
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
#include "voice_gamemgr.h" #include "voice_gamemgr.h"
extern CVoiceGameMgr g_VoiceGameMgr; extern CVoiceGameMgr g_VoiceGameMgr;
#endif #endif
@ -406,7 +406,7 @@ void Host_Say( edict_t *pEntity, int teamonly )
if( !( client->IsNetClient() ) ) // Not a client ? (should never be true) if( !( client->IsNetClient() ) ) // Not a client ? (should never be true)
continue; continue;
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
// can the receiver hear the sender? or has he muted him? // can the receiver hear the sender? or has he muted him?
if( g_VoiceGameMgr.PlayerHasBlockedPlayer( client, player ) ) if( g_VoiceGameMgr.PlayerHasBlockedPlayer( client, player ) )
continue; continue;
@ -1658,7 +1658,7 @@ void RegisterEncoders( void )
int GetWeaponData( struct edict_s *player, struct weapon_data_s *info ) int GetWeaponData( struct edict_s *player, struct weapon_data_s *info )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
int i; int i;
weapon_data_t *item; weapon_data_t *item;
entvars_t *pev = &player->v; entvars_t *pev = &player->v;
@ -1787,7 +1787,7 @@ void UpdateClientData( const struct edict_s *ent, int sendweapons, struct client
cd->iuser1 = pev->iuser1; cd->iuser1 = pev->iuser1;
cd->iuser2 = pev->iuser2; cd->iuser2 = pev->iuser2;
} }
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
if( sendweapons ) if( sendweapons )
{ {
if( pl ) if( pl )

2
dlls/controller.cpp
View File

@ -12,7 +12,7 @@
* use or distribution of this code by or to any unlicensed person is illegal. * use or distribution of this code by or to any unlicensed person is illegal.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
//========================================================= //=========================================================
// CONTROLLER // CONTROLLER

14
dlls/crossbow.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -23,7 +23,7 @@
#include "player.h" #include "player.h"
#include "gamerules.h" #include "gamerules.h"
#ifndef CLIENT_DLL #if !CLIENT_DLL
#define BOLT_AIR_VELOCITY 2000 #define BOLT_AIR_VELOCITY 2000
#define BOLT_WATER_VELOCITY 1000 #define BOLT_WATER_VELOCITY 1000
@ -338,7 +338,7 @@ void CCrossbow::Holster( int skiplocal /* = 0 */ )
void CCrossbow::PrimaryAttack( void ) void CCrossbow::PrimaryAttack( void )
{ {
#ifdef CLIENT_DLL #if CLIENT_DLL
if( m_fInZoom && bIsMultiplayer() ) if( m_fInZoom && bIsMultiplayer() )
#else #else
if( m_fInZoom && g_pGameRules->IsMultiplayer() ) if( m_fInZoom && g_pGameRules->IsMultiplayer() )
@ -368,7 +368,7 @@ void CCrossbow::FireSniperBolt()
m_iClip--; m_iClip--;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -386,7 +386,7 @@ void CCrossbow::FireSniperBolt()
UTIL_TraceLine( vecSrc, vecSrc + vecDir * 8192, dont_ignore_monsters, m_pPlayer->edict(), &tr ); UTIL_TraceLine( vecSrc, vecSrc + vecDir * 8192, dont_ignore_monsters, m_pPlayer->edict(), &tr );
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( tr.pHit->v.takedamage ) if( tr.pHit->v.takedamage )
{ {
ClearMultiDamage(); ClearMultiDamage();
@ -411,7 +411,7 @@ void CCrossbow::FireBolt()
m_iClip--; m_iClip--;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -427,7 +427,7 @@ void CCrossbow::FireBolt()
anglesAim.x = -anglesAim.x; anglesAim.x = -anglesAim.x;
#ifndef CLIENT_DLL #if !CLIENT_DLL
Vector vecSrc = m_pPlayer->GetGunPosition() - gpGlobals->v_up * 2.0f; Vector vecSrc = m_pPlayer->GetGunPosition() - gpGlobals->v_up * 2.0f;
Vector vecDir = gpGlobals->v_forward; Vector vecDir = gpGlobals->v_forward;

18
dlls/crowbar.cpp
View File

@ -37,7 +37,7 @@ enum crowbar_e
CROWBAR_ATTACK2MISS, CROWBAR_ATTACK2MISS,
CROWBAR_ATTACK2HIT, CROWBAR_ATTACK2HIT,
CROWBAR_ATTACK3MISS, CROWBAR_ATTACK3MISS,
#ifndef CROWBAR_IDLE_ANIM #if !CROWBAR_IDLE_ANIM
CROWBAR_ATTACK3HIT CROWBAR_ATTACK3HIT
#else #else
CROWBAR_ATTACK3HIT, CROWBAR_ATTACK3HIT,
@ -157,7 +157,7 @@ void CCrowbar::PrimaryAttack()
{ {
if( !Swing( 1 ) ) if( !Swing( 1 ) )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
SetThink( &CCrowbar::SwingAgain ); SetThink( &CCrowbar::SwingAgain );
pev->nextthink = gpGlobals->time + 0.1f; pev->nextthink = gpGlobals->time + 0.1f;
#endif #endif
@ -186,7 +186,7 @@ int CCrowbar::Swing( int fFirst )
UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( tr.flFraction >= 1.0f ) if( tr.flFraction >= 1.0f )
{ {
UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr );
@ -214,7 +214,7 @@ int CCrowbar::Swing( int fFirst )
{ {
// miss // miss
m_flNextPrimaryAttack = GetNextAttackDelay( 0.5 ); m_flNextPrimaryAttack = GetNextAttackDelay( 0.5 );
#ifdef CROWBAR_IDLE_ANIM #if CROWBAR_IDLE_ANIM
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
#endif #endif
// player "shoot" animation // player "shoot" animation
@ -239,7 +239,7 @@ int CCrowbar::Swing( int fFirst )
// player "shoot" animation // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
#ifndef CLIENT_DLL #if !CLIENT_DLL
// hit // hit
fDidHit = TRUE; fDidHit = TRUE;
CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit ); CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
@ -254,7 +254,7 @@ int CCrowbar::Swing( int fFirst )
// If building with the clientside weapon prediction system, // If building with the clientside weapon prediction system,
// UTIL_WeaponTimeBase() is always 0 and m_flNextPrimaryAttack is >= -1.0f, thus making // UTIL_WeaponTimeBase() is always 0 and m_flNextPrimaryAttack is >= -1.0f, thus making
// m_flNextPrimaryAttack + 1 < UTIL_WeaponTimeBase() always evaluate to false. // m_flNextPrimaryAttack + 1 < UTIL_WeaponTimeBase() always evaluate to false.
#ifdef CLIENT_WEAPONS #if CLIENT_WEAPONS
if( ( m_flNextPrimaryAttack + 1.0f == UTIL_WeaponTimeBase() ) || g_pGameRules->IsMultiplayer() ) if( ( m_flNextPrimaryAttack + 1.0f == UTIL_WeaponTimeBase() ) || g_pGameRules->IsMultiplayer() )
#else #else
if( ( m_flNextPrimaryAttack + 1.0f < UTIL_WeaponTimeBase() ) || g_pGameRules->IsMultiplayer() ) if( ( m_flNextPrimaryAttack + 1.0f < UTIL_WeaponTimeBase() ) || g_pGameRules->IsMultiplayer() )
@ -290,7 +290,7 @@ int CCrowbar::Swing( int fFirst )
if( !pEntity->IsAlive() ) if( !pEntity->IsAlive() )
{ {
#ifdef CROWBAR_FIX_RAPID_CROWBAR #if CROWBAR_FIX_RAPID_CROWBAR
m_flNextPrimaryAttack = GetNextAttackDelay(0.25); m_flNextPrimaryAttack = GetNextAttackDelay(0.25);
#endif #endif
return TRUE; return TRUE;
@ -343,13 +343,13 @@ int CCrowbar::Swing( int fFirst )
m_flNextPrimaryAttack = GetNextAttackDelay( 0.25f ); m_flNextPrimaryAttack = GetNextAttackDelay( 0.25f );
#endif #endif
} }
#ifdef CROWBAR_IDLE_ANIM #if CROWBAR_IDLE_ANIM
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 );
#endif #endif
return fDidHit; return fDidHit;
} }
#ifdef CROWBAR_IDLE_ANIM #if CROWBAR_IDLE_ANIM
void CCrowbar::WeaponIdle( void ) void CCrowbar::WeaponIdle( void )
{ {
if( m_flTimeWeaponIdle < UTIL_WeaponTimeBase() ) if( m_flTimeWeaponIdle < UTIL_WeaponTimeBase() )

2
dlls/doors.cpp
View File

@ -685,7 +685,7 @@ void CBaseDoor::DoorGoDown( void )
if( !FBitSet( pev->spawnflags, SF_DOOR_SILENT ) ) if( !FBitSet( pev->spawnflags, SF_DOOR_SILENT ) )
if( m_toggle_state != TS_GOING_UP && m_toggle_state != TS_GOING_DOWN ) if( m_toggle_state != TS_GOING_UP && m_toggle_state != TS_GOING_DOWN )
EMIT_SOUND( ENT( pev ), CHAN_STATIC, STRING( pev->noiseMoving ), 1.0f, ATTN_NORM ); EMIT_SOUND( ENT( pev ), CHAN_STATIC, STRING( pev->noiseMoving ), 1.0f, ATTN_NORM );
#ifdef DOOR_ASSERT #if DOOR_ASSERT
ASSERT( m_toggle_state == TS_AT_TOP ); ASSERT( m_toggle_state == TS_AT_TOP );
#endif // DOOR_ASSERT #endif // DOOR_ASSERT
m_toggle_state = TS_GOING_DOWN; m_toggle_state = TS_GOING_DOWN;

16
dlls/egon.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -178,7 +178,7 @@ void CEgon::Attack( void )
Vector vecSrc = m_pPlayer->GetGunPosition(); Vector vecSrc = m_pPlayer->GetGunPosition();
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -252,7 +252,7 @@ void CEgon::Fire( const Vector &vecOrigSrc, const Vector &vecDir )
if( tr.fAllSolid ) if( tr.fAllSolid )
return; return;
#ifndef CLIENT_DLL #if !CLIENT_DLL
CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit ); CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
if( pEntity == NULL ) if( pEntity == NULL )
@ -275,7 +275,7 @@ void CEgon::Fire( const Vector &vecOrigSrc, const Vector &vecDir )
switch( m_fireMode ) switch( m_fireMode )
{ {
case FIRE_NARROW: case FIRE_NARROW:
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( pev->dmgtime < gpGlobals->time ) if( pev->dmgtime < gpGlobals->time )
{ {
// Narrow mode only does damage to the entity it hits // Narrow mode only does damage to the entity it hits
@ -311,7 +311,7 @@ void CEgon::Fire( const Vector &vecOrigSrc, const Vector &vecDir )
timedist = ( pev->dmgtime - gpGlobals->time ) / GetPulseInterval(); timedist = ( pev->dmgtime - gpGlobals->time ) / GetPulseInterval();
break; break;
case FIRE_WIDE: case FIRE_WIDE:
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( pev->dmgtime < gpGlobals->time ) if( pev->dmgtime < gpGlobals->time )
{ {
// wide mode does damage to the ent, and radius damage // wide mode does damage to the ent, and radius damage
@ -373,7 +373,7 @@ void CEgon::Fire( const Vector &vecOrigSrc, const Vector &vecDir )
void CEgon::UpdateEffect( const Vector &startPoint, const Vector &endPoint, float timeBlend ) void CEgon::UpdateEffect( const Vector &startPoint, const Vector &endPoint, float timeBlend )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( !m_pBeam ) if( !m_pBeam )
{ {
CreateEffect(); CreateEffect();
@ -399,7 +399,7 @@ void CEgon::UpdateEffect( const Vector &startPoint, const Vector &endPoint, floa
void CEgon::CreateEffect( void ) void CEgon::CreateEffect( void )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
DestroyEffect(); DestroyEffect();
m_pBeam = CBeam::BeamCreate( EGON_BEAM_SPRITE, 40 ); m_pBeam = CBeam::BeamCreate( EGON_BEAM_SPRITE, 40 );
@ -445,7 +445,7 @@ void CEgon::CreateEffect( void )
void CEgon::DestroyEffect( void ) void CEgon::DestroyEffect( void )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( m_pBeam ) if( m_pBeam )
{ {
UTIL_Remove( m_pBeam ); UTIL_Remove( m_pBeam );

2
dlls/exportdef.h
View File

@ -2,7 +2,7 @@
#ifndef EXPORTDEF_H #ifndef EXPORTDEF_H
#define EXPORTDEF_H #define EXPORTDEF_H
#if defined _WIN32 || defined __CYGWIN__ #if defined _WIN32 || defined __CYGWIN__
#ifdef __GNUC__ #if __GNUC__
#define EXPORT __attribute__ ((dllexport)) #define EXPORT __attribute__ ((dllexport))
#else #else
#define EXPORT __declspec(dllexport) // Note: actually gcc seems to also supports this syntax. #define EXPORT __declspec(dllexport) // Note: actually gcc seems to also supports this syntax.

6
dlls/extdll.h
View File

@ -21,12 +21,12 @@
// //
// Allow "DEBUG" in addition to default "_DEBUG" // Allow "DEBUG" in addition to default "_DEBUG"
#ifdef _DEBUG #if _DEBUG
#define DEBUG 1 #define DEBUG 1
#endif #endif
// Silence certain warnings // Silence certain warnings
#ifdef _MSC_VER #if _MSC_VER
#pragma warning(disable : 4244) // int or float down-conversion #pragma warning(disable : 4244) // int or float down-conversion
#pragma warning(disable : 4305) // int or float data truncation #pragma warning(disable : 4305) // int or float data truncation
#pragma warning(disable : 4201) // nameless struct/union #pragma warning(disable : 4201) // nameless struct/union
@ -35,7 +35,7 @@
#endif #endif
// Prevent tons of unused windows definitions // Prevent tons of unused windows definitions
#ifdef _WIN32 #if _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define NOWINRES #define NOWINRES
#define NOSERVICE #define NOSERVICE

2
dlls/gargantua.cpp
View File

@ -12,7 +12,7 @@
* use or distribution of this code by or to any unlicensed person is illegal. * use or distribution of this code by or to any unlicensed person is illegal.
* *
****/ ****/
#ifndef OEM_BUILD #if !OEM_BUILD
//========================================================= //=========================================================
// Gargantua // Gargantua

24
dlls/gauss.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -46,7 +46,7 @@ LINK_ENTITY_TO_CLASS( weapon_gauss, CGauss )
float CGauss::GetFullChargeTime( void ) float CGauss::GetFullChargeTime( void )
{ {
#ifdef CLIENT_DLL #if CLIENT_DLL
if( bIsMultiplayer() ) if( bIsMultiplayer() )
#else #else
if( g_pGameRules->IsMultiplayer() ) if( g_pGameRules->IsMultiplayer() )
@ -58,7 +58,7 @@ float CGauss::GetFullChargeTime( void )
return 4.0f; return 4.0f;
} }
#ifdef CLIENT_DLL #if CLIENT_DLL
extern int g_irunninggausspred; extern int g_irunninggausspred;
#endif #endif
@ -228,7 +228,7 @@ void CGauss::SecondaryAttack()
// during the charging process, eat one bit of ammo every once in a while // during the charging process, eat one bit of ammo every once in a while
if( UTIL_WeaponTimeBase() >= m_pPlayer->m_flNextAmmoBurn && m_pPlayer->m_flNextAmmoBurn != 1000 ) if( UTIL_WeaponTimeBase() >= m_pPlayer->m_flNextAmmoBurn && m_pPlayer->m_flNextAmmoBurn != 1000 )
{ {
#ifdef CLIENT_DLL #if CLIENT_DLL
if( bIsMultiplayer() ) if( bIsMultiplayer() )
#else #else
if( g_pGameRules->IsMultiplayer() ) if( g_pGameRules->IsMultiplayer() )
@ -271,7 +271,7 @@ void CGauss::SecondaryAttack()
if( m_iSoundState == 0 ) if( m_iSoundState == 0 )
ALERT( at_console, "sound state %d\n", m_iSoundState ); ALERT( at_console, "sound state %d\n", m_iSoundState );
#ifdef GAUSS_OVERCHARGE_FIX #if GAUSS_OVERCHARGE_FIX
if (!overcharge) if (!overcharge)
#endif #endif
PLAYBACK_EVENT_FULL( FEV_NOTHOST, m_pPlayer->edict(), m_usGaussSpin, 0.0f, g_vecZero, g_vecZero, 0.0f, 0.0f, pitch, 0, ( m_iSoundState == SND_CHANGE_PITCH ) ? 1 : 0, 0 ); PLAYBACK_EVENT_FULL( FEV_NOTHOST, m_pPlayer->edict(), m_usGaussSpin, 0.0f, g_vecZero, g_vecZero, 0.0f, 0.0f, pitch, 0, ( m_iSoundState == SND_CHANGE_PITCH ) ? 1 : 0, 0 );
@ -284,7 +284,7 @@ void CGauss::SecondaryAttack()
if( overcharge ) if( overcharge )
{ {
// Player charged up too long. Zap him. // Player charged up too long. Zap him.
#ifdef GAUSS_OVERCHARGE_FIX #if GAUSS_OVERCHARGE_FIX
PLAYBACK_EVENT_FULL( FEV_NOTHOST, m_pPlayer->edict(), m_usGaussSpin, 0.0, g_vecZero, g_vecZero, 0.0, 0.0, pitch, 0, 0, 1 ); PLAYBACK_EVENT_FULL( FEV_NOTHOST, m_pPlayer->edict(), m_usGaussSpin, 0.0, g_vecZero, g_vecZero, 0.0, 0.0, pitch, 0, 0, 1 );
#endif #endif
EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_WEAPON, "weapons/electro4.wav", 1.0f, ATTN_NORM, 0, 80 + RANDOM_LONG( 0, 0x3f ) ); EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_WEAPON, "weapons/electro4.wav", 1.0f, ATTN_NORM, 0, 80 + RANDOM_LONG( 0, 0x3f ) );
@ -293,7 +293,7 @@ void CGauss::SecondaryAttack()
m_fInAttack = 0; m_fInAttack = 0;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.0f; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 1.0f;
m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1.0f; m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1.0f;
#ifndef CLIENT_DLL #if !CLIENT_DLL
m_pPlayer->TakeDamage( VARS( eoNullEntity ), VARS( eoNullEntity ), 50, DMG_SHOCK ); m_pPlayer->TakeDamage( VARS( eoNullEntity ), VARS( eoNullEntity ), 50, DMG_SHOCK );
UTIL_ScreenFade( m_pPlayer, Vector( 255, 128, 0 ), 2, 0.5f, 128, FFADE_IN ); UTIL_ScreenFade( m_pPlayer, Vector( 255, 128, 0 ), 2, 0.5f, 128, FFADE_IN );
#endif #endif
@ -331,7 +331,7 @@ void CGauss::StartFire( void )
if( m_fPrimaryFire ) if( m_fPrimaryFire )
{ {
// fixed damage on primary attack // fixed damage on primary attack
#ifdef CLIENT_DLL #if CLIENT_DLL
flDamage = 20.0f; flDamage = 20.0f;
#else #else
flDamage = gSkillData.plrDmgGauss; flDamage = gSkillData.plrDmgGauss;
@ -341,7 +341,7 @@ void CGauss::StartFire( void )
if( m_fInAttack != 3 ) if( m_fInAttack != 3 )
{ {
//ALERT( at_console, "Time:%f Damage:%f\n", gpGlobals->time - m_pPlayer->m_flStartCharge, flDamage ); //ALERT( at_console, "Time:%f Damage:%f\n", gpGlobals->time - m_pPlayer->m_flStartCharge, flDamage );
#ifndef CLIENT_DLL #if !CLIENT_DLL
float flZVel = m_pPlayer->pev->velocity.z; float flZVel = m_pPlayer->pev->velocity.z;
if( !m_fPrimaryFire ) if( !m_fPrimaryFire )
@ -369,7 +369,7 @@ void CGauss::Fire( Vector vecOrigSrc, Vector vecDir, float flDamage )
{ {
m_pPlayer->m_iWeaponVolume = GAUSS_PRIMARY_FIRE_VOLUME; m_pPlayer->m_iWeaponVolume = GAUSS_PRIMARY_FIRE_VOLUME;
TraceResult tr, beam_tr; TraceResult tr, beam_tr;
#ifndef CLIENT_DLL #if !CLIENT_DLL
Vector vecSrc = vecOrigSrc; Vector vecSrc = vecOrigSrc;
Vector vecDest = vecSrc + vecDir * 8192.0f; Vector vecDest = vecSrc + vecDir * 8192.0f;
edict_t *pentIgnore; edict_t *pentIgnore;
@ -399,7 +399,7 @@ void CGauss::Fire( Vector vecOrigSrc, Vector vecDir, float flDamage )
//ALERT( at_console, "%f %f\n", tr.flFraction, flMaxFrac ); //ALERT( at_console, "%f %f\n", tr.flFraction, flMaxFrac );
#ifndef CLIENT_DLL #if !CLIENT_DLL
while( flDamage > 10 && nMaxHits > 0 ) while( flDamage > 10 && nMaxHits > 0 )
{ {
nMaxHits--; nMaxHits--;
@ -591,7 +591,7 @@ void CGauss::WeaponIdle( void )
iAnim = GAUSS_FIDGET; iAnim = GAUSS_FIDGET;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 3.0f; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 3.0f;
} }
#ifndef CLIENT_DLL #if !CLIENT_DLL
SendWeaponAnim( iAnim ); SendWeaponAnim( iAnim );
#endif #endif
} }

2
dlls/glock.cpp
View File

@ -132,7 +132,7 @@ void CGlock::GlockFire( float flSpread, float flCycleTime, BOOL fUseAutoAim )
m_pPlayer->pev->effects = (int)( m_pPlayer->pev->effects ) | EF_MUZZLEFLASH; m_pPlayer->pev->effects = (int)( m_pPlayer->pev->effects ) | EF_MUZZLEFLASH;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

2
dlls/h_cycler.cpp
View File

@ -29,7 +29,7 @@
#include "player.h" #include "player.h"
#define TEMP_FOR_SCREEN_SHOTS #define TEMP_FOR_SCREEN_SHOTS
#ifdef TEMP_FOR_SCREEN_SHOTS //=================================================== #if defined(TEMP_FOR_SCREEN_SHOTS) //===================================================
class CCycler : public CBaseMonster class CCycler : public CBaseMonster
{ {

2
dlls/h_export.cpp
View File

@ -29,7 +29,7 @@
enginefuncs_t g_engfuncs; enginefuncs_t g_engfuncs;
globalvars_t *gpGlobals; globalvars_t *gpGlobals;
#ifdef _WIN32 #if _WIN32
// Required DLL entry point // Required DLL entry point
BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )

2
dlls/handgrenade.cpp
View File

@ -43,7 +43,7 @@ void CHandGrenade::Spawn()
m_iId = WEAPON_HANDGRENADE; m_iId = WEAPON_HANDGRENADE;
SET_MODEL( ENT( pev ), "models/w_grenade.mdl" ); SET_MODEL( ENT( pev ), "models/w_grenade.mdl" );
#ifndef CLIENT_DLL #if !CLIENT_DLL
pev->dmg = gSkillData.plrDmgHandGrenade; pev->dmg = gSkillData.plrDmgHandGrenade;
#endif #endif
m_iDefaultAmmo = HANDGRENADE_DEFAULT_GIVE; m_iDefaultAmmo = HANDGRENADE_DEFAULT_GIVE;

2
dlls/hassassin.cpp
View File

@ -12,7 +12,7 @@
* use or distribution of this code by or to any unlicensed person is illegal. * use or distribution of this code by or to any unlicensed person is illegal.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
//========================================================= //=========================================================
// hassassin - Human assassin, fast and stealthy // hassassin - Human assassin, fast and stealthy

12
dlls/hornetgun.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -74,7 +74,7 @@ int CHgun::AddToPlayer( CBasePlayer *pPlayer )
{ {
if( CBasePlayerWeapon::AddToPlayer( pPlayer ) ) if( CBasePlayerWeapon::AddToPlayer( pPlayer ) )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( g_pGameRules->IsMultiplayer() ) if( g_pGameRules->IsMultiplayer() )
{ {
// in multiplayer, all hivehands come full. // in multiplayer, all hivehands come full.
@ -131,7 +131,7 @@ void CHgun::PrimaryAttack()
{ {
return; return;
} }
#ifndef CLIENT_DLL #if !CLIENT_DLL
UTIL_MakeVectors( m_pPlayer->pev->v_angle ); UTIL_MakeVectors( m_pPlayer->pev->v_angle );
CBaseEntity *pHornet = CBaseEntity::Create( "hornet", m_pPlayer->GetGunPosition() + gpGlobals->v_forward * 16.0f + gpGlobals->v_right * 8.0f + gpGlobals->v_up * -12.0f, m_pPlayer->pev->v_angle, m_pPlayer->edict() ); CBaseEntity *pHornet = CBaseEntity::Create( "hornet", m_pPlayer->GetGunPosition() + gpGlobals->v_forward * 16.0f + gpGlobals->v_right * 8.0f + gpGlobals->v_up * -12.0f, m_pPlayer->pev->v_angle, m_pPlayer->edict() );
@ -145,7 +145,7 @@ void CHgun::PrimaryAttack()
m_pPlayer->m_iWeaponFlash = DIM_GUN_FLASH; m_pPlayer->m_iWeaponFlash = DIM_GUN_FLASH;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -175,7 +175,7 @@ void CHgun::SecondaryAttack( void )
} }
//Wouldn't be a bad idea to completely predict these, since they fly so fast... //Wouldn't be a bad idea to completely predict these, since they fly so fast...
#ifndef CLIENT_DLL #if !CLIENT_DLL
CBaseEntity *pHornet; CBaseEntity *pHornet;
Vector vecSrc; Vector vecSrc;
@ -226,7 +226,7 @@ void CHgun::SecondaryAttack( void )
m_flRechargeTime = gpGlobals->time + 0.5f; m_flRechargeTime = gpGlobals->time + 0.5f;
#endif #endif
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

2
dlls/ichthyosaur.cpp
View File

@ -12,7 +12,7 @@
* use or distribution of this code by or to any unlicensed person is illegal. * use or distribution of this code by or to any unlicensed person is illegal.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
//========================================================= //=========================================================
// icthyosaur - evin, satan fish monster // icthyosaur - evin, satan fish monster

2
dlls/monsters.cpp
View File

@ -739,7 +739,7 @@ BOOL CBaseMonster::MoveToNode( Activity movementAct, float waitTime, const Vecto
return FRefreshRoute(); return FRefreshRoute();
} }
#ifdef _DEBUG #if _DEBUG
void DrawRoute( entvars_t *pev, WayPoint_t *m_Route, int m_iRouteIndex, int r, int g, int b ) void DrawRoute( entvars_t *pev, WayPoint_t *m_Route, int m_iRouteIndex, int r, int g, int b )
{ {
int i; int i;

6
dlls/mp5.cpp
View File

@ -150,7 +150,7 @@ void CMP5::PrimaryAttack()
Vector vecSrc = m_pPlayer->GetGunPosition(); Vector vecSrc = m_pPlayer->GetGunPosition();
Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES ); Vector vecAiming = m_pPlayer->GetAutoaimVector( AUTOAIM_5DEGREES );
Vector vecDir; Vector vecDir;
#ifdef CLIENT_DLL #if CLIENT_DLL
if( bIsMultiplayer() ) if( bIsMultiplayer() )
#else #else
if( g_pGameRules->IsMultiplayer() ) if( g_pGameRules->IsMultiplayer() )
@ -166,7 +166,7 @@ void CMP5::PrimaryAttack()
} }
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -220,7 +220,7 @@ void CMP5::SecondaryAttack( void )
gpGlobals->v_forward * 800.0f ); gpGlobals->v_forward * 800.0f );
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

12
dlls/multiplay_gamerules.cpp
View File

@ -26,7 +26,7 @@
#include "skill.h" #include "skill.h"
#include "game.h" #include "game.h"
#include "items.h" #include "items.h"
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
#include "voice_gamemgr.h" #include "voice_gamemgr.h"
#endif #endif
#include "hltv.h" #include "hltv.h"
@ -46,7 +46,7 @@ extern int g_teamplay;
float g_flIntermissionStartTime = 0; float g_flIntermissionStartTime = 0;
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
CVoiceGameMgr g_VoiceGameMgr; CVoiceGameMgr g_VoiceGameMgr;
class CMultiplayGameMgrHelper : public IVoiceGameMgrHelper class CMultiplayGameMgrHelper : public IVoiceGameMgrHelper
@ -73,7 +73,7 @@ static CMultiplayGameMgrHelper g_GameMgrHelper;
//********************************************************* //*********************************************************
CHalfLifeMultiplay::CHalfLifeMultiplay() CHalfLifeMultiplay::CHalfLifeMultiplay()
{ {
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
g_VoiceGameMgr.Init( &g_GameMgrHelper, gpGlobals->maxClients ); g_VoiceGameMgr.Init( &g_GameMgrHelper, gpGlobals->maxClients );
#endif #endif
RefreshSkillData(); RefreshSkillData();
@ -123,7 +123,7 @@ CHalfLifeMultiplay::CHalfLifeMultiplay()
BOOL CHalfLifeMultiplay::ClientCommand( CBasePlayer *pPlayer, const char *pcmd ) BOOL CHalfLifeMultiplay::ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
{ {
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
if( g_VoiceGameMgr.ClientCommand( pPlayer, pcmd ) ) if( g_VoiceGameMgr.ClientCommand( pPlayer, pcmd ) )
return TRUE; return TRUE;
#endif #endif
@ -236,7 +236,7 @@ extern cvar_t mp_chattime;
//========================================================= //=========================================================
void CHalfLifeMultiplay::Think( void ) void CHalfLifeMultiplay::Think( void )
{ {
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
g_VoiceGameMgr.Update( gpGlobals->frametime ); g_VoiceGameMgr.Update( gpGlobals->frametime );
#endif #endif
@ -456,7 +456,7 @@ BOOL CHalfLifeMultiplay::GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerIte
//========================================================= //=========================================================
BOOL CHalfLifeMultiplay::ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[128] ) BOOL CHalfLifeMultiplay::ClientConnected( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[128] )
{ {
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
g_VoiceGameMgr.ClientConnected( pEntity ); g_VoiceGameMgr.ClientConnected( pEntity );
#endif #endif
return TRUE; return TRUE;

2
dlls/nihilanth.cpp
View File

@ -12,7 +12,7 @@
* use or distribution of this code by or to any unlicensed person is illegal. * use or distribution of this code by or to any unlicensed person is illegal.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"

4
dlls/nodes.cpp
View File

@ -42,7 +42,7 @@ 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 )
#ifdef __DOS__ #if __DOS__
#include <direct.h> #include <direct.h>
#define CreateDirectoryA(p, n) mkdir(p) #define CreateDirectoryA(p, n) mkdir(p)
#elif !defined _WIN32 #elif !defined _WIN32
@ -2060,7 +2060,7 @@ void CTestHull::BuildNodeGraph( void )
fprintf( file, "\nAll Connections are Paired!\n" ); fprintf( file, "\nAll Connections are Paired!\n" );
} }
#ifdef _MSC_VER #if _MSC_VER
#define SIZET_FMT "%Iu" #define SIZET_FMT "%Iu"
#else #else
#define SIZET_FMT "%zu" #define SIZET_FMT "%zu"

6
dlls/nodes.h
View File

@ -106,7 +106,7 @@ typedef struct
// CGraph // CGraph
//========================================================= //=========================================================
#define _GRAPH_VERSION_RETAIL 16 // Retail Half-Life graph version. Don't increment this #define _GRAPH_VERSION_RETAIL 16 // Retail Half-Life graph version. Don't increment this
#ifdef XASH_64BIT #if defined(XASH_64BIT)
#define _GRAPH_VERSION (16 * 10) #define _GRAPH_VERSION (16 * 10)
#else #else
#define _GRAPH_VERSION (16) // !!!increment this whenever graph/node/link classes change, to obsolesce older disk files. #define _GRAPH_VERSION (16) // !!!increment this whenever graph/node/link classes change, to obsolesce older disk files.
@ -215,7 +215,7 @@ public:
inline CNode &Node( int i ) inline CNode &Node( int i )
{ {
#ifdef _DEBUG #if _DEBUG
if ( !m_pNodes || i < 0 || i > m_cNodes ) if ( !m_pNodes || i < 0 || i > m_cNodes )
ALERT( at_error, "Bad Node!\n" ); ALERT( at_error, "Bad Node!\n" );
#endif #endif
@ -224,7 +224,7 @@ public:
inline CLink &Link( int i ) inline CLink &Link( int i )
{ {
#ifdef _DEBUG #if _DEBUG
if ( !m_pLinkPool || i < 0 || i > m_cLinks ) if ( !m_pLinkPool || i < 0 || i > m_cLinks )
ALERT( at_error, "Bad link!\n" ); ALERT( at_error, "Bad link!\n" );
#endif #endif

12
dlls/player.cpp
View File

@ -2758,7 +2758,7 @@ pt_end:
// Track button info so we can detect 'pressed' and 'released' buttons next frame // Track button info so we can detect 'pressed' and 'released' buttons next frame
m_afButtonLast = pev->button; m_afButtonLast = pev->button;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
// Decay timers on weapons // Decay timers on weapons
// go through all of the weapons and make a list of the ones to pack // go through all of the weapons and make a list of the ones to pack
for( int i = 0; i < MAX_ITEM_TYPES; i++ ) for( int i = 0; i < MAX_ITEM_TYPES; i++ )
@ -3202,7 +3202,7 @@ int CBasePlayer::Restore( CRestore &restore )
RenewItems(); RenewItems();
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
// HACK: This variable is saved/restored in CBaseMonster as a time variable, but we're using it // HACK: This variable is saved/restored in CBaseMonster as a time variable, but we're using it
// as just a counter. Ideally, this needs its own variable that's saved as a plain float. // as just a counter. Ideally, this needs its own variable that's saved as a plain float.
// Barring that, we clear it out here instead of using the incorrect restored time value. // Barring that, we clear it out here instead of using the incorrect restored time value.
@ -3647,7 +3647,7 @@ void CBasePlayer::ImpulseCommands()
//========================================================= //=========================================================
void CBasePlayer::CheatImpulseCommands( int iImpulse ) void CBasePlayer::CheatImpulseCommands( int iImpulse )
{ {
#if !defined( HLDEMO_BUILD ) #if !HLDEMO_BUILD
if( g_flWeaponCheat == 0.0f ) if( g_flWeaponCheat == 0.0f )
{ {
return; return;
@ -3684,7 +3684,7 @@ void CBasePlayer::CheatImpulseCommands( int iImpulse )
GiveNamedItem( "ammo_ARgrenades" ); GiveNamedItem( "ammo_ARgrenades" );
GiveNamedItem( "weapon_handgrenade" ); GiveNamedItem( "weapon_handgrenade" );
GiveNamedItem( "weapon_tripmine" ); GiveNamedItem( "weapon_tripmine" );
#ifndef OEM_BUILD #if !OEM_BUILD
GiveNamedItem( "weapon_357" ); GiveNamedItem( "weapon_357" );
GiveNamedItem( "ammo_357" ); GiveNamedItem( "ammo_357" );
GiveNamedItem( "weapon_crossbow" ); GiveNamedItem( "weapon_crossbow" );
@ -3983,7 +3983,7 @@ Called every frame by the player PreThink
*/ */
void CBasePlayer::ItemPreFrame() void CBasePlayer::ItemPreFrame()
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
if( m_flNextAttack > 0 ) if( m_flNextAttack > 0 )
#else #else
if( gpGlobals->time < m_flNextAttack ) if( gpGlobals->time < m_flNextAttack )
@ -4013,7 +4013,7 @@ void CBasePlayer::ItemPostFrame()
if( m_pTank != 0 ) if( m_pTank != 0 )
return; return;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
if( m_flNextAttack > 0 ) if( m_flNextAttack > 0 )
#else #else
if( gpGlobals->time < m_flNextAttack ) if( gpGlobals->time < m_flNextAttack )

12
dlls/python.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -97,7 +97,7 @@ void CPython::Precache( void )
BOOL CPython::Deploy() BOOL CPython::Deploy()
{ {
#ifdef CLIENT_DLL #if CLIENT_DLL
if( bIsMultiplayer() ) if( bIsMultiplayer() )
#else #else
if( g_pGameRules->IsMultiplayer() ) if( g_pGameRules->IsMultiplayer() )
@ -130,7 +130,7 @@ void CPython::Holster( int skiplocal /* = 0 */ )
void CPython::SecondaryAttack( void ) void CPython::SecondaryAttack( void )
{ {
#ifdef CLIENT_DLL #if CLIENT_DLL
if( !bIsMultiplayer() ) if( !bIsMultiplayer() )
#else #else
if( !g_pGameRules->IsMultiplayer() ) if( !g_pGameRules->IsMultiplayer() )
@ -195,7 +195,7 @@ void CPython::PrimaryAttack()
vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_1DEGREES, 8192, BULLET_PLAYER_357, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed ); vecDir = m_pPlayer->FireBulletsPlayer( 1, vecSrc, vecAiming, VECTOR_CONE_1DEGREES, 8192, BULLET_PLAYER_357, 0, 0, m_pPlayer->pev, m_pPlayer->random_seed );
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -222,7 +222,7 @@ void CPython::Reload( void )
} }
int bUseScope = FALSE; int bUseScope = FALSE;
#ifdef CLIENT_DLL #if CLIENT_DLL
bUseScope = bIsMultiplayer(); bUseScope = bIsMultiplayer();
#else #else
bUseScope = g_pGameRules->IsMultiplayer(); bUseScope = g_pGameRules->IsMultiplayer();
@ -273,7 +273,7 @@ void CPython::WeaponIdle( void )
} }
int bUseScope = FALSE; int bUseScope = FALSE;
#ifdef CLIENT_DLL #if CLIENT_DLL
bUseScope = bIsMultiplayer(); bUseScope = bIsMultiplayer();
#else #else
bUseScope = g_pGameRules->IsMultiplayer(); bUseScope = g_pGameRules->IsMultiplayer();

20
dlls/rpg.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) #if !OEM_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -39,7 +39,7 @@ enum rpg_e
LINK_ENTITY_TO_CLASS( weapon_rpg, CRpg ) LINK_ENTITY_TO_CLASS( weapon_rpg, CRpg )
#ifndef CLIENT_DLL #if !CLIENT_DLL
LINK_ENTITY_TO_CLASS( laser_spot, CLaserSpot ) LINK_ENTITY_TO_CLASS( laser_spot, CLaserSpot )
@ -306,7 +306,7 @@ void CRpg::Reload( void )
return; return;
} }
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( m_pSpot && m_fSpotActive ) if( m_pSpot && m_fSpotActive )
{ {
m_pSpot->Suspend( 2.1f ); m_pSpot->Suspend( 2.1f );
@ -329,7 +329,7 @@ void CRpg::Spawn()
SET_MODEL( ENT( pev ), "models/w_rpg.mdl" ); SET_MODEL( ENT( pev ), "models/w_rpg.mdl" );
m_fSpotActive = 1; m_fSpotActive = 1;
#ifdef CLIENT_DLL #if CLIENT_DLL
if( bIsMultiplayer() ) if( bIsMultiplayer() )
#else #else
if( g_pGameRules->IsMultiplayer() ) if( g_pGameRules->IsMultiplayer() )
@ -421,7 +421,7 @@ void CRpg::Holster( int skiplocal /* = 0 */ )
SendWeaponAnim( RPG_HOLSTER1 ); SendWeaponAnim( RPG_HOLSTER1 );
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( m_pSpot ) if( m_pSpot )
{ {
m_pSpot->Killed( NULL, GIB_NEVER ); m_pSpot->Killed( NULL, GIB_NEVER );
@ -437,7 +437,7 @@ void CRpg::PrimaryAttack()
m_pPlayer->m_iWeaponVolume = LOUD_GUN_VOLUME; m_pPlayer->m_iWeaponVolume = LOUD_GUN_VOLUME;
m_pPlayer->m_iWeaponFlash = BRIGHT_GUN_FLASH; m_pPlayer->m_iWeaponFlash = BRIGHT_GUN_FLASH;
#ifndef CLIENT_DLL #if !CLIENT_DLL
// player "shoot" animation // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
@ -454,7 +454,7 @@ void CRpg::PrimaryAttack()
// Ken signed up for this as a global change (sjb) // Ken signed up for this as a global change (sjb)
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -480,7 +480,7 @@ void CRpg::SecondaryAttack()
{ {
m_fSpotActive = !m_fSpotActive; m_fSpotActive = !m_fSpotActive;
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( !m_fSpotActive && m_pSpot ) if( !m_fSpotActive && m_pSpot )
{ {
m_pSpot->Killed( NULL, GIB_NORMAL ); m_pSpot->Killed( NULL, GIB_NORMAL );
@ -532,7 +532,7 @@ void CRpg::WeaponIdle( void )
void CRpg::UpdateSpot( void ) void CRpg::UpdateSpot( void )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
if( m_fSpotActive ) if( m_fSpotActive )
{ {
if (m_pPlayer->pev->viewmodel == 0) if (m_pPlayer->pev->viewmodel == 0)
@ -571,7 +571,7 @@ class CRpgAmmo : public CBasePlayerAmmo
BOOL AddAmmo( CBaseEntity *pOther ) BOOL AddAmmo( CBaseEntity *pOther )
{ {
int iGive; int iGive;
#ifdef CLIENT_DLL #if CLIENT_DLL
if( bIsMultiplayer() ) if( bIsMultiplayer() )
#else #else
if( g_pGameRules->IsMultiplayer() ) if( g_pGameRules->IsMultiplayer() )

8
dlls/satchel.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -193,7 +193,7 @@ int CSatchel::AddDuplicate( CBasePlayerItem *pOriginal )
{ {
CSatchel *pSatchel; CSatchel *pSatchel;
#ifdef CLIENT_DLL #if CLIENT_DLL
if( bIsMultiplayer() ) if( bIsMultiplayer() )
#else #else
if( g_pGameRules->IsMultiplayer() ) if( g_pGameRules->IsMultiplayer() )
@ -376,7 +376,7 @@ void CSatchel::Throw( void )
{ {
if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] ) if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] )
{ {
#ifndef CLIENT_DLL #if !CLIENT_DLL
Vector vecSrc = m_pPlayer->pev->origin; Vector vecSrc = m_pPlayer->pev->origin;
Vector vecThrow = gpGlobals->v_forward * 274 + m_pPlayer->pev->velocity; Vector vecThrow = gpGlobals->v_forward * 274 + m_pPlayer->pev->velocity;
@ -430,7 +430,7 @@ void CSatchel::WeaponIdle( void )
return; return;
} }
#ifndef CLIENT_DLL #if !CLIENT_DLL
m_pPlayer->pev->viewmodel = MAKE_STRING( "models/v_satchel.mdl" ); m_pPlayer->pev->viewmodel = MAKE_STRING( "models/v_satchel.mdl" );
m_pPlayer->pev->weaponmodel = MAKE_STRING( "models/p_satchel.mdl" ); m_pPlayer->pev->weaponmodel = MAKE_STRING( "models/p_satchel.mdl" );
#else #else

2
dlls/saverestore.h
View File

@ -157,7 +157,7 @@ public:
int Restore( CRestore &restore ); int Restore( CRestore &restore );
static TYPEDESCRIPTION m_SaveData[]; static TYPEDESCRIPTION m_SaveData[];
//#ifdef _DEBUG //#if _DEBUG
void DumpGlobals( void ); void DumpGlobals( void );
//#endif //#endif

2
dlls/schedule.cpp
View File

@ -183,7 +183,7 @@ BOOL CBaseMonster::FScheduleValid( void )
if( HasConditions( m_pSchedule->iInterruptMask | bits_COND_SCHEDULE_DONE | bits_COND_TASK_FAILED ) ) if( HasConditions( m_pSchedule->iInterruptMask | bits_COND_SCHEDULE_DONE | bits_COND_TASK_FAILED ) )
{ {
#ifdef DEBUG #if DEBUG
if( HasConditions( bits_COND_TASK_FAILED ) && m_failSchedule == SCHED_NONE ) if( HasConditions( bits_COND_TASK_FAILED ) && m_failSchedule == SCHED_NONE )
{ {
// fail! Send a visual indicator. // fail! Send a visual indicator.

8
dlls/shotgun.cpp
View File

@ -137,7 +137,7 @@ void CShotgun::PrimaryAttack()
m_iClip--; m_iClip--;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -152,7 +152,7 @@ void CShotgun::PrimaryAttack()
Vector vecDir; Vector vecDir;
#ifdef CLIENT_DLL #if CLIENT_DLL
if( bIsMultiplayer() ) if( bIsMultiplayer() )
#else #else
if( g_pGameRules->IsMultiplayer() ) if( g_pGameRules->IsMultiplayer() )
@ -208,7 +208,7 @@ void CShotgun::SecondaryAttack( void )
m_iClip -= 2; m_iClip -= 2;
int flags; int flags;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -223,7 +223,7 @@ void CShotgun::SecondaryAttack( void )
Vector vecDir; Vector vecDir;
#ifdef CLIENT_DLL #if CLIENT_DLL
if( bIsMultiplayer() ) if( bIsMultiplayer() )
#else #else
if( g_pGameRules->IsMultiplayer() ) if( g_pGameRules->IsMultiplayer() )

2
dlls/soundent.cpp
View File

@ -367,7 +367,7 @@ int CSoundEnt::ClientSoundIndex( edict_t *pClient )
{ {
int iReturn = ENTINDEX( pClient ) - 1; int iReturn = ENTINDEX( pClient ) - 1;
#ifdef _DEBUG #if _DEBUG
if( iReturn < 0 || iReturn > gpGlobals->maxClients ) if( iReturn < 0 || iReturn > gpGlobals->maxClients )
{ {
ALERT( at_console, "** ClientSoundIndex returning a bogus value! **\n" ); ALERT( at_console, "** ClientSoundIndex returning a bogus value! **\n" );

8
dlls/squeakgrenade.cpp
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
#include "extdll.h" #include "extdll.h"
#include "util.h" #include "util.h"
@ -42,7 +42,7 @@ enum squeak_e
SQUEAK_THROW SQUEAK_THROW
}; };
#ifndef CLIENT_DLL #if !CLIENT_DLL
class CSqueakGrenade : public CGrenade class CSqueakGrenade : public CGrenade
{ {
void Spawn( void ); void Spawn( void );
@ -505,7 +505,7 @@ void CSqueak::PrimaryAttack()
UTIL_TraceLine( trace_origin + gpGlobals->v_forward * 20.0f, trace_origin + gpGlobals->v_forward * 64.0f, dont_ignore_monsters, NULL, &tr ); UTIL_TraceLine( trace_origin + gpGlobals->v_forward * 20.0f, trace_origin + gpGlobals->v_forward * 64.0f, dont_ignore_monsters, NULL, &tr );
int flags; int flags;
#ifdef CLIENT_WEAPONS #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;
@ -516,7 +516,7 @@ void CSqueak::PrimaryAttack()
{ {
// player "shoot" animation // player "shoot" animation
m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); m_pPlayer->SetAnimation( PLAYER_ATTACK1 );
#ifndef CLIENT_DLL #if !CLIENT_DLL
CBaseEntity *pSqueak = CBaseEntity::Create( "monster_snark", tr.vecEndPos, m_pPlayer->pev->v_angle, m_pPlayer->edict() ); CBaseEntity *pSqueak = CBaseEntity::Create( "monster_snark", tr.vecEndPos, m_pPlayer->pev->v_angle, m_pPlayer->edict() );
pSqueak->pev->velocity = gpGlobals->v_forward * 200.0f + m_pPlayer->pev->velocity; pSqueak->pev->velocity = gpGlobals->v_forward * 200.0f + m_pPlayer->pev->velocity;
#endif #endif

6
dlls/teamplay_gamerules.cpp
View File

@ -69,7 +69,7 @@ CHalfLifeTeamplay::CHalfLifeTeamplay()
extern cvar_t timeleft, fragsleft; extern cvar_t timeleft, fragsleft;
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
#include "voice_gamemgr.h" #include "voice_gamemgr.h"
extern CVoiceGameMgr g_VoiceGameMgr; extern CVoiceGameMgr g_VoiceGameMgr;
#endif #endif
@ -82,7 +82,7 @@ void CHalfLifeTeamplay::Think( void )
int frags_remaining = 0; int frags_remaining = 0;
int time_remaining = 0; int time_remaining = 0;
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
g_VoiceGameMgr.Update(gpGlobals->frametime); g_VoiceGameMgr.Update(gpGlobals->frametime);
#endif #endif
if( g_fGameOver ) // someone else quit the game already if( g_fGameOver ) // someone else quit the game already
@ -148,7 +148,7 @@ void CHalfLifeTeamplay::Think( void )
//========================================================= //=========================================================
BOOL CHalfLifeTeamplay::ClientCommand( CBasePlayer *pPlayer, const char *pcmd ) BOOL CHalfLifeTeamplay::ClientCommand( CBasePlayer *pPlayer, const char *pcmd )
{ {
#ifndef NO_VOICEGAMEMGR #if !NO_VOICEGAMEMGR
if( g_VoiceGameMgr.ClientCommand( pPlayer, pcmd ) ) if( g_VoiceGameMgr.ClientCommand( pPlayer, pcmd ) )
return TRUE; return TRUE;
#endif #endif

2
dlls/tentacle.cpp
View File

@ -12,7 +12,7 @@
* use or distribution of this code by or to any unlicensed person is illegal. * use or distribution of this code by or to any unlicensed person is illegal.
* *
****/ ****/
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
/* /*

6
dlls/tripmine.cpp
View File

@ -38,7 +38,7 @@ enum tripmine_e
TRIPMINE_GROUND TRIPMINE_GROUND
}; };
#ifndef CLIENT_DLL #if !CLIENT_DLL
class CTripmineGrenade : public CGrenade class CTripmineGrenade : public CGrenade
{ {
void Spawn( void ); void Spawn( void );
@ -372,7 +372,7 @@ void CTripmine::Spawn()
m_iDefaultAmmo = TRIPMINE_DEFAULT_GIVE; m_iDefaultAmmo = TRIPMINE_DEFAULT_GIVE;
#ifdef CLIENT_DLL #if CLIENT_DLL
if( !bIsMultiplayer() ) if( !bIsMultiplayer() )
#else #else
if( !g_pGameRules->IsDeathmatch() ) if( !g_pGameRules->IsDeathmatch() )
@ -443,7 +443,7 @@ void CTripmine::PrimaryAttack( void )
UTIL_TraceLine( vecSrc, vecSrc + vecAiming * 128.0f, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); UTIL_TraceLine( vecSrc, vecSrc + vecAiming * 128.0f, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr );
int flags; int flags;
#ifdef CLIENT_WEAPONS #if CLIENT_WEAPONS
flags = FEV_NOTHOST; flags = FEV_NOTHOST;
#else #else
flags = 0; flags = 0;

20
dlls/util.cpp
View File

@ -49,7 +49,7 @@ void UTIL_MuzzleLight( Vector vecSrc, float flRadius, byte r, byte g, byte b, fl
float UTIL_WeaponTimeBase( void ) float UTIL_WeaponTimeBase( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return 0.0f; return 0.0f;
#else #else
return gpGlobals->time; return gpGlobals->time;
@ -325,7 +325,7 @@ TYPEDESCRIPTION gEntvarsDescription[] =
#define ENTVARS_COUNT ( sizeof(gEntvarsDescription) / sizeof(gEntvarsDescription[0]) ) #define ENTVARS_COUNT ( sizeof(gEntvarsDescription) / sizeof(gEntvarsDescription[0]) )
#ifdef DEBUG #if DEBUG
edict_t *DBG_EntOfVars( const entvars_t *pev ) edict_t *DBG_EntOfVars( const entvars_t *pev )
{ {
if( pev->pContainingEntity != NULL ) if( pev->pContainingEntity != NULL )
@ -1619,7 +1619,7 @@ static int gSizes[FIELD_TYPECOUNT] =
sizeof(float) * 3, // FIELD_POSITION_VECTOR sizeof(float) * 3, // FIELD_POSITION_VECTOR
sizeof(void *), // FIELD_POINTER sizeof(void *), // FIELD_POINTER
sizeof(int), // FIELD_INTEGER sizeof(int), // FIELD_INTEGER
#ifdef GNUC #if GNUC
sizeof(void *) * 2, // FIELD_FUNCTION sizeof(void *) * 2, // FIELD_FUNCTION
#else #else
sizeof(void *), // FIELD_FUNCTION sizeof(void *), // FIELD_FUNCTION
@ -1646,7 +1646,7 @@ static int gInputSizes[FIELD_TYPECOUNT] =
sizeof(float) * 3, // FIELD_POSITION_VECTOR sizeof(float) * 3, // FIELD_POSITION_VECTOR
sizeof(void *), // FIELD_POINTER sizeof(void *), // FIELD_POINTER
sizeof(int), // FIELD_INTEGER sizeof(int), // FIELD_INTEGER
#ifdef GNUC #if GNUC
sizeof(void *) * 2, // FIELD_FUNCTION sizeof(void *) * 2, // FIELD_FUNCTION
#else #else
sizeof(void *), // FIELD_FUNCTION sizeof(void *), // FIELD_FUNCTION
@ -1863,7 +1863,7 @@ void CSave::WriteTime( const char *pname, const float *data, int count )
void CSave::WriteString( const char *pname, const char *pdata ) void CSave::WriteString( const char *pname, const char *pdata )
{ {
#ifdef TOKENIZE #if TOKENIZE
short token = (short)TokenHash( pdata ); short token = (short)TokenHash( pdata );
WriteShort( pname, &token, 1 ); WriteShort( pname, &token, 1 );
#else #else
@ -1874,7 +1874,7 @@ void CSave::WriteString( const char *pname, const char *pdata )
void CSave::WriteString( const char *pname, const int *stringId, int count ) void CSave::WriteString( const char *pname, const int *stringId, int count )
{ {
int i, size; int i, size;
#ifdef TOKENIZE #if TOKENIZE
short token = (short)TokenHash( STRING( *stringId ) ); short token = (short)TokenHash( STRING( *stringId ) );
WriteShort( pname, &token, 1 ); WriteShort( pname, &token, 1 );
#else #else
@ -2192,7 +2192,7 @@ int CRestore::ReadField( void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCou
switch( pTest->fieldType ) switch( pTest->fieldType )
{ {
case FIELD_TIME: case FIELD_TIME:
#ifdef __VFP_FP__ #if __VFP_FP__
memcpy( &timeData, pInputData, 4 ); memcpy( &timeData, pInputData, 4 );
// Re-base time variables // Re-base time variables
timeData += time; timeData += time;
@ -2278,7 +2278,7 @@ int CRestore::ReadField( void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCou
*( (EOFFSET *)pOutputData ) = 0; *( (EOFFSET *)pOutputData ) = 0;
break; break;
case FIELD_VECTOR: case FIELD_VECTOR:
#ifdef __VFP_FP__ #if __VFP_FP__
memcpy( pOutputData, pInputData, sizeof( Vector ) ); memcpy( pOutputData, pInputData, sizeof( Vector ) );
#else #else
( (float *)pOutputData )[0] = ( (float *)pInputData )[0]; ( (float *)pOutputData )[0] = ( (float *)pInputData )[0];
@ -2287,7 +2287,7 @@ int CRestore::ReadField( void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCou
#endif #endif
break; break;
case FIELD_POSITION_VECTOR: case FIELD_POSITION_VECTOR:
#ifdef __VFP_FP__ #if __VFP_FP__
{ {
Vector tmp; Vector tmp;
memcpy( &tmp, pInputData, sizeof( Vector ) ); memcpy( &tmp, pInputData, sizeof( Vector ) );
@ -2424,7 +2424,7 @@ char *CRestore::ReadNamedString( const char *pName )
HEADER header; HEADER header;
BufferReadHeader( &header ); BufferReadHeader( &header );
#ifdef TOKENIZE #if TOKENIZE
return (char *)( m_pdata->pTokens[*(short *)header.pData] ); return (char *)( m_pdata->pTokens[*(short *)header.pData] );
#else #else
return (char *)header.pData; return (char *)header.pData;

8
dlls/util.h
View File

@ -35,7 +35,7 @@ extern globalvars_t *gpGlobals;
// Use this instead of ALLOC_STRING on constant strings // Use this instead of ALLOC_STRING on constant strings
#define STRING(offset) (const char *)(gpGlobals->pStringBase + (int)offset) #define STRING(offset) (const char *)(gpGlobals->pStringBase + (int)offset)
#if !defined XASH_64BIT || defined(CLIENT_DLL) #if !defined(XASH_64BIT) || CLIENT_DLL
#define MAKE_STRING(str) ((int)(long int)str - (int)(long int)STRING(0)) #define MAKE_STRING(str) ((int)(long int)str - (int)(long int)STRING(0))
#else #else
static inline int MAKE_STRING(const char *szValue) static inline int MAKE_STRING(const char *szValue)
@ -104,7 +104,7 @@ typedef int BOOL;
// The _declspec forces them to be exported by name so we can do a lookup with GetProcAddress() // The _declspec forces them to be exported by name so we can do a lookup with GetProcAddress()
// The function is used to intialize / allocate the object for the entity // The function is used to intialize / allocate the object for the entity
#if defined(CLIENT_DLL) #if CLIENT_DLL
#define LINK_ENTITY_TO_CLASS(mapClassName,DLLClassName) #define LINK_ENTITY_TO_CLASS(mapClassName,DLLClassName)
#else // CLIENT_DLL #else // CLIENT_DLL
#define LINK_ENTITY_TO_CLASS(mapClassName,DLLClassName) extern "C" EXPORT void mapClassName( entvars_t *pev ); void mapClassName( entvars_t *pev ) { GetClassPtr( (DLLClassName *)pev ); } #define LINK_ENTITY_TO_CLASS(mapClassName,DLLClassName) extern "C" EXPORT void mapClassName( entvars_t *pev ); void mapClassName( entvars_t *pev ) { GetClassPtr( (DLLClassName *)pev ); }
@ -113,7 +113,7 @@ typedef int BOOL;
// //
// Conversion among the three types of "entity", including identity-conversions. // Conversion among the three types of "entity", including identity-conversions.
// //
#ifdef DEBUG #if DEBUG
extern edict_t *DBG_EntOfVars(const entvars_t *pev); extern edict_t *DBG_EntOfVars(const entvars_t *pev);
inline edict_t *ENT(const entvars_t *pev) { return DBG_EntOfVars(pev); } inline edict_t *ENT(const entvars_t *pev) { return DBG_EntOfVars(pev); }
#else #else
@ -390,7 +390,7 @@ extern int BuildChangeList( LEVELLIST *pLevelList, int maxList );
// //
// How did I ever live without ASSERT? // How did I ever live without ASSERT?
// //
#ifdef DEBUG #if DEBUG
void DBG_AssertFunction(BOOL fExpr, const char* szExpr, const char* szFile, int szLine, const char* szMessage); void DBG_AssertFunction(BOOL fExpr, const char* szExpr, const char* szFile, int szLine, const char* szMessage);
#define ASSERT(f) DBG_AssertFunction(f, #f, __FILE__, __LINE__, NULL) #define ASSERT(f) DBG_AssertFunction(f, #f, __FILE__, __LINE__, NULL)
#define ASSERTSZ(f, sz) DBG_AssertFunction(f, #f, __FILE__, __LINE__, sz) #define ASSERTSZ(f, sz) DBG_AssertFunction(f, #f, __FILE__, __LINE__, sz)

12
dlls/weapons.cpp
View File

@ -334,7 +334,7 @@ void W_Precache( void )
// 9mm ammo box // 9mm ammo box
UTIL_PrecacheOther( "ammo_9mmbox" ); UTIL_PrecacheOther( "ammo_9mmbox" );
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
// python // python
UTIL_PrecacheOtherWeapon( "weapon_357" ); UTIL_PrecacheOtherWeapon( "weapon_357" );
UTIL_PrecacheOther( "ammo_357" ); UTIL_PrecacheOther( "ammo_357" );
@ -356,13 +356,13 @@ void W_Precache( void )
#endif #endif
// tripmine // tripmine
UTIL_PrecacheOtherWeapon( "weapon_tripmine" ); UTIL_PrecacheOtherWeapon( "weapon_tripmine" );
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
// satchel charge // satchel charge
UTIL_PrecacheOtherWeapon( "weapon_satchel" ); UTIL_PrecacheOtherWeapon( "weapon_satchel" );
#endif #endif
// hand grenade // hand grenade
UTIL_PrecacheOtherWeapon("weapon_handgrenade"); UTIL_PrecacheOtherWeapon("weapon_handgrenade");
#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) #if !OEM_BUILD && !HLDEMO_BUILD
// squeak grenade // squeak grenade
UTIL_PrecacheOtherWeapon( "weapon_snark" ); UTIL_PrecacheOtherWeapon( "weapon_snark" );
@ -446,7 +446,7 @@ IMPLEMENT_SAVERESTORE( CBasePlayerItem, CBaseAnimating )
TYPEDESCRIPTION CBasePlayerWeapon::m_SaveData[] = TYPEDESCRIPTION CBasePlayerWeapon::m_SaveData[] =
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
DEFINE_FIELD( CBasePlayerWeapon, m_flNextPrimaryAttack, FIELD_FLOAT ), DEFINE_FIELD( CBasePlayerWeapon, m_flNextPrimaryAttack, FIELD_FLOAT ),
DEFINE_FIELD( CBasePlayerWeapon, m_flNextSecondaryAttack, FIELD_FLOAT ), DEFINE_FIELD( CBasePlayerWeapon, m_flNextSecondaryAttack, FIELD_FLOAT ),
DEFINE_FIELD( CBasePlayerWeapon, m_flTimeWeaponIdle, FIELD_FLOAT ), DEFINE_FIELD( CBasePlayerWeapon, m_flTimeWeaponIdle, FIELD_FLOAT ),
@ -630,7 +630,7 @@ void CBasePlayerItem::DefaultTouch( CBaseEntity *pOther )
BOOL CanAttack( float attack_time, float curtime, BOOL isPredicted ) BOOL CanAttack( float attack_time, float curtime, BOOL isPredicted )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
if( !isPredicted ) if( !isPredicted )
#else #else
if( 1 ) if( 1 )
@ -870,7 +870,7 @@ void CBasePlayerWeapon::SendWeaponAnim( int iAnim, int skiplocal, int body )
m_pPlayer->pev->weaponanim = iAnim; m_pPlayer->pev->weaponanim = iAnim;
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
if( skiplocal && ENGINE_CANSKIP( m_pPlayer->edict() ) ) if( skiplocal && ENGINE_CANSKIP( m_pPlayer->edict() ) )
return; return;
#endif #endif

46
dlls/weapons.h
View File

@ -507,7 +507,7 @@ public:
int m_cAmmoTypes;// how many ammo types packed into this box (if packed by a level designer) int m_cAmmoTypes;// how many ammo types packed into this box (if packed by a level designer)
}; };
#ifdef CLIENT_DLL #if CLIENT_DLL
bool bIsMultiplayer ( void ); bool bIsMultiplayer ( void );
void LoadVModel ( const char *szViewModel, CBasePlayer *m_pPlayer ); void LoadVModel ( const char *szViewModel, CBasePlayer *m_pPlayer );
#endif #endif
@ -530,7 +530,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -559,7 +559,7 @@ public:
int Swing( int fFirst ); int Swing( int fFirst );
BOOL Deploy( void ); BOOL Deploy( void );
void Holster( int skiplocal = 0 ); void Holster( int skiplocal = 0 );
#ifdef CROWBAR_IDLE_ANIM #if CROWBAR_IDLE_ANIM
void WeaponIdle(); void WeaponIdle();
#endif #endif
int m_iSwing; int m_iSwing;
@ -567,7 +567,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -597,7 +597,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -628,7 +628,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -662,7 +662,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -677,7 +677,7 @@ private:
class CShotgun : public CBasePlayerWeapon class CShotgun : public CBasePlayerWeapon
{ {
public: public:
#ifndef CLIENT_DLL #if !CLIENT_DLL
int Save( CSave &save ); int Save( CSave &save );
int Restore( CRestore &restore ); int Restore( CRestore &restore );
static TYPEDESCRIPTION m_SaveData[]; static TYPEDESCRIPTION m_SaveData[];
@ -700,7 +700,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -729,7 +729,7 @@ public:
class CRpg : public CBasePlayerWeapon class CRpg : public CBasePlayerWeapon
{ {
public: public:
#ifndef CLIENT_DLL #if !CLIENT_DLL
int Save( CSave &save ); int Save( CSave &save );
int Restore( CRestore &restore ); int Restore( CRestore &restore );
static TYPEDESCRIPTION m_SaveData[]; static TYPEDESCRIPTION m_SaveData[];
@ -758,7 +758,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -790,7 +790,7 @@ public:
class CGauss : public CBasePlayerWeapon class CGauss : public CBasePlayerWeapon
{ {
public: public:
#ifndef CLIENT_DLL #if !CLIENT_DLL
int Save( CSave &save ); int Save( CSave &save );
int Restore( CRestore &restore ); int Restore( CRestore &restore );
static TYPEDESCRIPTION m_SaveData[]; static TYPEDESCRIPTION m_SaveData[];
@ -822,7 +822,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -837,7 +837,7 @@ private:
class CEgon : public CBasePlayerWeapon class CEgon : public CBasePlayerWeapon
{ {
public: public:
#ifndef CLIENT_DLL #if !CLIENT_DLL
int Save( CSave &save ); int Save( CSave &save );
int Restore( CRestore &restore ); int Restore( CRestore &restore );
static TYPEDESCRIPTION m_SaveData[]; static TYPEDESCRIPTION m_SaveData[];
@ -880,7 +880,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -890,7 +890,7 @@ public:
unsigned short m_usEgonStop; unsigned short m_usEgonStop;
private: private:
#ifndef CLIENT_DLL #if !CLIENT_DLL
float m_shootTime; float m_shootTime;
#endif #endif
EGON_FIREMODE m_fireMode; EGON_FIREMODE m_fireMode;
@ -903,7 +903,7 @@ private:
class CHgun : public CBasePlayerWeapon class CHgun : public CBasePlayerWeapon
{ {
public: public:
#ifndef CLIENT_DLL #if !CLIENT_DLL
int Save( CSave &save ); int Save( CSave &save );
int Restore( CRestore &restore ); int Restore( CRestore &restore );
static TYPEDESCRIPTION m_SaveData[]; static TYPEDESCRIPTION m_SaveData[];
@ -929,7 +929,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -955,7 +955,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -966,7 +966,7 @@ public:
class CSatchel : public CBasePlayerWeapon class CSatchel : public CBasePlayerWeapon
{ {
public: public:
#ifndef CLIENT_DLL #if !CLIENT_DLL
int Save( CSave &save ); int Save( CSave &save );
int Restore( CRestore &restore ); int Restore( CRestore &restore );
static TYPEDESCRIPTION m_SaveData[]; static TYPEDESCRIPTION m_SaveData[];
@ -989,7 +989,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -1018,7 +1018,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;
@ -1046,7 +1046,7 @@ public:
virtual BOOL UseDecrement( void ) virtual BOOL UseDecrement( void )
{ {
#if defined( CLIENT_WEAPONS ) #if CLIENT_WEAPONS
return TRUE; return TRUE;
#else #else
return FALSE; return FALSE;

2
dlls/world.cpp
View File

@ -297,7 +297,7 @@ globalentity_t *CGlobalState::Find( string_t globalname )
} }
// This is available all the time now on impulse 104, remove later // This is available all the time now on impulse 104, remove later
//#ifdef _DEBUG //#if _DEBUG
void CGlobalState::DumpGlobals( void ) void CGlobalState::DumpGlobals( void )
{ {
static const char *estates[] = { "Off", "On", "Dead" }; static const char *estates[] = { "Off", "On", "Dead" };

6
pm_shared/pm_debug.c
View File

@ -14,7 +14,7 @@
****/ ****/
#include <math.h> #include <math.h>
#include "mathlib.h" #include "mathlib.h"
#ifdef HAVE_TGMATH_H #if HAVE_TGMATH_H
#include <tgmath.h> #include <tgmath.h>
#endif #endif
@ -27,7 +27,7 @@
#include <string.h> #include <string.h>
#ifdef _MSC_VER #if _MSC_VER
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
#pragma warning(disable : 4305) #pragma warning(disable : 4305)
#endif #endif
@ -268,7 +268,7 @@ void PM_DrawBBox(vec3_t mins, vec3_t maxs, vec3_t origin, int pcolor, float life
} }
#ifndef DEDICATED #if !DEDICATED
/* /*
================ ================

6
pm_shared/pm_defs.h
View File

@ -194,7 +194,7 @@ typedef struct playermove_s
int (*PM_PointContents)( float *p, int *truecontents /*filled in if this is non-null*/ ); int (*PM_PointContents)( float *p, int *truecontents /*filled in if this is non-null*/ );
int (*PM_TruePointContents)( float *p ); int (*PM_TruePointContents)( float *p );
int (*PM_HullPointContents)( struct hull_s *hull, int num, float *p ); int (*PM_HullPointContents)( struct hull_s *hull, int num, float *p );
#ifdef __MINGW32__ #if __MINGW32__
pmtrace_t *(*PM_PlayerTrace_real)( pmtrace_t * retvalue, float *start, float *end, int traceFlags, int ignore_pe ); pmtrace_t *(*PM_PlayerTrace_real)( pmtrace_t * retvalue, float *start, float *end, int traceFlags, int ignore_pe );
#else #else
@ -218,7 +218,7 @@ typedef struct playermove_s
void (*PM_PlaySound)( int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch ); void (*PM_PlaySound)( int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch );
const char *(*PM_TraceTexture)( int ground, float *vstart, float *vend ); const char *(*PM_TraceTexture)( int ground, float *vstart, float *vend );
void (*PM_PlaybackEventFull)( int flags, int clientindex, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 ); void (*PM_PlaybackEventFull)( int flags, int clientindex, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
#ifdef __MINGW32__ #if __MINGW32__
pmtrace_t *(*PM_PlayerTraceEx_real) (pmtrace_t *retvalue, float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe )); pmtrace_t *(*PM_PlayerTraceEx_real) (pmtrace_t *retvalue, float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe ));
#else #else
pmtrace_t (*PM_PlayerTraceEx) (float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe )); pmtrace_t (*PM_PlayerTraceEx) (float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe ));
@ -228,7 +228,7 @@ typedef struct playermove_s
struct msurface_s *(*PM_TraceSurface)( int ground, float *vstart, float *vend ); struct msurface_s *(*PM_TraceSurface)( int ground, float *vstart, float *vend );
} playermove_t; } playermove_t;
#ifdef __MINGW32__ #if __MINGW32__
static pmtrace_t _pm_globalresult, _pm_globaltmp; static pmtrace_t _pm_globalresult, _pm_globaltmp;
static inline pmtrace_t PM_PlayerTrace_wrap( float *start, float *end, int traceFlags, int ignore_pe, playermove_t *pmove ) static inline pmtrace_t PM_PlayerTrace_wrap( float *start, float *end, int traceFlags, int ignore_pe, playermove_t *pmove )
{ {

4
pm_shared/pm_math.c
View File

@ -15,7 +15,7 @@
// pm_math.c -- math primitives // pm_math.c -- math primitives
#include <math.h> #include <math.h>
#include "mathlib.h" #include "mathlib.h"
#ifdef HAVE_TGMATH_H #if HAVE_TGMATH_H
#include <tgmath.h> #include <tgmath.h>
#endif #endif
#include "const.h" #include "const.h"
@ -27,7 +27,7 @@
// fall over // fall over
#define ROLL 2 #define ROLL 2
#ifdef _MSC_VER #if _MSC_VER
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
#endif #endif

10
pm_shared/pm_shared.c
View File

@ -20,7 +20,7 @@
#include <stdlib.h> // atoi #include <stdlib.h> // atoi
#include <ctype.h> // isspace #include <ctype.h> // isspace
#include "mathlib.h" #include "mathlib.h"
#ifdef HAVE_TGMATH_H #if HAVE_TGMATH_H
#include <tgmath.h> #include <tgmath.h>
#endif #endif
@ -33,7 +33,7 @@
int g_bhopcap = 1; int g_bhopcap = 1;
#ifdef CLIENT_DLL #if CLIENT_DLL
// Spectator Mode // Spectator Mode
int iJumpSpectator; int iJumpSpectator;
extern float vJumpOrigin[3]; extern float vJumpOrigin[3];
@ -42,7 +42,7 @@ extern float vJumpAngles[3];
static int pm_shared_initialized = 0; static int pm_shared_initialized = 0;
#ifdef _MSC_VER #if _MSC_VER
#pragma warning( disable : 4305 ) #pragma warning( disable : 4305 )
#endif #endif
@ -87,7 +87,7 @@ playermove_t *pmove = NULL;
#define PLAYER_DUCKING_MULTIPLIER 0.333f #define PLAYER_DUCKING_MULTIPLIER 0.333f
// double to float warning // double to float warning
#ifdef _MSC_VER #if _MSC_VER
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
#endif #endif
@ -1824,7 +1824,7 @@ void PM_SpectatorMove( void )
if( pmove->iuser1 == OBS_ROAMING ) if( pmove->iuser1 == OBS_ROAMING )
{ {
#ifdef CLIENT_DLL #if CLIENT_DLL
// jump only in roaming mode // jump only in roaming mode
if( iJumpSpectator ) if( iJumpSpectator )
{ {

12
wscript
View File

@ -256,8 +256,8 @@ def configure(conf):
conf.define_cond('HAVE_CMATH', cmath_usable) conf.define_cond('HAVE_CMATH', cmath_usable)
if conf.env.COMPILER_CC == 'msvc': if conf.env.COMPILER_CC == 'msvc':
conf.define('_CRT_SECURE_NO_WARNINGS', 1) conf.define('_CRT_SECURE_NO_WARNINGS', True)
conf.define('_CRT_NONSTDC_NO_DEPRECATE', 1) conf.define('_CRT_NONSTDC_NO_DEPRECATE', True)
elif conf.env.COMPILER_CC == 'owcc': elif conf.env.COMPILER_CC == 'owcc':
pass pass
else: else:
@ -271,14 +271,14 @@ def configure(conf):
if conf.env.cxxshlib_PATTERN.startswith('lib'): if conf.env.cxxshlib_PATTERN.startswith('lib'):
conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:] conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:]
conf.define('CLIENT_WEAPONS', '1') conf.define('BARNACLE_FIX_VISIBILITY', False)
conf.define('CLIENT_WEAPONS', True)
conf.define('CROWBAR_IDLE_ANIM', False) conf.define('CROWBAR_IDLE_ANIM', False)
conf.define('CROWBAR_DELAY_FIX', False) conf.define('CROWBAR_DELAY_FIX', False)
conf.define('CROWBAR_FIX_RAPID_CROWBAR', False) conf.define('CROWBAR_FIX_RAPID_CROWBAR', False)
conf.define('GAUSS_OVERCHARGE_FIX', False) conf.define('GAUSS_OVERCHARGE_FIX', False)
conf.define('OEM_BUILD', False)
if conf.env.DEST_OS == 'android' or conf.options.ENABLE_MOD_HACKS: conf.define('HLDEMO_BUILD', False)
conf.define('MOBILE_HACKS', '1')
conf.add_subproject(["cl_dll", "dlls"]) conf.add_subproject(["cl_dll", "dlls"])