From 89329c395cbe790aafd5d9d5eaad3b573eb2f9d6 Mon Sep 17 00:00:00 2001 From: wootguy Date: Tue, 19 Nov 2024 04:26:27 -0800 Subject: [PATCH] cleanup - fix warnings - remove windows project files - move shared header to the shared folder - split server and plugin builds into 2 steps in github --- .gitattributes | 7 - .github/workflows/build.yml | 16 +- cl_dll/eventscripts.h | 4 - cl_dll/health.h | 5 - dlls/CMakeLists.txt | 5 +- dlls/game/gamerules.cpp | 1 - dlls/hl.def | 5 - dlls/hl.dsp | 1637 ------------------------------ dlls/hlgl.def | 15 - dlls/hooks/h_export.cpp | 16 +- dlls/monster/CPlayerMonster.cpp | 4 +- {dlls => game_shared}/cdll_dll.h | 0 12 files changed, 23 insertions(+), 1692 deletions(-) delete mode 100644 .gitattributes delete mode 100644 dlls/hl.def delete mode 100644 dlls/hl.dsp delete mode 100644 dlls/hlgl.def rename {dlls => game_shared}/cdll_dll.h (100%) diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index fea6f6f3..00000000 --- a/.gitattributes +++ /dev/null @@ -1,7 +0,0 @@ -# Force CRLF for Windows files: -*.bat text eol=crlf -*.dsp text eol=crlf -*.dsw text eol=crlf -*.sln text eol=crlf -*.vcxproj text eol=crlf -*.vcxproj.filters text eol=crlf diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0cf036d0..d59264c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,15 @@ jobs: repository: wootguy/SevenKewp_plugins path: ./plugins/SevenKewp_plugins - - name: Build server and plugins + - name: Build server run: | mkdir build && cd build + cmake .. -A win32 -DBUILD_CLIENT=OFF -DBUILD_SERVER=ON -DBUILD_PLUGINS=OFF + cmake --build . --config Release + + - name: Build plugins + run: | + cd build cmake .. -A win32 -DBUILD_CLIENT=OFF -DBUILD_SERVER=ON -DBUILD_PLUGINS=ON cmake --build . --config Release @@ -68,7 +74,13 @@ jobs: sudo apt install gcc-multilib g++-multilib libc6-dev-i386 mkdir build - - name: Build server and plugins + - name: Build server + run: | + cd build + cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_CLIENT=OFF -DBUILD_SERVER=ON -DBUILD_PLUGINS=OFF + make + + - name: Build plugins run: | cd build cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_CLIENT=OFF -DBUILD_SERVER=ON -DBUILD_PLUGINS=ON diff --git a/cl_dll/eventscripts.h b/cl_dll/eventscripts.h index 5c4677a2..3323dc52 100644 --- a/cl_dll/eventscripts.h +++ b/cl_dll/eventscripts.h @@ -30,10 +30,6 @@ #define DMG_NEVERGIB (1 << 12) // with this bit OR'd in, no damage type will be able to gib victims upon death #define DMG_ALWAYSGIB (1 << 13) // with this bit OR'd in, any damage type can be made to gib victims upon death. -// time-based damage -//mask off TF-specific stuff too -#define DMG_TIMEBASED (~(0xff003fff)) // mask for time-based damage - #define DMG_DROWN (1 << 14) // Drowning #define DMG_FIRSTTIMEBASED DMG_DROWN diff --git a/cl_dll/health.h b/cl_dll/health.h index 067db4b4..f07a316d 100644 --- a/cl_dll/health.h +++ b/cl_dll/health.h @@ -47,11 +47,6 @@ #define DMG_ALWAYSGIB (1 << 13) // with this bit OR'd in, any damage type can be made to gib victims upon death. -// time-based damage -//mask off TF-specific stuff too -#define DMG_TIMEBASED (~(0xff003fff)) // mask for time-based damage - - #define DMG_DROWN (1 << 14) // Drowning #define DMG_FIRSTTIMEBASED DMG_DROWN diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt index e53e6aa9..bb0669d0 100644 --- a/dlls/CMakeLists.txt +++ b/dlls/CMakeLists.txt @@ -5,7 +5,7 @@ project(${SERVER_DLL_NAME}) set(MISC_HDR ../engine/studio.h ../common/Platform.h - cdll_dll.h + ../game_shared/cdll_dll.h enginecallback.h extdll.h ) @@ -652,8 +652,7 @@ if(UNIX) ) elseif(MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /W4") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/hl.def\"") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /W4") set_target_properties(${SERVER_DLL_NAME} PROPERTIES VS_DEBUGGER_COMMAND "${SERVER_WORK_DIR}/${SERVER_EXE}" diff --git a/dlls/game/gamerules.cpp b/dlls/game/gamerules.cpp index d4c363f9..c852a195 100644 --- a/dlls/game/gamerules.cpp +++ b/dlls/game/gamerules.cpp @@ -365,7 +365,6 @@ void execSkillCfg(const char* fname, bool isMapSkill) { string line; int numChanges = 0; - int numBlocked = 0; std::unordered_set cfgChanges; diff --git a/dlls/hl.def b/dlls/hl.def deleted file mode 100644 index c185c627..00000000 --- a/dlls/hl.def +++ /dev/null @@ -1,5 +0,0 @@ -LIBRARY server -EXPORTS - GiveFnptrsToDll @1 -SECTIONS - .data READ WRITE diff --git a/dlls/hl.dsp b/dlls/hl.dsp deleted file mode 100644 index c551cedb..00000000 --- a/dlls/hl.dsp +++ /dev/null @@ -1,1637 +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 - -# Begin Project -# PROP AllowPerConfigDependencies 0 -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 ".\Releasehl" -# PROP Intermediate_Dir ".\Releasehl" -# PROP Ignore_Export_Lib 0 -# 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 /GR /Zi /O2 /I "..\dlls" /I "..\engine" /I "..\common" /I "..\pm_shared" /I "..\game_shared" /I "..\public" /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 /map /debug /machine:I386 /def:".\hl.def" -# SUBTRACT LINK32 /profile -# Begin Custom Build -InputDir=.\Releasehl -ProjDir=. -InputPath=.\Releasehl\hl.dll -InputName=hl -SOURCE="$(InputPath)" - -BuildCmds= \ - call ..\filecopy.bat $(InputPath) $(ProjDir)\..\..\game\mod\dlls\$(InputName).dll \ - call ..\filecopy.bat $(InputDir)\$(InputName).pdb $(ProjDir)\..\..\game\mod\dlls\$(InputName).pdb \ - - -"$(ProjDir)\..\..\game\mod\dlls\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(ProjDir)\..\..\game\mod\dlls\$(InputName).pdb" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# 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 ".\debughl" -# PROP Intermediate_Dir ".\debughl" -# 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 /ZI /Od /I "..\\" /I "..\dlls" /I "..\engine" /I "..\common" /I "..\pm_shared" /I "..\game_shared" /I "..\public" /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" /implib:".\Debug\hl.lib" -# SUBTRACT LINK32 /profile -# Begin Custom Build -ProjDir=. -InputPath=.\debughl\hl.dll -InputName=hl -SOURCE="$(InputPath)" - -"$(ProjDir)\..\..\game\mod\dlls\$(InputName).dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - call ..\filecopy.bat $(InputPath) $(ProjDir)\..\..\game\mod\dlls\$(InputName).dll - -# End Custom Build - -!ENDIF - -# Begin Target - -# Name "hl - Win32 Release" -# Name "hl - Win32 Debug" -# 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 - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\agrunt.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\airtank.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\animating.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\animation.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\apache.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\barnacle.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\barney.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\bigmomma.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\bloater.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\bmodels.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\bullsquid.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\buttons.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\cbase.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\client.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\combat.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\controller.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\crossbow.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\crowbar.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\defaultai.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\doors.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\effects.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\egon.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\explode.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\flyingmonster.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\func_break.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\func_tank.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\game.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\gamerules.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\gargantua.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\gauss.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\genericmonster.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\ggrenade.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\globals.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\gman.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\h_ai.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\h_battery.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\h_cine.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\h_cycler.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\h_export.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\handgrenade.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\hassassin.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\headcrab.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\healthkit.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\hgrunt.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\wpn_shared\hl_wpn_glock.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\hornet.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\hornetgun.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\houndeye.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\ichthyosaur.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\islave.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\items.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\leech.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\lights.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\maprules.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\monstermaker.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\monsters.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\monsterstate.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\mortar.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\mp5.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\multiplay_gamerules.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\nihilanth.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\nodes.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\observer.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\osprey.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\pathcorner.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\plane.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\plats.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\player.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_debug.c - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_math.c - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\pm_shared\pm_shared.c - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\python.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\rat.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\roach.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\rpg.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\satchel.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\schedule.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\scientist.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\scripted.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\shotgun.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\singleplay_gamerules.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\skill.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\sound.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\soundent.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\spectator.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\squadmonster.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\squeakgrenade.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\subs.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\talkmonster.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\teamplay_gamerules.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\tempmonster.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\tentacle.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\triggers.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\tripmine.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\turret.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\util.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\game_shared\voice_gamemgr.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\weapons.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\world.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\xen.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\zombie.cpp - -!IF "$(CFG)" == "hl - Win32 Release" - -!ELSEIF "$(CFG)" == "hl - Win32 Debug" - -# ADD CPP /GR - -!ENDIF - -# 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/hlgl.def b/dlls/hlgl.def deleted file mode 100644 index b94aa63c..00000000 --- a/dlls/hlgl.def +++ /dev/null @@ -1,15 +0,0 @@ -LIBRARY hlgl -EXPORTS - GiveFnptrsToDll @1 - GetEntityInterfaces @2 - SetChangeParms @3 - SetNewParms @4 - ClientKill @5 - PutClientInServer @6 - PlayerPreThink @7 - PlayerPostThink @8 - ClientConnect @9 - ClientDisconnect @10 - StartFrame @11 -SECTIONS - .data READ WRITE diff --git a/dlls/hooks/h_export.cpp b/dlls/hooks/h_export.cpp index a558d317..df19f969 100644 --- a/dlls/hooks/h_export.cpp +++ b/dlls/hooks/h_export.cpp @@ -37,19 +37,13 @@ globalvars_t *gpGlobals; #ifdef _WIN32 // Required DLL entry point -BOOL WINAPI DllMain( - HINSTANCE hinstDLL, - DWORD fdwReason, - LPVOID lpvReserved) -{ - if (fdwReason == DLL_PROCESS_ATTACH) - { - } - else if (fdwReason == DLL_PROCESS_DETACH) - { - } +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { return TRUE; } + +#pragma comment(linker, "/EXPORT:GiveFnptrsToDll=_GiveFnptrsToDll@8") +#pragma comment(linker, "/SECTION:.data,RW") + #endif extern "C" void DLLEXPORT GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals ) diff --git a/dlls/monster/CPlayerMonster.cpp b/dlls/monster/CPlayerMonster.cpp index 2c5cd6ac..2412cf71 100644 --- a/dlls/monster/CPlayerMonster.cpp +++ b/dlls/monster/CPlayerMonster.cpp @@ -30,7 +30,7 @@ class CPlayerMonster : public CBaseMonster void HandleAnimEvent( MonsterEvent_t *pEvent ); int ISoundMask ( void ); }; -LINK_ENTITY_TO_CLASS( monster_player, CPlayerMonster ); +LINK_ENTITY_TO_CLASS( monster_player, CPlayerMonster ) //========================================================= // Classify - indicates this monster's place in the @@ -79,7 +79,7 @@ void CPlayerMonster :: HandleAnimEvent( MonsterEvent_t *pEvent ) //========================================================= int CPlayerMonster :: ISoundMask ( void ) { - return NULL; + return 0; } //========================================================= diff --git a/dlls/cdll_dll.h b/game_shared/cdll_dll.h similarity index 100% rename from dlls/cdll_dll.h rename to game_shared/cdll_dll.h