add crosshairreloadfade.patch

closes #38

Author: sauerbraten

Makefile

@@ -54,6 +54,7 @@ apply-patches:
 	$(PATCH) < patches/clientdemo.patch
 	$(PATCH) < patches/colored_weapon_trails.patch
 	$(PATCH) < patches/serverevents.patch
+	$(PATCH) < patches/crosshairreloadfade.patch
 	unix2dos src/vcpp/sauerbraten.nsi
 	unix2dos src/vcpp/sauerbraten.vcxproj
 	cd src && make depend

README.md

@@ -32,6 +32,7 @@ This repository contains the source for my client mod, as well as the patches ap
   - [checkupdate.patch](#checkupdatepatch)
   - [clientdemo.patch](#clientdemopatch)
   - [colored_weapon_trails.patch](#colored_weapon_trailspatch)
+  - [crosshairreloadfade.patch](#crosshairreloadfadepatch)
 - [Server Patches](#server-patches)
   - [authservers.patch](#authserverspatch)
   - [serverlogging.patch](#serverloggingpatch)
@@ -235,6 +236,10 @@ Client-side demos record the game as you experience it, and work independently o
 - adds the `trailcolor[shotgun|chaingun|rocketlauncher|rifle|grenadelauncher|pistol]` vars that change the respective weapon's projectile/particle trail
 - adds the `settrailcolor <SG|CG|RL|RI|GL|PI> <color>` command (for convenience: changing the variables directly also works)
 
+### [crosshairreloadfade.patch](./patches/crosshairreloadfade.patch)
+
+- adds `crosshairreloadfade` variable: set to 0 to disable the "crosshair-goes-dark-while-weapon-reloads" effect
+  
 
 ## Server Patches
 

patches/crosshairreloadfade.patch

@@ -0,0 +1,22 @@
+diff --git src/fpsgame/fps.cpp src/fpsgame/fps.cpp
+index 15e4aec..1f6919b 100644
+--- src/fpsgame/fps.cpp
++++ src/fpsgame/fps.cpp
+@@ -1135,6 +1135,8 @@ namespace game
+         }
+     }
+ 
++    MOD(VARP, crosshairreloadfade, 0, 1, 1);
++
+     int selectcrosshair(vec &color)
+     {
+         fpsent *d = hudplayer();
+@@ -1159,7 +1161,7 @@ namespace game
+             if(d->health<=25) color = vec(1, 0, 0);
+             else if(d->health<=50) color = vec(1, 0.5f, 0);
+         }
+-        if(d->gunwait) color.mul(0.5f);
++        if(d->gunwait && crosshairreloadfade) color.mul(0.5f);
+         return crosshair;
+     }
+ 

src/fpsgame/fps.cpp

@@ -1135,6 +1135,8 @@ namespace game
         }
     }
 
+    MOD(VARP, crosshairreloadfade, 0, 1, 1);
+
     int selectcrosshair(vec &color)
     {
         fpsent *d = hudplayer();
@@ -1159,7 +1161,7 @@ namespace game
             if(d->health<=25) color = vec(1, 0, 0);
             else if(d->health<=50) color = vec(1, 0.5f, 0);
         }
-        if(d->gunwait) color.mul(0.5f);
+        if(d->gunwait && crosshairreloadfade) color.mul(0.5f);
         return crosshair;
     }