release 2.8.2

  * Crosshair options

Author: DirtBagXon

README.md

@@ -181,6 +181,7 @@ The following additional, and reimplemented, arguments have been added to Hypseu
     -bootsilent                [ Mute sound during initVLDP() if possible      ]
     -js_range <1-20>           [ Adjust Singe joystick sensitivity: [def:5]    ]
     -manymouse                 [ Enable ABS mouse input [lightguns] [gungames] ]
+    -nocrosshair               [ Request game does not display crosshairs      ]
     -oversize_overlay          [ Use with HD gungame m2v video sources         ]
     -retropath                 [ Singe data path rewrites [libretro]           ]
     -sinden <1-10> <color>     [ Enable software border for lightguns          ]

src/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 
-set(PKG_VERSION "v2.8.1")
+set(PKG_VERSION "v2.8.2")
 
 project(hypseus)
 

src/HyperseusManifest.xml

@@ -2,6 +2,6 @@
 	<version>
 		<major>2</major>
 		<minor>8</minor>
-		<build>1</build>
+		<build>2</build>
 	</version>
 </manifest>

src/game/singe.cpp

@@ -211,6 +211,7 @@ void singe::start()
     g_ldp->set_seek_frames_per_ms(0);
     g_ldp->set_min_seek_delay(0);
 
+    if (notarget) g_pSingeOut->sep_call_lua("noCrosshair", "i", 1);
     if (muteinit) g_pSingeOut->sep_call_lua("mutevldpInit", "i", 1);
     if (oc) g_pSingeOut->sep_call_lua("luaChangeSpeed", "i", 1);
 
@@ -381,6 +382,10 @@ bool singe::handle_cmdline_arg(const char *arg)
         game::set_manymouse(true);
         bResult = true;
     }
+    else if (strcasecmp(arg, "-nocrosshair") == 0) {
+        notarget = true;
+        bResult = true;
+    }
     else if (strcasecmp(arg, "-sinden") == 0) {
         get_next_word(s, sizeof(s));
         i = atoi(s);

src/game/singe.h

@@ -68,6 +68,7 @@ class singe : public game
     bool singe_alt_pressed = false;
     bool oversize_overlay = false;
     bool muteinit = false;
+    bool notarget = false;
     bool oc = false;
 
     // g_ldp function wrappers (to make function pointers out of them)

src/game/singe/singeproxy.cpp

@@ -69,6 +69,7 @@ double                g_sep_overlay_scale_x =  1;
 double                g_sep_overlay_scale_y =  1;
 bool                  g_pause_state         = false; // by RDG2010
 bool                  g_init_mute           = false;
+bool                  g_show_crosshair      = true;
 
 int (*g_original_prepare_frame)(uint8_t *Yplane, uint8_t *Uplane, uint8_t *Vplane,
                int Ypitch, int Upitch, int Vpitch);
@@ -554,10 +555,11 @@ void sep_startup(const char *script)
   lua_register(g_se_lua_context, "overlaySetResolution",   sep_singe_two_pseudo_call_true);
   lua_register(g_se_lua_context, "singeSetGameName",       sep_singe_two_pseudo_call_true);
   lua_register(g_se_lua_context, "onOverlayUpdate",        sep_singe_two_pseudo_call_true);
-  lua_register(g_se_lua_context, "singeWantsCrosshairs",   sep_singe_two_pseudo_call_false);
+  lua_register(g_se_lua_context, "singeWantsCrosshairs",   sep_singe_wants_crosshair);
 
   lua_register(g_se_lua_context, "luaChangeSpeed",         sep_alter_lua_clock);
   lua_register(g_se_lua_context, "mutevldpInit",           sep_mute_vldp_init);
+  lua_register(g_se_lua_context, "noCrosshair",            sep_no_crosshair);
 
   // by RDG2010
   lua_register(g_se_lua_context, "keyboardGetMode",    sep_keyboard_get_mode); 
@@ -957,8 +959,9 @@ static int sep_singe_two_pseudo_call_true(lua_State *L)
    return 0;
 }
 
-static int sep_singe_two_pseudo_call_false(lua_State *L)
+static int sep_singe_wants_crosshair(lua_State *L)
 {
+   lua_pushboolean(L, g_show_crosshair);
    return 1;
 }
 
@@ -980,6 +983,12 @@ static int sep_mute_vldp_init(lua_State *L)
    return 1;
 }
 
+static int sep_no_crosshair(lua_State *L)
+{
+  g_show_crosshair = false;
+  return 1;
+}
+
 static int sep_mpeg_get_width(lua_State *L)
 {
   lua_pushnumber(L, g_pSingeIn->g_vldp_info->w);

src/game/singe/singeproxy.h

@@ -81,6 +81,7 @@ static int sep_color_set_forecolor(lua_State *L);
 static int sep_hypseus_get_height(lua_State *L);
 static int sep_alter_lua_clock(lua_State *L);
 static int sep_mute_vldp_init(lua_State *L);
+static int sep_no_crosshair(lua_State *L);
 static int sep_hypseus_get_width(lua_State *L);
 static int sep_debug_say(lua_State *L);
 static int sep_font_load(lua_State *L);
@@ -131,4 +132,4 @@ static int sep_sound_stop(lua_State *L);
 static int sep_sound_flush_queue(lua_State *L);
 // by DBX - Singe 2
 static int sep_singe_two_pseudo_call_true(lua_State *L);
-static int sep_singe_two_pseudo_call_false(lua_State *L);
+static int sep_singe_wants_crosshair(lua_State *L);

win32/README.md

@@ -9,11 +9,11 @@
 Latest build is: (_32bit_ and _64bit_ versions are available.)
 
     hypseus.exe -v
-    [version] Hypseus Singe: v2.8.1
+    [version] Hypseus Singe: v2.8.2
     [console] Windows 10
     [console] SDL(CC): 2.0.14
     [console] SDL(LD): 2.0.16
-    [console] Build: Feb 10 2022 00:30:00
+    [console] Build: Mar 10 2022 00:10:00
 
 
 ## Install