Add simple reticule scalable size

gennariarmando · Jan 8, 2022 · edbe9c5 · edbe9c5
1 parent 6dbac38
commit edbe9c5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/resources/VHud/text/english.ini b/resources/VHud/text/english.ini
@@ -138,6 +138,7 @@ FE_IRA = Invert Right Axis
 FE_HUD = HUD
 FE_RAD = Radar
 FE_TAR = Weapon Target
+FE_SRZ = Simple Reticule Size
 FE_SIM = Simple
 FE_COMP = Complex
 FE_SUB = Subtitles

diff --git a/resources/VHud/text/italian.ini b/resources/VHud/text/italian.ini
@@ -138,6 +138,7 @@ FE_IRA = Inverti asse destro
 FE_HUD = HUD
 FE_RAD = Radar
 FE_TAR = Mirino
+FE_SRZ = Dimensione mirino semplice
 FE_SIM = Semplice
 FE_COMP = Complesso
 FE_SUB = Sottotitoli

diff --git a/source/HudNew.cpp b/source/HudNew.cpp
@@ -636,8 +636,10 @@ void CHudNew::DrawCrosshairs() {
                     col.a = dotAlpha;
                     int crosshairType = CROSSHAIR_DOT;
                     bool withDot = true;
-
+                    float simplereticuleSize = (MenuNew.Settings.simpleReticuleSize * 0.8f) + 1.0f;
+
                     if (MenuNew.Settings.weaponTarget) {
+                        simplereticuleSize = 1.0f;
                         radius = clamp(radius, 1.0f, 4.0f);
 
                         if (!faststrcmp(crosshairName, "assault")) {
@@ -666,8 +668,8 @@ void CHudNew::DrawCrosshairs() {
                     }
 
                     if (withDot) {
-                        w = GET_SETTING(HUD_CROSSHAIR_DOT).w;
-                        h = GET_SETTING(HUD_CROSSHAIR_DOT).h;
+                        w = GET_SETTING(HUD_CROSSHAIR_DOT).w * simplereticuleSize;
+                        h = GET_SETTING(HUD_CROSSHAIR_DOT).h * simplereticuleSize;
                         CrosshairsSprites[CROSSHAIR_DOT]->Draw(CRect(x - SCREEN_COORD(w), y - SCREEN_COORD(h), x + SCREEN_COORD(w), y + SCREEN_COORD(h)), col);
                     }
 

diff --git a/source/MenuNew.cpp b/source/MenuNew.cpp
@@ -418,6 +418,7 @@ void CMenuNew::BuildMenuScreen() {
             AddNewEntry(display, MENUENTRY_SHOWRADAR, "FE_RAD", 0, 0);
             AddNewEntry(display, MENUENTRY_SHOWHUD, "FE_HUD", 0, 0);
             AddNewEntry(display, MENUENTRY_WEAPONTARGET, "FE_TAR", 0, 0);
+            AddNewEntry(display, MENUENTRY_SIMPLERETICULESIZE, "FE_SRZ", 0, 0);
             AddNewEntry(display, MENUENTRY_GPSROUTE, "FE_GPS", 0, 0);
             AddNewEntry(display, MENUENTRY_BRIGHTNESS, "FE_BRI", 0, 0);
             AddNewEntry(display, MENUENTRY_GAMMA, "FE_GMA", 0, 0);
@@ -2122,6 +2123,7 @@ void CMenuNew::ProcessEntryStuff(int enter, int input) {
     case MENUENTRY_MOUSESENSITIVITY:
     case MENUENTRY_GAMMA:
     case MENUENTRY_SAFEZONESIZE:
+    case MENUENTRY_SIMPLERETICULESIZE:
         CheckSliderMovement(input);
         ApplyChanges();
         break;
@@ -2210,6 +2212,10 @@ void CMenuNew::CheckSliderMovement(double value) {
         TheCamera.m_fMouseAccelHorzntl = (float)ts.mouseSensitivity;
         TheCamera.m_fMouseAccelVertical = (float)ts.mouseSensitivity;
         break;
+    case MENUENTRY_SIMPLERETICULESIZE:
+        ts.simpleReticuleSize += double(value * 1.0);
+        ts.simpleReticuleSize = clamp(ts.simpleReticuleSize, 0, 1.0);
+        break;
     }
 }
 
@@ -3137,6 +3143,9 @@ void CMenuNew::DrawDefault() {
                 case MENUENTRY_MOUSESENSITIVITY:
                     DrawSliderRightAlign(menuEntry.left + menuEntry.right + SCREEN_COORD(-12.0f), menuEntry.top + SCREEN_COORD(14.0f), TempSettings.mouseSensitivity * 200.0f);
                     break;
+                case MENUENTRY_SIMPLERETICULESIZE:
+                    DrawSliderRightAlign(menuEntry.left + menuEntry.right + SCREEN_COORD(-12.0f), menuEntry.top + SCREEN_COORD(14.0f), TempSettings.simpleReticuleSize / 1.0f);
+                    break;
                 default:
                     arrows = false;
                     break;
@@ -4644,6 +4653,8 @@ void CMenuNew::RestoreDefaults(CMenuSettings* ts, int index) {
         ts->language = 0;
         ts->showHUD = true;
         ts->showRadar = true;
+        ts->weaponTarget = 0;
+        ts->simpleReticuleSize = 0.0;
         ts->savePhotos = true;
         ts->gpsRoute = true;
         ts->safeZoneSize = 32.0;
@@ -4771,6 +4782,7 @@ void CMenuSettings::Load() {
                 showHUD = display.child("ShowHUD").attribute("value").as_bool();
                 showRadar = display.child("ShowRadar").attribute("value").as_bool();
                 weaponTarget = display.child("WeaponTarget").attribute("value").as_int();
+                simpleReticuleSize = display.child("SimpleReticuleSize").attribute("value").as_double();
                 savePhotos = display.child("SavePhotos").attribute("value").as_bool();
                 gpsRoute = display.child("GpsRoute").attribute("value").as_bool();
                 safeZoneSize = display.child("SafeZoneSize").attribute("value").as_double();
@@ -4861,6 +4873,7 @@ void CMenuSettings::Save() {
     display.append_child("ShowHUD").append_attribute("value").set_value(showHUD);
     display.append_child("ShowRadar").append_attribute("value").set_value(showRadar);
     display.append_child("WeaponTarget").append_attribute("value").set_value(weaponTarget);
+    display.append_child("SimpleReticuleSize").append_attribute("value").set_value(simpleReticuleSize);
     display.append_child("SavePhotos").append_attribute("value").set_value(savePhotos);
     display.append_child("GpsRoute").append_attribute("value").set_value(gpsRoute);
     display.append_child("SafeZoneSize").append_attribute("value").set_value(safeZoneSize);

diff --git a/source/MenuNew.h b/source/MenuNew.h
@@ -118,6 +118,7 @@ enum eMenuEntries {
     MENUENTRY_SHOWHUD,
     MENUENTRY_SHOWRADAR,
     MENUENTRY_WEAPONTARGET,
+    MENUENTRY_SIMPLERETICULESIZE,
     MENUENTRY_GPSROUTE,
     MENUENTRY_SAFEZONESIZE,
     MENUENTRY_MEASUREMENTSYS,
@@ -314,6 +315,7 @@ class CMenuSettings {
     bool showHUD;
     bool showRadar;
     int weaponTarget;
+    double simpleReticuleSize;
     bool savePhotos;
     bool gpsRoute;
     double safeZoneSize;