cleanup

- fix warnings
- remove windows project files
- move shared header to the shared folder
- split server and plugin builds into 2 steps in github

.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

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
 

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
 

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}"

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<std::string> cfgChanges;