Fixes to shell, add crash fix on playertakedamage

solidi · Oct 10, 2024 · 816914f · 816914f
1 parent 208651c
commit 816914f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/workspace/Build-Models.ps1 b/workspace/Build-Models.ps1
@@ -398,6 +398,8 @@ try {
     Compile-Model $binDir "v_usas" $modelsdir $redistdir\models
     Compile-Model $binDir "w_shotgunshell" $modelsdir $redistdir\models
     Compile-Model $binDir "w_shotgunshell" $modelsdir\hd $redisthddir\models
+    Compile-Model $binDir "w_shell" $modelsdir $redistdir\models
+    Compile-Model $binDir "w_shell" $modelsdir\hd $redisthddir\models
     Compile-Model $binDir "v_fists" $modelsdir $redistdir\models
     Compile-Model $binDir "v_fists" $modelsdir\hd $redisthddir\models
     Compile-Model $binDir "v_wrench" $modelsdir $redistdir\models

diff --git a/workspace/manifest b/workspace/manifest
@@ -393,6 +393,7 @@ models\v_mag60.mdl
 models\v_glauncher.mdl
 models\v_smg.mdl
 models\v_usas.mdl
+models\w_shell.mdl
 models\w_shotgunshell.mdl
 models\v_fists.mdl
 models\v_wrench.mdl

diff --git a/workspace/manifest_hd b/workspace/manifest_hd
@@ -20,6 +20,7 @@ models\v_mag60.mdl
 models\v_glauncher.mdl
 models\v_smg.mdl
 models\v_usas.mdl
+models\w_shell.mdl
 models\w_shotgunshell.mdl
 models\v_fists.mdl
 models\v_wrench.mdl

diff --git a/workspace/models/hd/w_shell/w_shell.qc b/workspace/models/hd/w_shell/w_shell.qc
@@ -30,10 +30,10 @@ $body "studio" "shell"
 $texturegroup ice
 {
   {
-    "shell.bmp"
+    "..\w_shell\shell.bmp"
   }
   {
-    "invert_shell.bmp"
+    "..\w_shell\invert_shell.bmp"
   }
   {
     "..\..\ringchrome.bmp"

diff --git a/workspace/models/w_shell/w_shell.qc b/workspace/models/w_shell/w_shell.qc
@@ -30,14 +30,14 @@ $body "studio" "shell"
 $texturegroup ice
 {
   {
-    "back.bmp"
-    "bulletCHROME.bmp"
-    "front.bmp"
+    "..\w_shell\back.bmp"
+    "..\w_shell\bulletCHROME.bmp"
+    "..\w_shell\front.bmp"
   }
   {
-    "invert_back.bmp"
-    "invert_bulletCHROME.bmp"
-    "invert_front.bmp"
+    "..\w_shell\invert_back.bmp"
+    "..\w_shell\invert_bulletCHROME.bmp"
+    "..\w_shell\invert_front.bmp"
   }
   {
     "..\ringchrome.bmp"

diff --git a/workspace/redist/readme.txt b/workspace/redist/readme.txt
@@ -197,6 +197,7 @@ Beta 5 Features:
     - Fixed func_friction behavior in multiplayer
     - Disabled grappling hook in spectator mode
     - Remove rune from all spectators
+    - Fix crash involving monster projectiles
 
 Beta 4 Features:
 

diff --git a/workspace/src b/workspace/src
+1 −1		dlls/busters_gamerules.cpp
+1 −1		dlls/chilldemic_gamerules.cpp
+1 −1		dlls/ctc_gamerules.cpp
+1 −1		dlls/hassassin.cpp
+1 −1		dlls/hgrunt.cpp
+1 −1		dlls/horde_gamerules.cpp
+1 −1		dlls/jvs_gamerules.cpp
+2 −6		dlls/multiplay_gamerules.cpp
+1 −0		dlls/nuke.cpp
+4 −0		dlls/player.cpp
+2 −2		dlls/prophunt_gamerules.cpp
+1 −1		dlls/shidden_gamerules.cpp
+2 −1		dlls/weapons.cpp