add crosshaircolor.patch

Makefile

@@ -35,6 +35,7 @@ apply-patches:
 	$(PATCH) < patches/include_p1xbraten_menus.patch
 	$(PATCH) < patches/tex_commands.patch
 	$(PATCH) < patches/decouple_framedrawing.patch
+	$(PATCH) < patches/crosshaircolor.patch
 	unix2dos src/vcpp/sauerbraten.vcxproj
 
 gzip-menus:

README.md

@@ -19,6 +19,7 @@ This repository contains the source for my client mod, as well as the patches ap
   - [listteams.patch](#listteamspatch)
   - [tex_commands.patch](#tex_commandspatch)
   - [decouple_framedrawing.patch](#decouple_framedrawingpatch)
+  - [crosshaircolor.patch](#crosshaircolorpatch)
 - [Installation](#installation)
   - [Windows](#windows)
   - [macOS](#macos)
@@ -141,6 +142,10 @@ Using `maxfps` and `maxtps`, you can optimize for different goals:
 - to use fewer resources and save laptop battery, use `/maxfps 0`, `/maxtps 100` and `/vsync 1`
 - for lowest consistent latency, use `/maxfps 0`, `/vsync 0`, then set `maxtps` to the highest value that gives you a stable fps counter on your system, then `/vsync 1`
 
+### [crosshaircolor.patch](./patches/crosshaircolor.patch)
+
+- adds `crosshaircolor` variable to set a base crosshair color (for example, `/crosshaircolor 0 255 0` for pleasant green)
+
 ## Installation
 
 The latest builds are always at https://github.com/sauerbraten/p1xbraten/releases/latest.

patches/crosshaircolor.patch

@@ -0,0 +1,26 @@
+Index: src/engine/rendergl.cpp
+===================================================================
+--- src/engine/rendergl.cpp	(revision 6490)
++++ src/engine/rendergl.cpp	(working copy)
+@@ -2079,6 +2098,7 @@
+ VARP(cursorsize, 0, 30, 50);
+ VARP(crosshairfx, 0, 1, 1);
+ VARP(crosshaircolors, 0, 1, 1);
++HVARP(crosshaircolor, 0, 0xFFFFFF, 0xFFFFFF);
+
+ #define MAXCROSSHAIRS 4
+ static Texture *crosshairs[MAXCROSSHAIRS] = { NULL, NULL, NULL, NULL };
+@@ -2138,10 +2158,11 @@
+     }
+     else
+     {
+-        int index = game::selectcrosshair(color);
++        vec chcolor = vec::hexcolor(crosshaircolor);
++        int index = game::selectcrosshair(chcolor);
+         if(index < 0) return;
+         if(!crosshairfx) index = 0;
+-        if(!crosshairfx || !crosshaircolors) color = vec(1, 1, 1);
++        color = crosshairfx && crosshaircolors ? chcolor : vec::hexcolor(crosshaircolor);
+         crosshair = crosshairs[index];
+         if(!crosshair)
+         {

src/engine/rendergl.cpp

@@ -2098,6 +2098,7 @@ VARP(crosshairsize, 0, 15, 50);
 VARP(cursorsize, 0, 30, 50);
 VARP(crosshairfx, 0, 1, 1);
 VARP(crosshaircolors, 0, 1, 1);
+HVARP(crosshaircolor, 0, 0xFFFFFF, 0xFFFFFF);
 
 #define MAXCROSSHAIRS 4
 static Texture *crosshairs[MAXCROSSHAIRS] = { NULL, NULL, NULL, NULL };
@@ -2157,10 +2158,11 @@ void drawcrosshair(int w, int h)
     }
     else
     { 
-        int index = game::selectcrosshair(color);
+        vec chcolor = vec::hexcolor(crosshaircolor);
+        int index = game::selectcrosshair(chcolor);
         if(index < 0) return;
         if(!crosshairfx) index = 0;
-        if(!crosshairfx || !crosshaircolors) color = vec(1, 1, 1);
+        color = crosshairfx && crosshaircolors ? chcolor : vec::hexcolor(crosshaircolor);
         crosshair = crosshairs[index];
         if(!crosshair) 
         {