Personnal changes #4 (2022-04-13).

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -38,7 +38,7 @@ jobs:
       - run: nuget restore '${{ env.solution }}'
 
       - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.1.3
         with:
           vs-version: '16.8'
 
@@ -66,86 +66,19 @@ jobs:
           move msvc\${{ env.buildRelease }}\mp.pdb publish\debug\mp.pdb
 
       - name: Deploy artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.1.1
         with:
           name: win32
           path: publish/*
 
-  testdemos:
-    name: 'Test demos'
-    runs-on: ubuntu-latest
-    container: s1lentq/testdemos:latest
-    needs: [windows]
-
-    env:
-      WINEDEBUG: -all
-      WINEDLLOVERRIDES: mshtml=
-
-    defaults:
-      run:
-        shell: bash
-        working-directory: ../../../opt/HLDS
-
-    steps:
-      - name: Deploying windows artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: win32
-
-      - name: Play demos
-        run: |
-          chown root ~
-          rsync -a deps/regamedll/* .
-          mv $GITHUB_WORKSPACE/tests/mp.dll cstrike/dlls/mp.dll
-
-          descs=(
-            "CS: Testing jumping, scenarios, shooting etc"
-          )
-
-          demos=(
-            "cstrike-basic-1"
-          )
-
-          retVal=0
-          for i in "${!demos[@]}"; do
-            params=$(cat "testdemos/${demos[i]}.params")
-
-            echo -e "\e[1m[$((i + 1))/${#demos[@]}] \e[1;36m${descs[i]} testing...\e[0m"
-            echo -e "    - \e[0;33mParameters $params\e[0m"
-
-            wine hlds.exe --rehlds-enable-all-hooks --rehlds-test-play "testdemos/${demos[i]}.bin" $params &> result.log || retVal=$?
-
-            if [ $retVal -ne 777 ] && [ $retVal -ne 9 ]; then
-              # Print with catchy messages
-              while read line; do
-                echo -e "      \e[0;33m$line"
-              done <<< $(cat result.log | sed '0,/demo failed/I!d;/wine:/d;/./,$!d')
-
-              echo "      🔸  🔸  🔸  🔸  🔸  🔸  🔸  🔸  🔸  🔸"
-              while read line; do
-                echo -e "      \e[1;31m$line";
-              done < rehlds_demo_error.txt
-              echo -e "      \e[30;41mExit code: $retVal\e[0m"
-              echo -e "\e[1m[$((i + 1))/${#demos[@]}] \e[1;36m${descs[i]} testing...\e[1;31m Failed ❌"
-              exit 6 # Test demo failed
-            else
-              # Print result HLDS console
-              while read line; do
-                echo -e "      \e[0;33m$line"
-              done <<< $(cat result.log | sed '/wine:/d;/./,$!d')
-              echo -e "      \e[30;43mExit code: $retVal\e[0m"
-              echo -e "\e[1m[$((i + 1))/${#demos[@]}] \e[1;36m${descs[i]} testing...\e[1;32m Succeed ✔"
-            fi
-          done
-
   linux:
     name: 'Linux'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     container: s1lentq/linux86buildtools:latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           submodules: true
@@ -207,7 +140,7 @@ jobs:
         shell: bash
 
       - name: Deploy artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         id: upload-job
         with:
           name: linux32
@@ -221,17 +154,17 @@ jobs:
 
   publish:
     name: 'Publish'
-    runs-on: ubuntu-latest
-    needs: [windows, testdemos, linux]
+    runs-on: ubuntu-20.04
+    needs: [windows, linux]
 
     steps:
       - name: Deploying linux artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: linux32
 
       - name: Deploying windows artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: win32
 

README.md

@@ -45,6 +45,8 @@ This means that plugins that do binary code analysis (Orpheu for example) probab
 | mp_round_restart_delay             | 5       | -   | -            | Number of seconds to delay before restarting a round after a win. |
 | mp_hegrenade_penetration           | 0       | 0   | 1            | Disable grenade damage through walls.<br/>`0` disabled<br/>`1` enabled |
 | mp_nadedrops                       | 0       | 0   | 2            | Drop a grenade after player death.<br/>`0` disabled<br/>`1` drop first available grenade<br/>`2` drop all grenades |
+| mp_weapondrop                      | 1       | 0   | 3            | Drop player weapon after death.<br/>`0` do not drop weapons after death<br/>`1` drop best/heaviest weapon after death<br/>`2` drop active weapon after death<br/>`3` drop all weapons after death (primary and secondary) |
+| mp_ammodrop                        | 1       | 0   | 2            | Drop ammo on weapon boxes on death or manual drop.<br/>`0` always keep ammo on player<br/>`1` drop all ammo only after death<br/>`2` drop all ammo whenever player drops a weapon |
 | mp_roundrespawn_time               | 20      | 0   | -            | Player cannot respawn until next round if more than N seconds has elapsed since the beginning round.<br />`-1` means no time limit<br /> |
 | mp_auto_reload_weapons             | 0       | 0   | 1            | Automatically reload each weapon on player spawn.<br/>`0` disabled<br/>`1` enabled |
 | mp_refill_bpammo_weapons           | 0       | 0   | 2            | Refill amount of backpack ammo up to the max.<br/>`0` disabled<br/>`1` refill backpack ammo on player spawn<br/>`2` refill backpack ammo on player spawn and on the purchase of the item |
@@ -62,7 +64,7 @@ This means that plugins that do binary code analysis (Orpheu for example) probab
 | mp_show_scenarioicon               | 0       | 0   | 1            | Show scenario icon in HUD such as count of alive hostages or ticking bomb.<br/>`0` disabled<br/>`1` enabled |
 | mp_old_bomb_defused_sound          | 1       | 0   | 1            | Play "Bomb has been defused" sound instead of "Counter-Terrorists win" when bomb was defused<br/>`0` disabled<br/>`1` enabled |
 | showtriggers                       | 0       | 0   | 1            | Debug cvar shows triggers. |
-| sv_alltalk                         | 0       | 0   | 5            | When players can hear each other ([further explanation](../../wiki/sv_alltalk)).<br/>`0` dead don't hear alive<br/>`1` no restrictions<br/>`2` teammates hear each other<br/>`3` Same as 2, but spectators hear everybody<br/>`4` alive hear alive, dead hear dead and alive.<br/>`5` alive hear alive teammates, dead hear dead and alive.
+| sv_alltalk                         | 0       | 0   | 5            | When players can hear each other ([further explanation](../../wiki/sv_alltalk)).<br/>`0` dead don't hear alive<br/>`1` no restrictions<br/>`2` teammates hear each other<br/>`3` Same as 2, but spectators hear everybody<br/>`4` alive hear alive, dead hear dead and alive.<br/>`5` alive hear alive teammates, dead hear dead and alive.<br/>`6` alive hear alive teammates, dead hear dead.
 | bot_deathmatch                     | 0       | 0   | 1            | Sets the mode for the zBot.<br/>`0` disabled<br/>`1` enable mode Deathmatch and not allow to do the scenario |
 | bot_quota_mode                     | normal  | -   | -            | Determines the type of quota.<br/>`normal` default behaviour<br/>`fill` the server will adjust bots to keep `N` players in the game, where `N` is bot_quota<br/>`match` the server will maintain a `1:N` ratio of humans to bots, where `N` is bot_quota |
 | bot_join_delay                     | 0       | -   | -            | Prevents bots from joining the server for this many seconds after a map change. |
@@ -105,6 +107,9 @@ This means that plugins that do binary code analysis (Orpheu for example) probab
 | sv_enablebunnyhopping              | 0       | 0   | 1            | Allow player speed to exceed maximum running speed.<br/>`0` disabled <br/>`1` enabled |
 | mp_plant_c4_anywhere               | 0       | 0   | 1            | When set, players can plant anywhere, not only in bombsites.<br/>`0` disabled <br/>`1` enabled |
 | mp_give_c4_frags                   | 3       | -   | -            | How many bonuses (frags) will get the player who defused or exploded the bomb. |
+| mp_hostages_rescued_ratio          | 1.0     | 0.0 | 1.0          | Ratio of hostages rescued to win the round. |
+| mp_legacy_vehicle_block            | 1       | 0   | 1            | Legacy func_vehicle behavior when blocked by another entity.<br/>`0` New behavior <br/>`1` Legacy behavior |
+| mp_dying_time | 3.0 | 0.0 | - | Time for switch to free observing after death.<br/>`0` - disable spectating around death.<br/>`>0.00001` - time delay to start spectate.<br/>`NOTE`: The countdown starts when the player’s death animation is finished.|
 </details>
 
 ## How to install zBot for CS 1.6?

dist/game.cfg

@@ -78,6 +78,23 @@ mp_hegrenade_penetration 0
 // Default value: "0"
 mp_nadedrops 0
 
+// Drop player weapon after death
+// 0 - do not drop weapons after death
+// 1 - drop best/heaviest weapon after death (default behaviour)
+// 2 - drop active weapon after death
+// 3 - drop all weapons after death (primary and secondary)
+// NOTE: Grenades are dropped separately depending on mp_nadedrops value
+//
+// Default value: "1"
+mp_weapondrop "1"
+// Drop ammo on weapon boxes on death or manual drop
+// 0 - always keep ammo on player
+// 1 - drop all ammo only after death (default behaviour)
+// 2 - drop all ammo whenever player drops a weapon (NOTE: Other weapons may remain without ammo due to same ammo sharing)
+//
+// Default value: "1"
+mp_ammodrop "1"
+
 // Player cannot respawn until next round
 // if more than N seconds has elapsed since the beginning round
 // -1 - means no time limit
@@ -222,6 +239,7 @@ showtriggers 0
 // 3 - same as 2, but spectators hear everybody
 // 4 - alive hear alive, dead hear dead and alive.
 // 5 - alive hear alive teammates, dead hear dead and alive.
+// 6 - alive hear alive teammates, dead hear dead.
 //
 // Default value: "0"
 sv_alltalk 0
@@ -489,3 +507,25 @@ mp_plant_c4_anywhere 0
 //
 // Default value: "3"
 mp_give_c4_frags 3
+
+// Ratio of hostages rescued to win the round.
+//
+// Default value: "1.0"
+mp_hostages_rescued_ratio "1.0"
+
+// Legacy func_vehicle behavior when blocked by another entity. 
+// New one is more useful for playing multiplayer.
+//
+// 0 - New behavior
+// 1 - Legacy behavior
+//
+// Default value: "1"
+mp_legacy_vehicle_block "1"
+
+// Time for switch to free observing after death.
+// NOTE: The countdown starts when the player’s death animation is finished.
+// 0 - disable spectating around death
+// >0.00001 - time delay to start spectate
+//
+// Default value: "3.0"
+mp_dying_time "3.0"

regamedll/common/const.h

@@ -96,6 +96,12 @@
 // Goes into globalvars_t.trace_flags
 #define FTRACE_SIMPLEBOX            BIT(0)  // Traceline with a simple box
 
+// Custom flags that we can retrive in pfnShouldCollide
+// Starting from BIT(16) to reserve space for more flags for Engine
+#define FTRACE_BULLET				BIT(16)
+#define FTRACE_FLASH				BIT(17)
+#define FTRACE_KNIFE 				BIT(18)
+
 // walkmove modes
 #define WALKMOVE_NORMAL             0 // normal walkmove
 #define WALKMOVE_WORLDONLY          1 // doesn't hit ANY entities, no matter what the solid type

regamedll/dlls/API/CAPI_Impl.cpp

@@ -30,12 +30,15 @@
 
 CReGameHookchains g_ReGameHookchains;
 
-int EXT_FUNC Cmd_Argc_api() {
-	return CMD_ARGC_();
-}
+void Regamedll_ChangeString_api(char *&dest, const char *source)
+{
+	size_t len = Q_strlen(source);
+	if (dest == nullptr || Q_strlen(dest) != len) {
+		delete [] dest;
+		dest = new char [len + 1];
+	}
 
-const char *EXT_FUNC Cmd_Argv_api(int i) {
-	return CMD_ARGV_(i);
+	Q_strcpy(dest, source);
 }
 
 CGrenade *PlantBomb_api(entvars_t *pevOwner, Vector &vecStart, Vector &vecVelocity) {
@@ -51,27 +54,31 @@ void SpawnRandomGibs_api(entvars_t *pevVictim, int cGibs, int human) {
 }
 
 ReGameFuncs_t g_ReGameApiFuncs = {
-	&CREATE_NAMED_ENTITY,
+	CREATE_NAMED_ENTITY,
 
-	&Regamedll_ChangeString_api,
+	Regamedll_ChangeString_api,
 
-	&RadiusDamage_api,
-	&ClearMultiDamage_api,
-	&ApplyMultiDamage_api,
-	&AddMultiDamage_api,
+	RadiusDamage,
+	ClearMultiDamage,
+	ApplyMultiDamage,
+	AddMultiDamage,
 
-	&UTIL_FindEntityByString,
+	UTIL_FindEntityByString,
 
-	&AddEntityHashValue,
-	&RemoveEntityHashValue,
+	AddEntityHashValue,
+	RemoveEntityHashValue,
 
-	Cmd_Argc_api,
-	Cmd_Argv_api,
+	CMD_ARGC_,
+	CMD_ARGV_,
 
 	PlantBomb_api,
 
 	SpawnHeadGib_api,
-	SpawnRandomGibs_api
+	SpawnRandomGibs_api,
+
+	UTIL_RestartOther,
+	UTIL_ResetEntities,
+	UTIL_RemoveOther,
 };
 
 GAMEHOOK_REGISTRY(CBasePlayer_Spawn);
@@ -204,6 +211,9 @@ GAMEHOOK_REGISTRY(CBasePlayer_Pain);
 GAMEHOOK_REGISTRY(CBasePlayer_DeathSound);
 GAMEHOOK_REGISTRY(CBasePlayer_JoiningThink);
 
+GAMEHOOK_REGISTRY(FreeGameRules);
+GAMEHOOK_REGISTRY(PM_LadderMove);
+
 int CReGameApi::GetMajorVersion() {
 	return REGAMEDLL_API_VERSION_MAJOR;
 }
@@ -265,35 +275,4 @@ bool CReGameApi::BGetIGameRules(const char *pchVersion) const
 	return false;
 }
 
-EXT_FUNC void Regamedll_ChangeString_api(char *&dest, const char *source)
-{
-	size_t len = Q_strlen(source);
-	if (dest == nullptr || Q_strlen(dest) != len) {
-		delete [] dest;
-		dest = new char [len + 1];
-	}
-
-	Q_strcpy(dest, source);
-}
-
-EXT_FUNC void RadiusDamage_api(Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker, float flDamage, float flRadius, int iClassIgnore, int bitsDamageType)
-{
-	RadiusDamage(vecSrc, pevInflictor, pevAttacker, flDamage, flRadius, iClassIgnore, bitsDamageType);
-}
-
-EXT_FUNC void ClearMultiDamage_api()
-{
-	ClearMultiDamage();
-}
-
-EXT_FUNC void ApplyMultiDamage_api(entvars_t *pevInflictor, entvars_t *pevAttacker)
-{
-	ApplyMultiDamage(pevInflictor, pevAttacker);
-}
-
-EXT_FUNC void AddMultiDamage_api(entvars_t *pevInflictor, CBaseEntity *pEntity, float flDamage, int bitsDamageType)
-{
-	AddMultiDamage(pevInflictor, pEntity, flDamage, bitsDamageType);
-}
-
 EXPOSE_SINGLE_INTERFACE(CReGameApi, IReGameApi, VRE_GAMEDLL_API_VERSION);