diff --git a/.github/workflows/.github.yml b/.github/workflows/.github.yml new file mode 100644 index 00000000..87f8bcb2 --- /dev/null +++ b/.github/workflows/.github.yml @@ -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 + diff --git a/README.md b/README.md index fe9e883f..86c9c9c0 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/cl_dll/cl_dll.dsp b/cl_dll/cl_dll.dsp deleted file mode 100644 index 17beb9ae..00000000 --- a/cl_dll/cl_dll.dsp +++ /dev/null @@ -1,636 +0,0 @@ -# Microsoft Developer Studio Project File - Name="cl_dll" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=cl_dll - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cl_dll.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cl_dll.mak" CFG="cl_dll - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cl_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "cl_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "cl_dll - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\Release" -# PROP BASE Intermediate_Dir ".\Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\temp\cl_dll\!release" -# PROP Intermediate_Dir "..\temp\cl_dll\!release" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\utils\false_vgui\include" /I "..\engine" /I "..\common" /I "..\pm_shared" /I "..\dlls" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "CLIENT_DLL" /D "CLIENT_WEAPONS" /YX /FD /c -# SUBTRACT CPP /Z -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib winmm.lib ../utils/vgui/lib/win32_vc6/vgui.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\temp\cl_dll\!release/client.dll" -# SUBTRACT LINK32 /map -# Begin Custom Build -TargetDir=\Xash3D\src_main\temp\cl_dll\!release -InputPath=\Xash3D\src_main\temp\cl_dll\!release\client.dll -SOURCE="$(InputPath)" - -"D:\Xash3D\valve\cl_dlls\client.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetDir)\client.dll "D:\Xash3D\valve\cl_dlls\client.dll" - -# End Custom Build - -!ELSEIF "$(CFG)" == "cl_dll - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\Debug" -# PROP BASE Intermediate_Dir ".\Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\temp\cl_dll\!debug" -# PROP Intermediate_Dir "..\temp\cl_dll\!debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /G5 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\dlls" /I "..\common" /I "..\pm_shared" /I "..\engine" /I "..\utils\false_vgui\include" /I "..\game_shared" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "CLIENT_DLL" /D "CLIENT_WEAPONS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib winmm.lib ../utils/vgui/lib/win32_vc6/vgui.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\temp\cl_dll\!debug/client.dll" -# Begin Custom Build -TargetDir=\Xash3D\src_main\temp\cl_dll\!debug -InputPath=\Xash3D\src_main\temp\cl_dll\!debug\client.dll -SOURCE="$(InputPath)" - -"D:\Xash3D\valve\cl_dlls\client.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetDir)\client.dll "D:\Xash3D\valve\cl_dlls\client.dll" - -# End Custom Build - -!ENDIF - -# Begin Target - -# Name "cl_dll - Win32 Release" -# Name "cl_dll - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90" -# Begin Group "hl" - -# PROP Default_Filter "*.CPP" -# Begin Source File - -SOURCE=..\dlls\crossbow.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\crowbar.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\egon.cpp -# End Source File -# Begin Source File - -SOURCE=.\ev_hldm.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\gauss.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\handgrenade.cpp -# End Source File -# Begin Source File - -SOURCE=.\hl\hl_baseentity.cpp -# End Source File -# Begin Source File - -SOURCE=.\hl\hl_events.cpp -# End Source File -# Begin Source File - -SOURCE=.\hl\hl_objects.cpp -# End Source File -# Begin Source File - -SOURCE=.\hl\hl_weapons.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\glock.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\hornetgun.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\mp5.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\python.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\rpg.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\satchel.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\shotgun.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\squeakgrenade.cpp -# End Source File -# Begin Source File - -SOURCE=..\dlls\tripmine.cpp -# End Source File -# Begin Source File - -SOURCE=..\game_shared\vgui_scrollbar2.cpp -# End Source File -# Begin Source File - -SOURCE=..\game_shared\vgui_slider2.cpp -# End Source File -# Begin Source File - -SOURCE=..\game_shared\voice_banmgr.cpp -# End Source File -# Begin Source File - -SOURCE=..\game_shared\voice_status.cpp -# End Source File -# End Group -# Begin Source File - -SOURCE=.\ammo.cpp -# End Source File -# Begin Source File - -SOURCE=.\ammo_secondary.cpp -# End Source File -# Begin Source File - -SOURCE=.\ammohistory.cpp -# End Source File -# Begin Source File - -SOURCE=.\battery.cpp -# End Source File -# Begin Source File - -SOURCE=.\cdll_int.cpp -# End Source File -# Begin Source File - -SOURCE=.\com_weapons.cpp -# End Source File -# Begin Source File - -SOURCE=.\death.cpp -# End Source File -# Begin Source File - -SOURCE=.\demo.cpp -# End Source File -# Begin Source File - -SOURCE=.\entity.cpp -# End Source File -# Begin Source File - -SOURCE=.\ev_common.cpp -# End Source File -# Begin Source File - -SOURCE=.\events.cpp -# End Source File -# Begin Source File - -SOURCE=.\flashlight.cpp -# End Source File -# Begin Source File - -SOURCE=.\GameStudioModelRenderer.cpp -# End Source File -# Begin Source File - -SOURCE=.\geiger.cpp -# End Source File -# Begin Source File - -SOURCE=.\health.cpp -# End Source File -# Begin Source File - -SOURCE=.\hud.cpp -# End Source File -# Begin Source File - -SOURCE=.\hud_msg.cpp -# End Source File -# Begin Source File - -SOURCE=.\hud_redraw.cpp -# End Source File -# Begin Source File - -SOURCE=.\hud_servers.cpp -# End Source File -# Begin Source File - -SOURCE=.\hud_spectator.cpp -# End Source File -# Begin Source File - -SOURCE=.\hud_update.cpp -# End Source File -# Begin Source File - -SOURCE=.\in_camera.cpp -# End Source File -# Begin Source File - -SOURCE=.\input.cpp -# End Source File -# Begin Source File - -SOURCE=.\input_goldsource.cpp -# End Source File -# Begin Source File - -SOURCE=.\input_mouse.cpp -# End Source File -# Begin Source File - -SOURCE=.\input_xash3d.cpp -# End Source File -# Begin Source File - -SOURCE=.\menu.cpp -# End Source File -# Begin Source File - -SOURCE=.\message.cpp -# End Source File -# Begin Source File - -SOURCE=.\overview.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\parsemsg.cpp -# End Source File -# Begin Source File - -SOURCE=.\parsemsg.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_debug.c -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_math.c -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_shared.c -# End Source File -# Begin Source File - -SOURCE=.\saytext.cpp -# End Source File -# Begin Source File - -SOURCE=.\status_icons.cpp -# End Source File -# Begin Source File - -SOURCE=.\statusbar.cpp -# End Source File -# Begin Source File - -SOURCE=.\studio_util.cpp -# End Source File -# Begin Source File - -SOURCE=.\StudioModelRenderer.cpp -# End Source File -# Begin Source File - -SOURCE=.\text_message.cpp -# End Source File -# Begin Source File - -SOURCE=.\train.cpp -# End Source File -# Begin Source File - -SOURCE=.\tri.cpp -# End Source File -# Begin Source File - -SOURCE=.\util.cpp -# End Source File -# Begin Source File - -SOURCE=..\game_shared\vgui_checkbutton2.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_ClassMenu.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_ConsolePanel.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_ControlConfigPanel.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_CustomObjects.cpp -# End Source File -# Begin Source File - -SOURCE=..\game_shared\vgui_grid.cpp -# End Source File -# Begin Source File - -SOURCE=..\game_shared\vgui_helpers.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_int.cpp -# End Source File -# Begin Source File - -SOURCE=..\game_shared\vgui_listbox.cpp -# End Source File -# Begin Source File - -SOURCE=..\game_shared\vgui_loadtga.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_MOTDWindow.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_SchemeManager.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_ScorePanel.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_ServerBrowser.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_SpectatorPanel.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_TeamFortressViewport.cpp -# End Source File -# Begin Source File - -SOURCE=.\vgui_teammenu.cpp -# End Source File -# Begin Source File - -SOURCE=.\view.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\ammo.h -# End Source File -# Begin Source File - -SOURCE=.\ammohistory.h -# End Source File -# Begin Source File - -SOURCE=.\camera.h -# End Source File -# Begin Source File - -SOURCE=.\cl_dll.h -# End Source File -# Begin Source File - -SOURCE=.\com_weapons.h -# End Source File -# Begin Source File - -SOURCE=.\demo.h -# End Source File -# Begin Source File - -SOURCE=.\ev_hldm.h -# End Source File -# Begin Source File - -SOURCE=.\eventscripts.h -# End Source File -# Begin Source File - -SOURCE=.\GameStudioModelRenderer.h -# End Source File -# Begin Source File - -SOURCE=.\health.h -# End Source File -# Begin Source File - -SOURCE=.\hud.h -# End Source File -# Begin Source File - -SOURCE=.\hud_iface.h -# End Source File -# Begin Source File - -SOURCE=.\hud_servers.h -# End Source File -# Begin Source File - -SOURCE=.\hud_servers_priv.h -# End Source File -# Begin Source File - -SOURCE=.\hud_spectator.h -# End Source File -# Begin Source File - -SOURCE=.\in_defs.h -# End Source File -# Begin Source File - -SOURCE=.\input_mouse.h -# End Source File -# Begin Source File - -SOURCE=..\common\itrackeruser.h -# End Source File -# Begin Source File - -SOURCE=.\kbutton.h -# End Source File -# Begin Source File - -SOURCE=.\overview.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_debug.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_defs.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_info.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_materials.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_movevars.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_shared.h -# End Source File -# Begin Source File - -SOURCE=.\studio_util.h -# End Source File -# Begin Source File - -SOURCE=.\StudioModelRenderer.h -# End Source File -# Begin Source File - -SOURCE=.\util.h -# End Source File -# Begin Source File - -SOURCE=.\util_vector.h -# End Source File -# Begin Source File - -SOURCE=.\vgui_ConsolePanel.h -# End Source File -# Begin Source File - -SOURCE=.\vgui_ControlConfigPanel.h -# End Source File -# Begin Source File - -SOURCE=.\vgui_int.h -# End Source File -# Begin Source File - -SOURCE=.\vgui_SchemeManager.h -# End Source File -# Begin Source File - -SOURCE=.\vgui_ScorePanel.h -# End Source File -# Begin Source File - -SOURCE=.\vgui_ServerBrowser.h -# End Source File -# Begin Source File - -SOURCE=.\vgui_SpectatorPanel.h -# End Source File -# Begin Source File - -SOURCE=.\vgui_TeamFortressViewport.h -# End Source File -# Begin Source File - -SOURCE=.\view.h -# End Source File -# Begin Source File - -SOURCE=..\game_shared\voice_banmgr.h -# End Source File -# Begin Source File - -SOURCE=..\game_shared\voice_status.h -# End Source File -# Begin Source File - -SOURCE=..\game_shared\voice_vgui_tweakdlg.h -# End Source File -# Begin Source File - -SOURCE=.\wrect.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/cl_dll/in_camera.cpp b/cl_dll/in_camera.cpp index 3b089577..ad5ec8bf 100644 --- a/cl_dll/in_camera.cpp +++ b/cl_dll/in_camera.cpp @@ -148,7 +148,7 @@ void DLLEXPORT CAM_Think( void ) float dist; vec3_t camAngles; float flSensitivity; -#ifdef LATER +#if LATER int i; #endif vec3_t viewangles; @@ -168,7 +168,7 @@ void DLLEXPORT CAM_Think( void ) if( !cam_thirdperson ) return; -#ifdef LATER +#if LATER if( cam_contain->value ) { gEngfuncs.GetClientOrigin( origin ); @@ -315,7 +315,7 @@ void DLLEXPORT CAM_Think( void ) cam_old_mouse_y = cam_mouse.y * gHUD.GetSensitivity(); SetCursorPos( gEngfuncs.GetWindowCenterX(), gEngfuncs.GetWindowCenterY() ); } -#ifdef LATER +#if LATER if( cam_contain->value ) { // check new ideal @@ -368,7 +368,7 @@ void DLLEXPORT CAM_Think( void ) else camAngles[2] += ( cam_idealdist->value - camAngles[2] ) * 0.25f; } -#ifdef LATER +#if LATER if( cam_contain->value ) { // Test new position diff --git a/cl_dll/in_defs.h b/cl_dll/in_defs.h index b4c51730..7221c356 100644 --- a/cl_dll/in_defs.h +++ b/cl_dll/in_defs.h @@ -16,7 +16,7 @@ // fall over #define ROLL 2 -#ifdef _WIN32 +#if _WIN32 #define HSPRITE HSPRITE_win32 #include #undef HSPRITE diff --git a/cl_dll/input_goldsource.cpp b/cl_dll/input_goldsource.cpp index be85ee3a..8698a5d3 100644 --- a/cl_dll/input_goldsource.cpp +++ b/cl_dll/input_goldsource.cpp @@ -23,7 +23,7 @@ #include "keydefs.h" #include "view.h" -#ifndef _WIN32 +#if !_WIN32 #define USE_SDL2 #endif @@ -114,7 +114,7 @@ static SDLFunction sdlFunctions[] = { }; #endif -#ifdef _WIN32 +#if _WIN32 #include #else typedef unsigned int DWORD; @@ -149,14 +149,14 @@ extern cvar_t *cl_forwardspeed; extern cvar_t *cl_pitchspeed; extern cvar_t *cl_movespeedkey; -#ifdef _WIN32 +#if _WIN32 static double s_flRawInputUpdateTime = 0.0f; static bool m_bRawInput = false; static bool m_bMouseThread = false; bool isMouseRelative = false; #endif -#ifdef _WIN32 +#if _WIN32 #include "progdefs.h" extern globalvars_t *gpGlobals; #endif @@ -184,7 +184,7 @@ static cvar_t *m_customaccel_max; //Mouse move is raised to this power before being scaled by scale factor static cvar_t *m_customaccel_exponent; -#ifdef _WIN32 +#if _WIN32 // if threaded mouse is enabled then the time to sleep between polls static cvar_t *m_mousethread_sleep; #endif @@ -276,7 +276,7 @@ cvar_t *joy_wwhack2; int joy_avail, joy_advancedinit, joy_haspov; -#ifdef _WIN32 +#if _WIN32 unsigned int s_hMouseThreadId = 0; HANDLE s_hMouseThread = 0; HANDLE s_hMouseQuitEvent = 0; @@ -300,7 +300,7 @@ void Force_CenterView_f (void) } } -#ifdef _WIN32 +#if _WIN32 LONG mouseThreadActive = 0; LONG mouseThreadCenterX = 0; @@ -382,14 +382,14 @@ void IN_SetMouseMode(bool enable) if(enable) { -#ifdef _WIN32 +#if _WIN32 if (mouseparmsvalid) restore_spi = SystemParametersInfo (SPI_SETMOUSE, 0, newmouseparms, 0); m_bRawInput = CVAR_GET_FLOAT( "m_rawinput" ) != 0; if(m_bRawInput) { -#ifdef USE_SDL2 +#if USE_SDL2 safe_pfnSDL_SetRelativeMouseMode(SDL_TRUE); #endif isMouseRelative = true; @@ -402,10 +402,10 @@ void IN_SetMouseMode(bool enable) } else { -#ifdef _WIN32 +#if _WIN32 if(isMouseRelative) { -#ifdef USE_SDL2 +#if USE_SDL2 safe_pfnSDL_SetRelativeMouseMode(SDL_FALSE); #endif isMouseRelative = false; @@ -423,7 +423,7 @@ void IN_SetMouseMode(bool enable) void IN_SetVisibleMouse(bool visible) { -#ifdef _WIN32 +#if _WIN32 bool lockEntered = MouseThread_ActiveLock_Enter(); #endif @@ -431,7 +431,7 @@ void IN_SetVisibleMouse(bool visible) IN_SetMouseMode(!visible); -#ifdef _WIN32 +#if _WIN32 UpdateMouseThreadActive(); if(lockEntered) MouseThread_ActiveLock_Exit(); #endif @@ -448,7 +448,7 @@ void GoldSourceInput::IN_ActivateMouse (void) { if (mouseinitialized) { -#ifdef _WIN32 +#if _WIN32 bool lockEntered = MouseThread_ActiveLock_Enter(); #endif @@ -456,7 +456,7 @@ void GoldSourceInput::IN_ActivateMouse (void) mouseactive = 1; -#ifdef _WIN32 +#if _WIN32 UpdateMouseThreadActive(); if(lockEntered) MouseThread_ActiveLock_Exit(); #endif @@ -476,7 +476,7 @@ void GoldSourceInput::IN_DeactivateMouse (void) { if (mouseinitialized) { -#ifdef _WIN32 +#if _WIN32 bool lockEntered = MouseThread_ActiveLock_Enter(); #endif @@ -484,7 +484,7 @@ void GoldSourceInput::IN_DeactivateMouse (void) mouseactive = 0; -#ifdef _WIN32 +#if _WIN32 UpdateMouseThreadActive(); if(lockEntered) MouseThread_ActiveLock_Exit(); #endif @@ -502,7 +502,7 @@ void GoldSourceInput::IN_StartupMouse (void) return; mouseinitialized = 1; -#ifdef _WIN32 +#if _WIN32 mouseparmsvalid = SystemParametersInfo (SPI_GETMOUSE, 0, originalmouseparms, 0); if (mouseparmsvalid) @@ -537,7 +537,7 @@ void GoldSourceInput::IN_Shutdown (void) { IN_DeactivateMouse (); -#ifdef _WIN32 +#if _WIN32 if ( s_hMouseQuitEvent ) { SetEvent( s_hMouseQuitEvent ); @@ -597,7 +597,7 @@ FIXME: Call through to engine? void IN_ResetMouse( void ) { // no work to do in SDL -#ifdef _WIN32 +#if _WIN32 // reset only if mouse is active and not in visible mode: if(mouseactive && !iVisibleMouse && gEngfuncs.GetWindowCenterX && gEngfuncs.GetWindowCenterY) { @@ -712,7 +712,7 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY) if(active) { int deltaX, deltaY; -#ifdef _WIN32 +#if _WIN32 if ( !m_bRawInput ) { if ( m_bMouseThread ) @@ -746,7 +746,7 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY) #endif } -#ifdef _WIN32 +#if _WIN32 if ( !m_bRawInput ) { if ( m_bMouseThread ) @@ -771,7 +771,7 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY) my_accum = 0; // reset mouse position if required, so there is room to move: -#ifdef _WIN32 +#if _WIN32 // do not reset if mousethread would do it: if ( m_bRawInput || !m_bMouseThread ) #else @@ -779,7 +779,7 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY) #endif IN_ResetMouse(); -#ifdef _WIN32 +#if _WIN32 // update m_bRawInput occasionally: if ( gpGlobals && gpGlobals->time - s_flRawInputUpdateTime > 1.0f ) { @@ -791,14 +791,14 @@ void GoldSourceInput::IN_GetMouseDelta( int *pOutX, int *pOutY) if(m_bRawInput && !isMouseRelative) { -#ifdef USE_SDL2 +#if USE_SDL2 safe_pfnSDL_SetRelativeMouseMode(SDL_TRUE); #endif isMouseRelative = true; } else if(!m_bRawInput && isMouseRelative) { -#ifdef USE_SDL2 +#if USE_SDL2 safe_pfnSDL_SetRelativeMouseMode(SDL_FALSE); #endif isMouseRelative = false; @@ -928,7 +928,7 @@ void GoldSourceInput::IN_Accumulate (void) { if (mouseactive) { -#ifdef _WIN32 +#if _WIN32 if ( !m_bRawInput ) { if ( !m_bMouseThread ) @@ -956,7 +956,7 @@ void GoldSourceInput::IN_Accumulate (void) } // force the mouse to the center, so there's room to move -#ifdef _WIN32 +#if _WIN32 // do not reset if mousethread would do it: if ( m_bRawInput || !m_bMouseThread ) #else @@ -1570,7 +1570,7 @@ void GoldSourceInput::IN_Init (void) m_customaccel_max = gEngfuncs.pfnRegisterVariable ( "m_customaccel_max", "0", 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_bMouseThread = gEngfuncs.CheckParm ("-mousethread", NULL ) != NULL; 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 #ifdef USE_SDL2 -#ifdef __APPLE__ +#if __APPLE__ #define SDL2_FULL_LIBNAME "libsdl2-2.0.0.dylib" #else #define SDL2_FULL_LIBNAME "libSDL2-2.0.so.0" diff --git a/cl_dll/tf_defs.h b/cl_dll/tf_defs.h index a9270f1e..ba7ae0f9 100644 --- a/cl_dll/tf_defs.h +++ b/cl_dll/tf_defs.h @@ -46,7 +46,7 @@ // Debug Options //#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. -#ifdef MAP_DEBUG +#if MAP_DEBUG #define MDEBUG(x) x #else #define MDEBUG(x) diff --git a/dlls/AI_BaseNPC_Schedule.cpp b/dlls/AI_BaseNPC_Schedule.cpp index 468bb358..a6e4962b 100644 --- a/dlls/AI_BaseNPC_Schedule.cpp +++ b/dlls/AI_BaseNPC_Schedule.cpp @@ -181,7 +181,7 @@ BOOL CBaseMonster :: FScheduleValid ( void ) 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 ) { // fail! Send a visual indicator. diff --git a/dlls/apache.cpp b/dlls/apache.cpp index e69d72e9..0844e2c4 100644 --- a/dlls/apache.cpp +++ b/dlls/apache.cpp @@ -12,7 +12,7 @@ * use or distribution of this code by or to any unlicensed person is illegal. * ****/ -#ifndef OEM_BUILD +#if !OEM_BUILD #include "extdll.h" #include "util.h" diff --git a/dlls/barnacle.cpp b/dlls/barnacle.cpp index 9207e608..7f16837d 100644 --- a/dlls/barnacle.cpp +++ b/dlls/barnacle.cpp @@ -59,7 +59,7 @@ public: // FIXME: need a custom barnacle model with non-generic hitgroup // otherwise we can apply to damage to tongue instead of body -#ifdef BARNACLE_FIX_VISIBILITY +#if BARNACLE_FIX_VISIBILITY void SetObjectCollisionBox( void ) { pev->absmin = pev->origin + Vector( -16.0f, -16.0f, -m_flCachedLength ); @@ -182,7 +182,7 @@ void CBarnacle::BarnacleThink( void ) CBaseEntity *pTouchEnt; CBaseMonster *pVictim; 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 ) ) { // recalc collision box here to avoid barnacle disappears bug diff --git a/dlls/bigmomma.cpp b/dlls/bigmomma.cpp index 584a6737..62188740 100644 --- a/dlls/bigmomma.cpp +++ b/dlls/bigmomma.cpp @@ -12,7 +12,7 @@ * 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 diff --git a/dlls/cbase.cpp b/dlls/cbase.cpp index 7f1f204a..cfc78697 100644 --- a/dlls/cbase.cpp +++ b/dlls/cbase.cpp @@ -98,7 +98,7 @@ static DLL_FUNCTIONS gFunctionTable = static void SetObjectCollisionBox( entvars_t *pev ); -#ifndef _WIN32 +#if !_WIN32 extern "C" { #endif int GetEntityAPI( DLL_FUNCTIONS *pFunctionTable, int interfaceVersion ) @@ -125,7 +125,7 @@ int GetEntityAPI2( DLL_FUNCTIONS *pFunctionTable, int *interfaceVersion ) return TRUE; } -#ifndef _WIN32 +#if !_WIN32 } #endif diff --git a/dlls/cbase.h b/dlls/cbase.h index ee9ead91..11f83703 100644 --- a/dlls/cbase.h +++ b/dlls/cbase.h @@ -279,7 +279,7 @@ public: } // Ugly code to lookup all functions to make sure they are exported when set. -#ifdef _DEBUG +#if _DEBUG void FunctionCheck( void *pFunction, char *name ) { if( pFunction && !NAME_FOR_FUNCTION( pFunction ) ) @@ -338,7 +338,7 @@ public: // 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. -#ifdef _DEBUG +#if _DEBUG #define SetThink( a ) ThinkSet( static_cast (a), #a ) #define SetTouch( a ) TouchSet( static_cast (a), #a ) diff --git a/dlls/client.cpp b/dlls/client.cpp index 6cde6061..29422745 100644 --- a/dlls/client.cpp +++ b/dlls/client.cpp @@ -209,7 +209,7 @@ void ClientPutInServer( edict_t *pEntity ) pPlayer->pev->iuser4 = 0; } -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR #include "voice_gamemgr.h" extern CVoiceGameMgr g_VoiceGameMgr; #endif @@ -405,7 +405,7 @@ void Host_Say( edict_t *pEntity, int teamonly ) if( !( client->IsNetClient() ) ) // Not a client ? (should never be true) continue; -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR // can the receiver hear the sender? or has he muted him? if( g_VoiceGameMgr.PlayerHasBlockedPlayer( client, player ) ) continue; @@ -1629,7 +1629,7 @@ void RegisterEncoders( void ) int GetWeaponData( struct edict_s *player, struct weapon_data_s *info ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS int i; weapon_data_t *item; entvars_t *pev = &player->v; @@ -1760,7 +1760,7 @@ void UpdateClientData( const struct edict_s *ent, int sendweapons, struct client cd->iuser2 = pev->iuser2; cd->iuser4 = pev->iuser4; } -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS if( sendweapons ) { if( pl ) diff --git a/dlls/compile.bat b/dlls/compile.bat index f97806a5..0106f56d 100644 --- a/dlls/compile.bat +++ b/dlls/compile.bat @@ -113,7 +113,7 @@ set LIBS=user32.lib set OUTNAME=hl.dll set DEBUG=/debug -cl %DEFINES% %LIBS% %SOURCES% %INCLUDES% -o %OUTNAME% /link /dll /out:%OUTNAME% %DEBUG% /def:".\hl.def" +cl %DEFINES% %LIBS% %SOURCES% %INCLUDES% -o %OUTNAME% /link /dll /out:%OUTNAME% %DEBUG% echo -- Compile done. Cleaning... diff --git a/dlls/controller.cpp b/dlls/controller.cpp index 1f851766..20c9a502 100644 --- a/dlls/controller.cpp +++ b/dlls/controller.cpp @@ -12,7 +12,7 @@ * 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 diff --git a/dlls/crossbow.cpp b/dlls/crossbow.cpp index fd1bd5fe..eb800274 100644 --- a/dlls/crossbow.cpp +++ b/dlls/crossbow.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -24,7 +24,7 @@ #include "gamerules.h" #include "shake.h" -#ifndef CLIENT_DLL +#if !CLIENT_DLL #define BOLT_AIR_VELOCITY 2000 #define BOLT_WATER_VELOCITY 1000 @@ -369,7 +369,7 @@ void CCrossbow::FireBolt() anglesAim.x = -anglesAim.x; -#ifndef CLIENT_DLL +#if !CLIENT_DLL Vector vecSrc = m_pPlayer->GetGunPosition() - gpGlobals->v_up * 2.0f; Vector vecDir = gpGlobals->v_forward; diff --git a/dlls/crowbar.cpp b/dlls/crowbar.cpp index 566cbe89..ccb8d83a 100644 --- a/dlls/crowbar.cpp +++ b/dlls/crowbar.cpp @@ -37,7 +37,7 @@ enum crowbar_e CROWBAR_ATTACK2MISS, CROWBAR_ATTACK2HIT, CROWBAR_ATTACK3MISS, -#ifndef CROWBAR_IDLE_ANIM +#if !CROWBAR_IDLE_ANIM CROWBAR_ATTACK3HIT #else CROWBAR_ATTACK3HIT, @@ -180,7 +180,7 @@ void CCrowbar::Swing() UTIL_TraceLine( vecSrc, vecEnd, dont_ignore_monsters, ENT( m_pPlayer->pev ), &tr ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( tr.flFraction >= 1.0f ) { UTIL_TraceHull( vecSrc, vecEnd, dont_ignore_monsters, head_hull, ENT( m_pPlayer->pev ), &tr ); @@ -219,7 +219,7 @@ void CCrowbar::Swing() } m_flNextPrimaryAttack = ( static_cast( m_iSwing ) * 0.03f ) + UTIL_WeaponTimeBase() + 0.5f; EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_WEAPON, "weapons/pipe_miss.wav", 1, ATTN_NORM, 0, 94 + RANDOM_LONG( 0, 0xF ) ); -#ifdef CROWBAR_IDLE_ANIM +#if CROWBAR_IDLE_ANIM m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); #endif // player "shoot" animation @@ -243,7 +243,7 @@ void CCrowbar::Swing() // player "shoot" animation m_pPlayer->SetAnimation( PLAYER_ATTACK1 ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL // hit CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit ); @@ -326,12 +326,12 @@ void CCrowbar::Swing() pev->nextthink = gpGlobals->time + 0.2f; #endif } -#ifdef CROWBAR_IDLE_ANIM +#if CROWBAR_IDLE_ANIM m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + UTIL_SharedRandomFloat( m_pPlayer->random_seed, 10, 15 ); #endif } -#ifdef CROWBAR_IDLE_ANIM +#if CROWBAR_IDLE_ANIM void CCrowbar::WeaponIdle( void ) { if( m_flTimeWeaponIdle < UTIL_WeaponTimeBase() ) diff --git a/dlls/doors.cpp b/dlls/doors.cpp index 7a17842b..321c194c 100644 --- a/dlls/doors.cpp +++ b/dlls/doors.cpp @@ -685,7 +685,7 @@ void CBaseDoor::DoorGoDown( void ) if( !FBitSet( pev->spawnflags, SF_DOOR_SILENT ) ) 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 ); -#ifdef DOOR_ASSERT +#if DOOR_ASSERT ASSERT( m_toggle_state == TS_AT_TOP ); #endif // DOOR_ASSERT m_toggle_state = TS_GOING_DOWN; diff --git a/dlls/egon.cpp b/dlls/egon.cpp index a52e58ab..efbe4449 100644 --- a/dlls/egon.cpp +++ b/dlls/egon.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -178,7 +178,7 @@ void CEgon::Attack( void ) Vector vecSrc = m_pPlayer->GetGunPosition(); int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -252,7 +252,7 @@ void CEgon::Fire( const Vector &vecOrigSrc, const Vector &vecDir ) if( tr.fAllSolid ) return; -#ifndef CLIENT_DLL +#if !CLIENT_DLL CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit ); if( pEntity == NULL ) @@ -275,7 +275,7 @@ void CEgon::Fire( const Vector &vecOrigSrc, const Vector &vecDir ) switch( m_fireMode ) { case FIRE_NARROW: -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( pev->dmgtime < gpGlobals->time ) { // 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(); break; case FIRE_WIDE: -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( pev->dmgtime < gpGlobals->time ) { // 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 ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( !m_pBeam ) { CreateEffect(); @@ -399,7 +399,7 @@ void CEgon::UpdateEffect( const Vector &startPoint, const Vector &endPoint, floa void CEgon::CreateEffect( void ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL DestroyEffect(); m_pBeam = CBeam::BeamCreate( EGON_BEAM_SPRITE, 40 ); @@ -445,7 +445,7 @@ void CEgon::CreateEffect( void ) void CEgon::DestroyEffect( void ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( m_pBeam ) { UTIL_Remove( m_pBeam ); diff --git a/dlls/exportdef.h b/dlls/exportdef.h index 363d8d12..bc3c6371 100644 --- a/dlls/exportdef.h +++ b/dlls/exportdef.h @@ -2,7 +2,7 @@ #ifndef EXPORTDEF_H #define EXPORTDEF_H #if defined _WIN32 || defined __CYGWIN__ - #ifdef __GNUC__ + #if __GNUC__ #define EXPORT __attribute__ ((dllexport)) #else #define EXPORT __declspec(dllexport) // Note: actually gcc seems to also supports this syntax. diff --git a/dlls/extdll.h b/dlls/extdll.h index d8fdb41f..0c35fe3a 100644 --- a/dlls/extdll.h +++ b/dlls/extdll.h @@ -21,12 +21,12 @@ // // Allow "DEBUG" in addition to default "_DEBUG" -#ifdef _DEBUG +#if _DEBUG #define DEBUG 1 #endif // Silence certain warnings -#ifdef _MSC_VER +#if _MSC_VER #pragma warning(disable : 4244) // int or float down-conversion #pragma warning(disable : 4305) // int or float data truncation #pragma warning(disable : 4201) // nameless struct/union @@ -35,7 +35,7 @@ #endif // Prevent tons of unused windows definitions -#ifdef _WIN32 +#if _WIN32 #define WIN32_LEAN_AND_MEAN #define NOWINRES #define NOSERVICE diff --git a/dlls/gargantua.cpp b/dlls/gargantua.cpp index b82bb02f..bc4205e5 100644 --- a/dlls/gargantua.cpp +++ b/dlls/gargantua.cpp @@ -12,7 +12,7 @@ * use or distribution of this code by or to any unlicensed person is illegal. * ****/ -#ifndef OEM_BUILD +#if !OEM_BUILD //========================================================= // Gargantua diff --git a/dlls/gauss.cpp b/dlls/gauss.cpp index bbaab766..550945b4 100644 --- a/dlls/gauss.cpp +++ b/dlls/gauss.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -48,7 +48,7 @@ LINK_ENTITY_TO_CLASS( weapon_xs, CXS ) float CXS::GetFullChargeTime( void ) { -#ifdef CLIENT_DLL +#if CLIENT_DLL if( bIsMultiplayer() ) #else if( g_pGameRules->IsMultiplayer() ) @@ -225,7 +225,7 @@ void CXS::SecondaryAttack() // 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 ) { -#ifdef CLIENT_DLL +#if CLIENT_DLL if( bIsMultiplayer() ) #else if( g_pGameRules->IsMultiplayer() ) @@ -268,7 +268,7 @@ void CXS::SecondaryAttack() if( m_iSoundState == 0 ) ALERT( at_console, "sound state %d\n", m_iSoundState ); -#ifdef GAUSS_OVERCHARGE_FIX +#if GAUSS_OVERCHARGE_FIX if (!overcharge) #endif PLAYBACK_EVENT_FULL( 0, m_pPlayer->edict(), m_usXSSpin, 0.0f, g_vecZero, g_vecZero, 0.0f, 0.0f, pitch, 0, ( m_iSoundState == SND_CHANGE_PITCH ) ? 1 : 0, 0 ); @@ -281,7 +281,7 @@ void CXS::SecondaryAttack() if( overcharge ) { // 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 ); #endif EMIT_SOUND_DYN( ENT( m_pPlayer->pev ), CHAN_WEAPON, "weapons/xs_moan1.wav", 1.0f, ATTN_NORM, 0, 80 + RANDOM_LONG( 0, 0x3f ) ); @@ -290,7 +290,7 @@ void CXS::SecondaryAttack() m_fInAttack = 0; m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 2.2f; m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1.0f; -#ifndef CLIENT_DLL +#if !CLIENT_DLL m_pPlayer->TakeDamage( VARS( eoNullEntity ), VARS( eoNullEntity ), 50, DMG_POISON ); UTIL_ScreenFade( m_pPlayer, Vector( 192, 224, 0 ), 2, 0.5f, 128, FFADE_IN ); #endif @@ -328,7 +328,7 @@ void CXS::StartFire( void ) if( m_fPrimaryFire ) { // fixed damage on primary attack -#ifdef CLIENT_DLL +#if CLIENT_DLL flDamage = 20.0f; #else flDamage = gSkillData.plrDmgGauss; @@ -338,7 +338,7 @@ void CXS::StartFire( void ) if( m_fInAttack != 3 ) { //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; if( !m_fPrimaryFire ) diff --git a/dlls/h_cycler.cpp b/dlls/h_cycler.cpp index 1c5a9150..ef356e8a 100644 --- a/dlls/h_cycler.cpp +++ b/dlls/h_cycler.cpp @@ -29,7 +29,7 @@ #include "player.h" #define TEMP_FOR_SCREEN_SHOTS -#ifdef TEMP_FOR_SCREEN_SHOTS //=================================================== +#if defined(TEMP_FOR_SCREEN_SHOTS) //=================================================== class CCycler : public CBaseMonster { diff --git a/dlls/h_export.cpp b/dlls/h_export.cpp index d36bd5be..88353c7c 100644 --- a/dlls/h_export.cpp +++ b/dlls/h_export.cpp @@ -29,7 +29,7 @@ enginefuncs_t g_engfuncs; globalvars_t *gpGlobals; -#ifdef _WIN32 +#if _WIN32 // Required DLL entry point BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) @@ -43,8 +43,8 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) return TRUE; } -// stdcall for win32 -#define EXPORT2 WINAPI +// cdecl for win32 +#define EXPORT2 WINAPIV #else #define EXPORT2 #endif diff --git a/dlls/handgrenade.cpp b/dlls/handgrenade.cpp index 4d866708..0e9fde30 100644 --- a/dlls/handgrenade.cpp +++ b/dlls/handgrenade.cpp @@ -43,7 +43,7 @@ void CHandGrenade::Spawn() m_iId = WEAPON_HANDGRENADE; SET_MODEL( ENT( pev ), "models/w_grenade.mdl" ); -#ifndef CLIENT_DLL +#if !CLIENT_DLL pev->dmg = gSkillData.plrDmgHandGrenade; #endif m_iDefaultAmmo = HANDGRENADE_DEFAULT_GIVE; diff --git a/dlls/hassassin.cpp b/dlls/hassassin.cpp index c98c940f..36672d56 100644 --- a/dlls/hassassin.cpp +++ b/dlls/hassassin.cpp @@ -12,7 +12,7 @@ * 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 diff --git a/dlls/hl.def b/dlls/hl.def deleted file mode 100644 index c009191a..00000000 --- a/dlls/hl.def +++ /dev/null @@ -1,5 +0,0 @@ -LIBRARY hl -EXPORTS - GiveFnptrsToDll @1 -SECTIONS - .data READ WRITE diff --git a/dlls/hl.dsp b/dlls/hl.dsp deleted file mode 100644 index 7985e2e6..00000000 --- a/dlls/hl.dsp +++ /dev/null @@ -1,747 +0,0 @@ -# Microsoft Developer Studio Project File - Name="hl" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=hl - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "hl.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "hl.mak" CFG="hl - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "hl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "hl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "hl - Win32 Profile" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "hl - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\Release" -# PROP BASE Intermediate_Dir ".\Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\temp\dlls\!release" -# PROP Intermediate_Dir "..\temp\dlls\!release" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /G5 /MT /W3 /O2 /I "..\dlls" /I "..\engine" /I "..\common" /I "..\pm_shared" /I "..\game_shared" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "QUIVER" /D "VOXEL" /D "QUAKE2" /D "VALVE_DLL" /D "CLIENT_WEAPONS" /Fr /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /def:".\hl.def" -# SUBTRACT LINK32 /profile /map -# Begin Custom Build -TargetDir=\Xash3D\src_main\temp\dlls\!release -InputPath=\Xash3D\src_main\temp\dlls\!release\hl.dll -SOURCE="$(InputPath)" - -"D:\Xash3D\valve\dlls\hl.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetDir)\hl.dll "D:\Xash3D\valve\dlls\hl.dll" - -# End Custom Build - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir ".\hl___Win" -# PROP BASE Intermediate_Dir ".\hl___Win" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\temp\dlls\!debug" -# PROP Intermediate_Dir "..\temp\dlls\!debug" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /G5 /MTd /W3 /Gm /ZI /Od /I "..\dlls" /I "..\engine" /I "..\common" /I "..\game_shared" /I "..\pm_shared" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "QUIVER" /D "VOXEL" /D "QUAKE2" /D "VALVE_DLL" /D "CLIENT_WEAPONS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /i "..\engine" /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 -# ADD LINK32 user32.lib advapi32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /def:".\hl.def" -# SUBTRACT LINK32 /profile -# Begin Custom Build -TargetDir=\Xash3D\src_main\temp\dlls\!debug -InputPath=\Xash3D\src_main\temp\dlls\!debug\hl.dll -SOURCE="$(InputPath)" - -"D:\Xash3D\valve\dlls\hl.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetDir)\hl.dll "D:\Xash3D\valve\dlls\hl.dll" - -# End Custom Build - -!ELSEIF "$(CFG)" == "hl - Win32 Profile" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir ".\hl___Win" -# PROP BASE Intermediate_Dir ".\hl___Win" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\temp\dlls\!profile" -# PROP Intermediate_Dir "..\temp\dlls\!profile" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /G5 /MT /W3 /GX /Zi /O2 /I "..\engine" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "QUIVER" /D "VOXEL" /D "QUAKE2" /D "VALVE_DLL" /YX /c -# SUBTRACT BASE CPP /Fr -# ADD CPP /nologo /G5 /MT /W3 /Zi /O2 /I "..\dlls" /I "..\engine" /I "..\common" /I "..\pm_shared" /I "..\game_shared" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "QUIVER" /D "VOXEL" /D "QUAKE2" /D "VALVE_DLL" /D "CLIENT_WEAPONS" /YX /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "NDEBUG" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:I386 /def:".\hl.def" -# SUBTRACT BASE LINK32 /profile -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /profile /debug /machine:I386 /def:".\hl.def" -# Begin Custom Build -TargetDir=\Xash3D\src_main\temp\dlls\!profile -InputPath=\Xash3D\src_main\temp\dlls\!profile\hl.dll -SOURCE="$(InputPath)" - -"D:\Xash3D\valve\dlls\hl.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetDir)\hl.dll "D:\Xash3D\valve\dlls\hl.dll" - -# End Custom Build - -!ENDIF - -# Begin Target - -# Name "hl - Win32 Release" -# Name "hl - Win32 Debug" -# Name "hl - Win32 Profile" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90" -# Begin Source File - -SOURCE=.\aflock.cpp -# End Source File -# Begin Source File - -SOURCE=.\agrunt.cpp -# End Source File -# Begin Source File - -SOURCE=.\airtank.cpp -# End Source File -# Begin Source File - -SOURCE=.\animating.cpp -# End Source File -# Begin Source File - -SOURCE=.\animation.cpp -# End Source File -# Begin Source File - -SOURCE=.\apache.cpp -# End Source File -# Begin Source File - -SOURCE=.\barnacle.cpp -# End Source File -# Begin Source File - -SOURCE=.\barney.cpp -# End Source File -# Begin Source File - -SOURCE=.\bigmomma.cpp -# End Source File -# Begin Source File - -SOURCE=.\bloater.cpp -# End Source File -# Begin Source File - -SOURCE=.\bmodels.cpp -# End Source File -# Begin Source File - -SOURCE=.\bullsquid.cpp -# End Source File -# Begin Source File - -SOURCE=.\buttons.cpp -# End Source File -# Begin Source File - -SOURCE=.\cbase.cpp -# End Source File -# Begin Source File - -SOURCE=.\client.cpp -# End Source File -# Begin Source File - -SOURCE=.\combat.cpp -# End Source File -# Begin Source File - -SOURCE=.\controller.cpp -# End Source File -# Begin Source File - -SOURCE=.\crossbow.cpp -# End Source File -# Begin Source File - -SOURCE=.\crowbar.cpp -# End Source File -# Begin Source File - -SOURCE=.\defaultai.cpp -# End Source File -# Begin Source File - -SOURCE=.\doors.cpp -# End Source File -# Begin Source File - -SOURCE=.\effects.cpp -# End Source File -# Begin Source File - -SOURCE=.\egon.cpp -# End Source File -# Begin Source File - -SOURCE=.\explode.cpp -# End Source File -# Begin Source File - -SOURCE=.\flyingmonster.cpp -# End Source File -# Begin Source File - -SOURCE=.\func_break.cpp -# End Source File -# Begin Source File - -SOURCE=.\func_tank.cpp -# End Source File -# Begin Source File - -SOURCE=.\game.cpp -# End Source File -# Begin Source File - -SOURCE=.\gamerules.cpp -# End Source File -# Begin Source File - -SOURCE=.\gargantua.cpp -# End Source File -# Begin Source File - -SOURCE=.\gauss.cpp -# End Source File -# Begin Source File - -SOURCE=.\genericmonster.cpp -# End Source File -# Begin Source File - -SOURCE=.\ggrenade.cpp -# End Source File -# Begin Source File - -SOURCE=.\globals.cpp -# End Source File -# Begin Source File - -SOURCE=.\glock.cpp -# End Source File -# Begin Source File - -SOURCE=.\gman.cpp -# End Source File -# Begin Source File - -SOURCE=.\h_ai.cpp -# End Source File -# Begin Source File - -SOURCE=.\h_battery.cpp -# End Source File -# Begin Source File - -SOURCE=.\h_cine.cpp -# End Source File -# Begin Source File - -SOURCE=.\h_cycler.cpp -# End Source File -# Begin Source File - -SOURCE=.\h_export.cpp -# End Source File -# Begin Source File - -SOURCE=.\handgrenade.cpp -# End Source File -# Begin Source File - -SOURCE=.\hassassin.cpp -# End Source File -# Begin Source File - -SOURCE=.\headcrab.cpp -# End Source File -# Begin Source File - -SOURCE=.\healthkit.cpp -# End Source File -# Begin Source File - -SOURCE=.\hgrunt.cpp -# End Source File -# Begin Source File - -SOURCE=.\hornet.cpp -# End Source File -# Begin Source File - -SOURCE=.\hornetgun.cpp -# End Source File -# Begin Source File - -SOURCE=.\houndeye.cpp -# End Source File -# Begin Source File - -SOURCE=.\ichthyosaur.cpp -# End Source File -# Begin Source File - -SOURCE=.\islave.cpp -# End Source File -# Begin Source File - -SOURCE=.\items.cpp -# End Source File -# Begin Source File - -SOURCE=.\leech.cpp -# End Source File -# Begin Source File - -SOURCE=.\lights.cpp -# End Source File -# Begin Source File - -SOURCE=.\maprules.cpp -# End Source File -# Begin Source File - -SOURCE=.\monstermaker.cpp -# End Source File -# Begin Source File - -SOURCE=.\monsters.cpp -# End Source File -# Begin Source File - -SOURCE=.\monsterstate.cpp -# End Source File -# Begin Source File - -SOURCE=.\mortar.cpp -# End Source File -# Begin Source File - -SOURCE=.\mp5.cpp -# End Source File -# Begin Source File - -SOURCE=.\multiplay_gamerules.cpp -# End Source File -# Begin Source File - -SOURCE=.\nihilanth.cpp -# End Source File -# Begin Source File - -SOURCE=.\nodes.cpp -# End Source File -# Begin Source File - -SOURCE=.\osprey.cpp -# End Source File -# Begin Source File - -SOURCE=.\pathcorner.cpp -# End Source File -# Begin Source File - -SOURCE=.\plane.cpp -# End Source File -# Begin Source File - -SOURCE=.\plats.cpp -# End Source File -# Begin Source File - -SOURCE=.\player.cpp -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_debug.c -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_math.c -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_shared.c -# End Source File -# Begin Source File - -SOURCE=.\python.cpp -# End Source File -# Begin Source File - -SOURCE=.\rat.cpp -# End Source File -# Begin Source File - -SOURCE=.\roach.cpp -# End Source File -# Begin Source File - -SOURCE=.\rpg.cpp -# End Source File -# Begin Source File - -SOURCE=.\satchel.cpp -# End Source File -# Begin Source File - -SOURCE=.\schedule.cpp -# End Source File -# Begin Source File - -SOURCE=.\scientist.cpp -# End Source File -# Begin Source File - -SOURCE=.\scripted.cpp -# End Source File -# Begin Source File - -SOURCE=.\shotgun.cpp -# End Source File -# Begin Source File - -SOURCE=.\singleplay_gamerules.cpp -# End Source File -# Begin Source File - -SOURCE=.\skill.cpp -# End Source File -# Begin Source File - -SOURCE=.\sound.cpp -# End Source File -# Begin Source File - -SOURCE=.\soundent.cpp -# End Source File -# Begin Source File - -SOURCE=.\spectator.cpp -# End Source File -# Begin Source File - -SOURCE=.\squadmonster.cpp -# End Source File -# Begin Source File - -SOURCE=.\squeakgrenade.cpp -# End Source File -# Begin Source File - -SOURCE=.\subs.cpp -# End Source File -# Begin Source File - -SOURCE=.\talkmonster.cpp -# End Source File -# Begin Source File - -SOURCE=.\teamplay_gamerules.cpp -# End Source File -# Begin Source File - -SOURCE=.\tempmonster.cpp -# End Source File -# Begin Source File - -SOURCE=.\tentacle.cpp -# End Source File -# Begin Source File - -SOURCE=.\triggers.cpp -# End Source File -# Begin Source File - -SOURCE=.\tripmine.cpp -# End Source File -# Begin Source File - -SOURCE=.\turret.cpp -# End Source File -# Begin Source File - -SOURCE=.\util.cpp -# End Source File -# Begin Source File - -SOURCE=..\game_shared\voice_gamemgr.cpp -# End Source File -# Begin Source File - -SOURCE=.\weapons.cpp -# End Source File -# Begin Source File - -SOURCE=.\world.cpp -# End Source File -# Begin Source File - -SOURCE=.\xen.cpp -# End Source File -# Begin Source File - -SOURCE=.\zombie.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" -# Begin Source File - -SOURCE=.\activity.h -# End Source File -# Begin Source File - -SOURCE=.\activitymap.h -# End Source File -# Begin Source File - -SOURCE=.\animation.h -# End Source File -# Begin Source File - -SOURCE=.\basemonster.h -# End Source File -# Begin Source File - -SOURCE=.\cbase.h -# End Source File -# Begin Source File - -SOURCE=.\cdll_dll.h -# End Source File -# Begin Source File - -SOURCE=.\client.h -# End Source File -# Begin Source File - -SOURCE=.\decals.h -# End Source File -# Begin Source File - -SOURCE=.\defaultai.h -# End Source File -# Begin Source File - -SOURCE=.\doors.h -# End Source File -# Begin Source File - -SOURCE=.\effects.h -# End Source File -# Begin Source File - -SOURCE=..\engine\eiface.h -# End Source File -# Begin Source File - -SOURCE=.\enginecallback.h -# End Source File -# Begin Source File - -SOURCE=.\explode.h -# End Source File -# Begin Source File - -SOURCE=.\extdll.h -# End Source File -# Begin Source File - -SOURCE=.\flyingmonster.h -# End Source File -# Begin Source File - -SOURCE=.\func_break.h -# End Source File -# Begin Source File - -SOURCE=.\gamerules.h -# End Source File -# Begin Source File - -SOURCE=.\hornet.h -# End Source File -# Begin Source File - -SOURCE=.\items.h -# End Source File -# Begin Source File - -SOURCE=.\monsterevent.h -# End Source File -# Begin Source File - -SOURCE=.\monsters.h -# End Source File -# Begin Source File - -SOURCE=.\nodes.h -# End Source File -# Begin Source File - -SOURCE=.\plane.h -# End Source File -# Begin Source File - -SOURCE=.\player.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_debug.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_defs.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_info.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_materials.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_movevars.h -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_shared.h -# End Source File -# Begin Source File - -SOURCE=.\saverestore.h -# End Source File -# Begin Source File - -SOURCE=.\schedule.h -# End Source File -# Begin Source File - -SOURCE=.\scripted.h -# End Source File -# Begin Source File - -SOURCE=.\scriptevent.h -# End Source File -# Begin Source File - -SOURCE=.\skill.h -# End Source File -# Begin Source File - -SOURCE=.\soundent.h -# End Source File -# Begin Source File - -SOURCE=.\spectator.h -# End Source File -# Begin Source File - -SOURCE=.\squadmonster.h -# End Source File -# Begin Source File - -SOURCE=.\talkmonster.h -# End Source File -# Begin Source File - -SOURCE=.\teamplay_gamerules.h -# End Source File -# Begin Source File - -SOURCE=.\trains.h -# End Source File -# Begin Source File - -SOURCE=.\util.h -# End Source File -# Begin Source File - -SOURCE=.\vector.h -# End Source File -# Begin Source File - -SOURCE=.\weapons.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/dlls/hornetgun.cpp b/dlls/hornetgun.cpp index 5e903b0d..f8c54fbe 100644 --- a/dlls/hornetgun.cpp +++ b/dlls/hornetgun.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -74,7 +74,7 @@ int CHgun::AddToPlayer( CBasePlayer *pPlayer ) { if( CBasePlayerWeapon::AddToPlayer( pPlayer ) ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL if( g_pGameRules->IsMultiplayer() ) { // in multiplayer, all hivehands come full. @@ -131,7 +131,7 @@ void CHgun::PrimaryAttack() { return; } -#ifndef CLIENT_DLL +#if !CLIENT_DLL 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() ); @@ -145,7 +145,7 @@ void CHgun::PrimaryAttack() m_pPlayer->m_iWeaponFlash = DIM_GUN_FLASH; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else 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... -#ifndef CLIENT_DLL +#if !CLIENT_DLL CBaseEntity *pHornet; Vector vecSrc; @@ -226,7 +226,7 @@ void CHgun::SecondaryAttack( void ) m_flRechargeTime = gpGlobals->time + 0.5f; #endif int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/ichthyosaur.cpp b/dlls/ichthyosaur.cpp index 56ff96af..0f9fbf5a 100644 --- a/dlls/ichthyosaur.cpp +++ b/dlls/ichthyosaur.cpp @@ -12,7 +12,7 @@ * 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 diff --git a/dlls/monsters.cpp b/dlls/monsters.cpp index ab82cca5..9f1f57f2 100644 --- a/dlls/monsters.cpp +++ b/dlls/monsters.cpp @@ -728,7 +728,7 @@ BOOL CBaseMonster::MoveToNode( Activity movementAct, float waitTime, const Vecto return FRefreshRoute(); } -#ifdef _DEBUG +#if _DEBUG void DrawRoute( entvars_t *pev, WayPoint_t *m_Route, int m_iRouteIndex, int r, int g, int b ) { int i; diff --git a/dlls/multiplay_gamerules.cpp b/dlls/multiplay_gamerules.cpp index 6672283b..472bde9f 100644 --- a/dlls/multiplay_gamerules.cpp +++ b/dlls/multiplay_gamerules.cpp @@ -26,7 +26,7 @@ #include "skill.h" #include "game.h" #include "items.h" -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR #include "voice_gamemgr.h" #endif #include "hltv.h" @@ -46,7 +46,7 @@ extern int g_teamplay; float g_flIntermissionStartTime = 0; -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR CVoiceGameMgr g_VoiceGameMgr; class CMultiplayGameMgrHelper : public IVoiceGameMgrHelper @@ -73,7 +73,7 @@ static CMultiplayGameMgrHelper g_GameMgrHelper; //********************************************************* CHalfLifeMultiplay::CHalfLifeMultiplay() { -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR g_VoiceGameMgr.Init( &g_GameMgrHelper, gpGlobals->maxClients ); #endif RefreshSkillData(); @@ -123,7 +123,7 @@ CHalfLifeMultiplay::CHalfLifeMultiplay() BOOL CHalfLifeMultiplay::ClientCommand( CBasePlayer *pPlayer, const char *pcmd ) { -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR if( g_VoiceGameMgr.ClientCommand( pPlayer, pcmd ) ) return TRUE; #endif @@ -194,7 +194,7 @@ extern cvar_t mp_chattime; //========================================================= void CHalfLifeMultiplay::Think( void ) { -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR g_VoiceGameMgr.Update( gpGlobals->frametime ); #endif @@ -414,7 +414,7 @@ BOOL CHalfLifeMultiplay::GetNextBestWeapon( CBasePlayer *pPlayer, CBasePlayerIte //========================================================= 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 ); #endif ALERT( at_error, "Sorry, there's no multiplayer mode in Poke646!\n" ); diff --git a/dlls/nihilanth.cpp b/dlls/nihilanth.cpp index 29e1073e..951ee38c 100644 --- a/dlls/nihilanth.cpp +++ b/dlls/nihilanth.cpp @@ -12,7 +12,7 @@ * 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 "util.h" diff --git a/dlls/nodes.cpp b/dlls/nodes.cpp index f5f399a0..e74e3cc8 100644 --- a/dlls/nodes.cpp +++ b/dlls/nodes.cpp @@ -42,7 +42,7 @@ CGraph WorldGraph; LINK_ENTITY_TO_CLASS( info_node, CNodeEnt ) LINK_ENTITY_TO_CLASS( info_node_air, CNodeEnt ) -#ifdef __DOS__ +#if __DOS__ #include #define CreateDirectoryA(p, n) mkdir(p) #elif !defined _WIN32 @@ -2060,7 +2060,7 @@ void CTestHull::BuildNodeGraph( void ) fprintf( file, "\nAll Connections are Paired!\n" ); } -#ifdef _MSC_VER +#if _MSC_VER #define SIZET_FMT "%Iu" #else #define SIZET_FMT "%zu" diff --git a/dlls/nodes.h b/dlls/nodes.h index 4bc1ec1b..d6b36928 100644 --- a/dlls/nodes.h +++ b/dlls/nodes.h @@ -106,7 +106,7 @@ typedef struct // CGraph //========================================================= #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) #else #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 ) { -#ifdef _DEBUG +#if _DEBUG if ( !m_pNodes || i < 0 || i > m_cNodes ) ALERT( at_error, "Bad Node!\n" ); #endif @@ -224,7 +224,7 @@ public: inline CLink &Link( int i ) { -#ifdef _DEBUG +#if _DEBUG if ( !m_pLinkPool || i < 0 || i > m_cLinks ) ALERT( at_error, "Bad link!\n" ); #endif diff --git a/dlls/player.cpp b/dlls/player.cpp index f386e4a8..a3fc8dc7 100644 --- a/dlls/player.cpp +++ b/dlls/player.cpp @@ -2503,7 +2503,7 @@ pt_end: // Track button info so we can detect 'pressed' and 'released' buttons next frame m_afButtonLast = pev->button; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS // Decay timers on weapons // go through all of the weapons and make a list of the ones to pack for( int i = 0; i < MAX_ITEM_TYPES; i++ ) @@ -2899,7 +2899,7 @@ int CBasePlayer::Restore( CRestore &restore ) 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 // 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. @@ -3326,7 +3326,7 @@ void CBasePlayer::ImpulseCommands() //========================================================= void CBasePlayer::CheatImpulseCommands( int iImpulse ) { -#if !defined( HLDEMO_BUILD ) +#if !HLDEMO_BUILD if( g_flWeaponCheat == 0.0f ) { return; @@ -3636,7 +3636,7 @@ Called every frame by the player PreThink */ void CBasePlayer::ItemPreFrame() { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS if( m_flNextAttack > 0 ) #else if( gpGlobals->time < m_flNextAttack ) @@ -3666,7 +3666,7 @@ void CBasePlayer::ItemPostFrame() if( m_pTank != 0 ) return; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS if( m_flNextAttack > 0 ) #else if( gpGlobals->time < m_flNextAttack ) diff --git a/dlls/python.cpp b/dlls/python.cpp index d8bfd35f..567187c0 100644 --- a/dlls/python.cpp +++ b/dlls/python.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -97,7 +97,7 @@ void CPython::Precache( void ) BOOL CPython::Deploy() { -#ifdef CLIENT_DLL +#if CLIENT_DLL if( bIsMultiplayer() ) #else if( g_pGameRules->IsMultiplayer() ) @@ -130,7 +130,7 @@ void CPython::Holster( int skiplocal /* = 0 */ ) void CPython::SecondaryAttack( void ) { -#ifdef CLIENT_DLL +#if CLIENT_DLL if( !bIsMultiplayer() ) #else 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 ); int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; @@ -222,7 +222,7 @@ void CPython::Reload( void ) } int bUseScope = FALSE; -#ifdef CLIENT_DLL +#if CLIENT_DLL bUseScope = bIsMultiplayer(); #else bUseScope = g_pGameRules->IsMultiplayer(); @@ -273,7 +273,7 @@ void CPython::WeaponIdle( void ) } int bUseScope = FALSE; -#ifdef CLIENT_DLL +#if CLIENT_DLL bUseScope = bIsMultiplayer(); #else bUseScope = g_pGameRules->IsMultiplayer(); diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp index 99b55de1..e6f687aa 100644 --- a/dlls/rpg.cpp +++ b/dlls/rpg.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) +#if !OEM_BUILD #include "extdll.h" #include "util.h" @@ -23,7 +23,7 @@ #include "player.h" #include "gamerules.h" -#ifndef CLIENT_DLL +#if !CLIENT_DLL LINK_ENTITY_TO_CLASS( laser_spot, CLaserSpot ) diff --git a/dlls/satchel.cpp b/dlls/satchel.cpp index 79aa97be..ae273bfa 100644 --- a/dlls/satchel.cpp +++ b/dlls/satchel.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -206,7 +206,7 @@ int CPipebomb::AddDuplicate( CBasePlayerItem *pOriginal ) { CPipebomb *pPipebomb; -#ifdef CLIENT_DLL +#if CLIENT_DLL if( bIsMultiplayer() ) #else if( g_pGameRules->IsMultiplayer() ) @@ -390,7 +390,7 @@ void CPipebomb::Throw( void ) { if( m_pPlayer->m_rgAmmo[m_iPrimaryAmmoType] ) { -#ifndef CLIENT_DLL +#if !CLIENT_DLL Vector vecSrc = m_pPlayer->pev->origin; Vector vecThrow = gpGlobals->v_forward * 274 + m_pPlayer->pev->velocity; @@ -446,7 +446,7 @@ void CPipebomb::WeaponIdle( void ) return; } -#ifndef CLIENT_DLL +#if !CLIENT_DLL m_pPlayer->pev->viewmodel = MAKE_STRING( "models/v_pipebomb.mdl" ); m_pPlayer->pev->weaponmodel = MAKE_STRING( "models/p_pipebomb.mdl" ); #else diff --git a/dlls/saverestore.h b/dlls/saverestore.h index 81f9f131..5eec01e2 100644 --- a/dlls/saverestore.h +++ b/dlls/saverestore.h @@ -157,7 +157,7 @@ public: int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; -//#ifdef _DEBUG +//#if _DEBUG void DumpGlobals( void ); //#endif diff --git a/dlls/schedule.cpp b/dlls/schedule.cpp index 2a4cc311..7512c9fa 100644 --- a/dlls/schedule.cpp +++ b/dlls/schedule.cpp @@ -181,7 +181,7 @@ BOOL CBaseMonster::FScheduleValid( void ) 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 ) { // fail! Send a visual indicator. diff --git a/dlls/shotgun.cpp b/dlls/shotgun.cpp index e47153b5..fb94b216 100644 --- a/dlls/shotgun.cpp +++ b/dlls/shotgun.cpp @@ -135,7 +135,7 @@ void CShotgun::PrimaryAttack() m_iClip -= 2; int flags; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS flags = FEV_NOTHOST; #else flags = 0; diff --git a/dlls/soundent.cpp b/dlls/soundent.cpp index 7d9583f0..ea319989 100644 --- a/dlls/soundent.cpp +++ b/dlls/soundent.cpp @@ -367,7 +367,7 @@ int CSoundEnt::ClientSoundIndex( edict_t *pClient ) { int iReturn = ENTINDEX( pClient ) - 1; -#ifdef _DEBUG +#if _DEBUG if( iReturn < 0 || iReturn > gpGlobals->maxClients ) { ALERT( at_console, "** ClientSoundIndex returning a bogus value! **\n" ); diff --git a/dlls/squeakgrenade.cpp b/dlls/squeakgrenade.cpp index 158ee6b8..bd669104 100644 --- a/dlls/squeakgrenade.cpp +++ b/dlls/squeakgrenade.cpp @@ -12,7 +12,7 @@ * without written permission from Valve LLC. * ****/ -#if !defined( OEM_BUILD ) && !defined( HLDEMO_BUILD ) +#if !OEM_BUILD && !HLDEMO_BUILD #include "extdll.h" #include "util.h" @@ -42,7 +42,7 @@ enum squeak_e SQUEAK_THROW }; -#ifndef CLIENT_DLL +#if !CLIENT_DLL class CSqueakGrenade : public CGrenade { void Spawn( void ); diff --git a/dlls/teamplay_gamerules.cpp b/dlls/teamplay_gamerules.cpp index ea733fa4..6f53582a 100644 --- a/dlls/teamplay_gamerules.cpp +++ b/dlls/teamplay_gamerules.cpp @@ -69,7 +69,7 @@ CHalfLifeTeamplay::CHalfLifeTeamplay() extern cvar_t timeleft, fragsleft; -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR #include "voice_gamemgr.h" extern CVoiceGameMgr g_VoiceGameMgr; #endif @@ -82,7 +82,7 @@ void CHalfLifeTeamplay::Think( void ) int frags_remaining = 0; int time_remaining = 0; -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR g_VoiceGameMgr.Update(gpGlobals->frametime); #endif 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 ) { -#ifndef NO_VOICEGAMEMGR +#if !NO_VOICEGAMEMGR if( g_VoiceGameMgr.ClientCommand( pPlayer, pcmd ) ) return TRUE; #endif diff --git a/dlls/tentacle.cpp b/dlls/tentacle.cpp index c860fcb3..685540d5 100644 --- a/dlls/tentacle.cpp +++ b/dlls/tentacle.cpp @@ -12,7 +12,7 @@ * 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 /* diff --git a/dlls/tripmine.cpp b/dlls/tripmine.cpp index a52ae6ae..3e8df134 100644 --- a/dlls/tripmine.cpp +++ b/dlls/tripmine.cpp @@ -38,7 +38,7 @@ enum tripmine_e TRIPMINE_GROUND }; -#ifndef CLIENT_DLL +#if !CLIENT_DLL class CTripmineGrenade : public CGrenade { void Spawn( void ); @@ -351,4 +351,3 @@ void CTripmineGrenade::DelayDeathThink( void ) } #endif - diff --git a/dlls/util.cpp b/dlls/util.cpp index bb4c2030..37110a2a 100644 --- a/dlls/util.cpp +++ b/dlls/util.cpp @@ -47,7 +47,7 @@ void UTIL_MakeTracer( const Vector &vecSrc, const Vector &vecDest ) float UTIL_WeaponTimeBase( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return 0.0f; #else return gpGlobals->time; @@ -323,7 +323,7 @@ TYPEDESCRIPTION gEntvarsDescription[] = #define ENTVARS_COUNT ( sizeof(gEntvarsDescription) / sizeof(gEntvarsDescription[0]) ) -#ifdef DEBUG +#if DEBUG edict_t *DBG_EntOfVars( const entvars_t *pev ) { if( pev->pContainingEntity != NULL ) @@ -1610,7 +1610,7 @@ static int gSizes[FIELD_TYPECOUNT] = sizeof(float) * 3, // FIELD_POSITION_VECTOR sizeof(void *), // FIELD_POINTER sizeof(int), // FIELD_INTEGER -#ifdef GNUC +#if GNUC sizeof(void *) * 2, // FIELD_FUNCTION #else sizeof(void *), // FIELD_FUNCTION @@ -1637,7 +1637,7 @@ static int gInputSizes[FIELD_TYPECOUNT] = sizeof(float) * 3, // FIELD_POSITION_VECTOR sizeof(void *), // FIELD_POINTER sizeof(int), // FIELD_INTEGER -#ifdef GNUC +#if GNUC sizeof(void *) * 2, // FIELD_FUNCTION #else sizeof(void *), // FIELD_FUNCTION @@ -1854,7 +1854,7 @@ void CSave::WriteTime( const char *pname, const float *data, int count ) void CSave::WriteString( const char *pname, const char *pdata ) { -#ifdef TOKENIZE +#if TOKENIZE short token = (short)TokenHash( pdata ); WriteShort( pname, &token, 1 ); #else @@ -1865,7 +1865,7 @@ void CSave::WriteString( const char *pname, const char *pdata ) void CSave::WriteString( const char *pname, const int *stringId, int count ) { int i, size; -#ifdef TOKENIZE +#if TOKENIZE short token = (short)TokenHash( STRING( *stringId ) ); WriteShort( pname, &token, 1 ); #else @@ -2183,7 +2183,7 @@ int CRestore::ReadField( void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCou switch( pTest->fieldType ) { case FIELD_TIME: - #ifdef __VFP_FP__ + #if __VFP_FP__ memcpy( &timeData, pInputData, 4 ); // Re-base time variables timeData += time; @@ -2269,7 +2269,7 @@ int CRestore::ReadField( void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCou *( (EOFFSET *)pOutputData ) = 0; break; case FIELD_VECTOR: - #ifdef __VFP_FP__ + #if __VFP_FP__ memcpy( pOutputData, pInputData, sizeof( Vector ) ); #else ( (float *)pOutputData )[0] = ( (float *)pInputData )[0]; @@ -2278,7 +2278,7 @@ int CRestore::ReadField( void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCou #endif break; case FIELD_POSITION_VECTOR: - #ifdef __VFP_FP__ + #if __VFP_FP__ { Vector tmp; memcpy( &tmp, pInputData, sizeof( Vector ) ); @@ -2415,7 +2415,7 @@ char *CRestore::ReadNamedString( const char *pName ) HEADER header; BufferReadHeader( &header ); -#ifdef TOKENIZE +#if TOKENIZE return (char *)( m_pdata->pTokens[*(short *)header.pData] ); #else return (char *)header.pData; diff --git a/dlls/util.h b/dlls/util.h index 97f3157f..33828a2a 100644 --- a/dlls/util.h +++ b/dlls/util.h @@ -35,7 +35,7 @@ extern globalvars_t *gpGlobals; // Use this instead of ALLOC_STRING on constant strings #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)) #else 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 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) #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 ); } @@ -113,7 +113,7 @@ typedef int BOOL; // // Conversion among the three types of "entity", including identity-conversions. // -#ifdef DEBUG +#if DEBUG extern edict_t *DBG_EntOfVars(const entvars_t *pev); inline edict_t *ENT(const entvars_t *pev) { return DBG_EntOfVars(pev); } #else @@ -390,7 +390,7 @@ extern int BuildChangeList( LEVELLIST *pLevelList, int maxList ); // // 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); #define ASSERT(f) DBG_AssertFunction(f, #f, __FILE__, __LINE__, NULL) #define ASSERTSZ(f, sz) DBG_AssertFunction(f, #f, __FILE__, __LINE__, sz) diff --git a/dlls/weapons.cpp b/dlls/weapons.cpp index 9c6d5d6f..abbdc261 100644 --- a/dlls/weapons.cpp +++ b/dlls/weapons.cpp @@ -378,7 +378,7 @@ IMPLEMENT_SAVERESTORE( CBasePlayerItem, CBaseAnimating ) TYPEDESCRIPTION CBasePlayerWeapon::m_SaveData[] = { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS DEFINE_FIELD( CBasePlayerWeapon, m_flNextPrimaryAttack, FIELD_FLOAT ), DEFINE_FIELD( CBasePlayerWeapon, m_flNextSecondaryAttack, FIELD_FLOAT ), DEFINE_FIELD( CBasePlayerWeapon, m_flTimeWeaponIdle, FIELD_FLOAT ), @@ -562,7 +562,7 @@ void CBasePlayerItem::DefaultTouch( CBaseEntity *pOther ) BOOL CanAttack( float attack_time, float curtime, BOOL isPredicted ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS if( !isPredicted ) #else if( 1 ) @@ -798,7 +798,7 @@ void CBasePlayerWeapon::SendWeaponAnim( int iAnim, int skiplocal, int body ) m_pPlayer->pev->weaponanim = iAnim; -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS if( skiplocal && ENGINE_CANSKIP( m_pPlayer->edict() ) ) return; #endif diff --git a/dlls/weapons.h b/dlls/weapons.h index df217ddf..805feff2 100644 --- a/dlls/weapons.h +++ b/dlls/weapons.h @@ -417,7 +417,7 @@ public: 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 ); void LoadVModel ( const char *szViewModel, CBasePlayer *m_pPlayer ); #endif @@ -441,7 +441,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -467,7 +467,7 @@ public: void Swing(); BOOL Deploy( void ); void Holster( int skiplocal = 0 ); -#ifdef CROWBAR_IDLE_ANIM +#if CROWBAR_IDLE_ANIM void WeaponIdle(); #endif int m_iSwing; @@ -476,7 +476,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -504,7 +504,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -541,7 +541,7 @@ public: int m_fInAttack; virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -552,7 +552,7 @@ public: class CShotgun : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save( CSave &save ); int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; @@ -575,7 +575,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -603,7 +603,7 @@ public: class CRpg : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save( CSave &save ); int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; @@ -632,7 +632,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -664,7 +664,7 @@ public: class CPipebomb : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save( CSave &save ); int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; @@ -688,7 +688,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -700,7 +700,7 @@ public: class CPipebombCharge : public CGrenade { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save( CSave &save ); int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; @@ -742,7 +742,7 @@ public: virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; @@ -784,7 +784,7 @@ private: class CXS : public CBasePlayerWeapon { public: -#ifndef CLIENT_DLL +#if !CLIENT_DLL int Save( CSave &save ); int Restore( CRestore &restore ); static TYPEDESCRIPTION m_SaveData[]; @@ -817,7 +817,7 @@ public: int m_fInAttack; virtual BOOL UseDecrement( void ) { -#if defined( CLIENT_WEAPONS ) +#if CLIENT_WEAPONS return TRUE; #else return FALSE; diff --git a/dlls/world.cpp b/dlls/world.cpp index cd534c77..e1222bdb 100644 --- a/dlls/world.cpp +++ b/dlls/world.cpp @@ -288,7 +288,7 @@ globalentity_t *CGlobalState::Find( string_t globalname ) } // This is available all the time now on impulse 104, remove later -//#ifdef _DEBUG +//#if _DEBUG void CGlobalState::DumpGlobals( void ) { static const char *estates[] = { "Off", "On", "Dead" }; diff --git a/dlls/wscript b/dlls/wscript index aefa8488..1e43572a 100644 --- a/dlls/wscript +++ b/dlls/wscript @@ -10,15 +10,8 @@ def options(opt): return def configure(conf): - if conf.env.COMPILER_CC == 'msvc': - # hl.def removes MSVC function name decoration from GiveFnptrsToDll on Windows. - # Without this, the lookup for this function fails. - hlDefNode = conf.path.find_resource("./hl.def") - - if hlDefNode is not None: - conf.env.append_unique('LINKFLAGS', '/def:%s' % hlDefNode.abspath()) - else: - conf.fatal("Could not find hl.def") + # stub + return def build(bld): source = bld.path.parent.ant_glob([ diff --git a/pm_shared/pm_debug.c b/pm_shared/pm_debug.c index a11e0516..ce904760 100644 --- a/pm_shared/pm_debug.c +++ b/pm_shared/pm_debug.c @@ -14,7 +14,7 @@ ****/ #include #include "mathlib.h" -#ifdef HAVE_TGMATH_H +#if HAVE_TGMATH_H #include #endif @@ -27,7 +27,7 @@ #include -#ifdef _MSC_VER +#if _MSC_VER #pragma warning(disable : 4244) #pragma warning(disable : 4305) #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 /* ================ diff --git a/pm_shared/pm_defs.h b/pm_shared/pm_defs.h index 82480806..7da29755 100644 --- a/pm_shared/pm_defs.h +++ b/pm_shared/pm_defs.h @@ -194,7 +194,7 @@ typedef struct playermove_s int (*PM_PointContents)( float *p, int *truecontents /*filled in if this is non-null*/ ); int (*PM_TruePointContents)( 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 ); #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 ); 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 ); -#ifdef __MINGW32__ +#if __MINGW32__ pmtrace_t *(*PM_PlayerTraceEx_real) (pmtrace_t *retvalue, float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe )); #else 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 ); } playermove_t; -#ifdef __MINGW32__ +#if __MINGW32__ 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 ) { diff --git a/pm_shared/pm_math.c b/pm_shared/pm_math.c index 87c65d9f..f10e8a59 100644 --- a/pm_shared/pm_math.c +++ b/pm_shared/pm_math.c @@ -15,7 +15,7 @@ // pm_math.c -- math primitives #include #include "mathlib.h" -#ifdef HAVE_TGMATH_H +#if HAVE_TGMATH_H #include #endif #include "const.h" @@ -27,7 +27,7 @@ // fall over #define ROLL 2 -#ifdef _MSC_VER +#if _MSC_VER #pragma warning(disable : 4244) #endif diff --git a/pm_shared/pm_shared.c b/pm_shared/pm_shared.c index 2352b51f..e16072de 100644 --- a/pm_shared/pm_shared.c +++ b/pm_shared/pm_shared.c @@ -20,7 +20,7 @@ #include // atoi #include // isspace #include "mathlib.h" -#ifdef HAVE_TGMATH_H +#if HAVE_TGMATH_H #include #endif @@ -33,7 +33,7 @@ int g_bhopcap = 1; -#ifdef CLIENT_DLL +#if CLIENT_DLL // Spectator Mode int iJumpSpectator; extern float vJumpOrigin[3]; @@ -42,7 +42,7 @@ extern float vJumpAngles[3]; static int pm_shared_initialized = 0; -#ifdef _MSC_VER +#if _MSC_VER #pragma warning( disable : 4305 ) #endif @@ -86,7 +86,7 @@ playermove_t *pmove = NULL; #define PLAYER_DUCKING_MULTIPLIER 0.333f // double to float warning -#ifdef _MSC_VER +#if _MSC_VER #pragma warning(disable : 4244) #endif @@ -1798,7 +1798,7 @@ void PM_SpectatorMove( void ) if( pmove->iuser1 == OBS_ROAMING ) { -#ifdef CLIENT_DLL +#if CLIENT_DLL // jump only in roaming mode if( iJumpSpectator ) { diff --git a/wscript b/wscript index 6654c91b..a5aa035c 100644 --- a/wscript +++ b/wscript @@ -256,8 +256,8 @@ def configure(conf): conf.define_cond('HAVE_CMATH', cmath_usable) if conf.env.COMPILER_CC == 'msvc': - conf.define('_CRT_SECURE_NO_WARNINGS', 1) - conf.define('_CRT_NONSTDC_NO_DEPRECATE', 1) + conf.define('_CRT_SECURE_NO_WARNINGS', True) + conf.define('_CRT_NONSTDC_NO_DEPRECATE', True) elif conf.env.COMPILER_CC == 'owcc': pass else: @@ -271,14 +271,14 @@ def configure(conf): if conf.env.cxxshlib_PATTERN.startswith('lib'): conf.env.cxxshlib_PATTERN = conf.env.cxxshlib_PATTERN[3:] + conf.define('BARNACLE_FIX_VISIBILITY', False) conf.define('CLIENT_WEAPONS', False) - conf.define('CROWBAR_IDLE_ANIM', '1') + conf.define('CROWBAR_IDLE_ANIM', True) conf.define('CROWBAR_DELAY_FIX', False) conf.define('CROWBAR_FIX_RAPID_CROWBAR', False) conf.define('GAUSS_OVERCHARGE_FIX', False) - - if conf.env.DEST_OS == 'android' or conf.options.ENABLE_MOD_HACKS: - conf.define('MOBILE_HACKS', '1') + conf.define('OEM_BUILD', False) + conf.define('HLDEMO_BUILD', False) conf.add_subproject(["cl_dll", "dlls"])