For release v1.1.5b. Added setting to make new game files. Fix 3 bugs.

Author: 6Bolt

COMDeviceList/ComDeviceList.cpp

@@ -22,6 +22,7 @@ ComDeviceList::ComDeviceList()
     displayAmmoPriority = true;
     displayLifePriority = false;
     displayOtherPriority = false;
+    enableNewGameFileCreation = false;
 
     //More Set Defaults
     for(quint8 comPortIndx=0;comPortIndx<MAXCOMPORTS;comPortIndx++)
@@ -457,6 +458,8 @@ void ComDeviceList::SaveLightGunList()
     //If Light Gun Number is Zero, then Erase Old Save File & Done
     if(numberLightGuns == 0)
     {
+        SavePlayersAss();
+
         if(saveLGData.exists ())
             removedFile = saveLGData.remove ();
 
@@ -1372,6 +1375,11 @@ void ComDeviceList::SaveSettings()
     else
         out << "0\n";
 
+    if(enableNewGameFileCreation)
+        out << "1\n";
+    else
+        out << "0\n";
+
 
     out << ENDOFFILE;
 
@@ -1539,24 +1547,14 @@ void ComDeviceList::LoadSettings()
     //Next Line is End of File or Display Ammo Priority
     line = in.readLine();
 
-    if(line.startsWith (ENDOFFILE))
+    if(line.startsWith ("1"))
     {
         displayAmmoPriority = true;
-        displayLifePriority = false;
-        displayOtherPriority = false;
-        displayAmmoLife = false;
-        displayAmmoLifeGlyphs = true;
-        displayAmmoLifeBar = false;
-        displayAmmoLifeNumber = false;
-        loadSetData.close ();
-        this->SaveSettings();
-        this->UpdateLightGunWithSettings ();
-        return;
     }
-    else if(line.startsWith ("1"))
-        displayAmmoPriority = true;
     else if(line.startsWith ("0"))
+    {
         displayAmmoPriority = false;
+    }
     else
     {
         QMessageBox::critical (nullptr, "Settings File Error", "Settings save data file is corrupted at Display Ammo Priority. Please close program and solve file problem.", QMessageBox::Ok);
@@ -1666,6 +1664,27 @@ void ComDeviceList::LoadSettings()
         return;
     }
 
+    //Setting for New Game File Creation
+    line = in.readLine();
+
+    if(line.startsWith (ENDOFFILE))
+    {
+        enableNewGameFileCreation = false;
+        loadSetData.close ();
+        this->SaveSettings();
+        this->UpdateLightGunWithSettings ();
+        return;
+    }
+    else if(line.startsWith ("1"))
+        enableNewGameFileCreation = true;
+    else if(line.startsWith ("0"))
+        enableNewGameFileCreation = false;
+    else
+    {
+        QMessageBox::critical (nullptr, "Settings File Error", "Settings save data file is corrupted at Enable New Game File Creation. Please close program and solve file problem.", QMessageBox::Ok);
+        return;
+    }
+
     //Next Line is End of File
     line = in.readLine();
 
@@ -1821,6 +1840,16 @@ void ComDeviceList::SetDisplayAmmoAndLife(bool displayAAL, bool displayLG, bool
 
 }
 
+bool ComDeviceList::GetEnableNewGameFileCreation()
+{
+    return enableNewGameFileCreation;
+}
+
+void ComDeviceList::SetEnableNewGameFileCreation(bool enableNGFC)
+{
+    enableNewGameFileCreation = enableNGFC;
+}
+
 void ComDeviceList::UpdateLightGunWithSettings()
 {
     bool isDefaultLG;

COMDeviceList/ComDeviceList.h

@@ -125,6 +125,10 @@ class ComDeviceList
     bool            GetDisplayAmmoAndLife(bool *displayLG, bool *displayLB, bool *displayLN);
     void            SetDisplayAmmoAndLife(bool displayAAL, bool displayLG, bool displayLB, bool displayLN);
 
+    //Enable New Game File Creation
+    bool            GetEnableNewGameFileCreation();
+    void            SetEnableNewGameFileCreation(bool enableNGFC);
+
     //Update Light Gun Settings
     void            UpdateLightGunWithSettings();
 
@@ -203,6 +207,7 @@ class ComDeviceList
     bool                displayAmmoPriority;
     bool                displayLifePriority;
     bool                displayOtherPriority;
+    bool                enableNewGameFileCreation;
 
     quint8              userRecoilPriority[NUMBEROFRECOILS];
 

COMDeviceList/LightGun.cpp

@@ -1271,14 +1271,17 @@ void LightGun::LoadDefaultLGCommands()
                         for(i = 0; i < numberCommands; i++)
                         {
                             commands[i] = commands[i].trimmed ();
+                            closeComPortCmds << commands[i];
 
+                            /* The ZX command should not be taken out, as it gives recoil control back to light gun
                             if(disableReaperLEDs)
                             {
                                 if(commands[i] != DISABLEREAPERLEDSCLOSE)
                                     closeComPortCmds << commands[i];
                             }
                             else
                                 closeComPortCmds << commands[i];
+                            */
                         }
                         closeComPortCmdsSet = true;
                     }

Global.h

@@ -3,7 +3,7 @@
 
 #include <qobject.h>
 
-#define VERSION                 "1.1.5"
+#define VERSION                 "1.1.5b"
 #define VERSIONMAIN             1
 #define VERSIONMID              1
 #define VERSIONLAST             3