For v1.1.9 quick release for the HOTD2 Remake shit show

Author: 6Bolt

COMDeviceList/ComDeviceList.cpp

@@ -449,6 +449,7 @@ quint8 ComDeviceList::GetPlayerLightGunAssignment(quint8 playerNum)
     return UNASSIGN;
 }
 
+
 //Save & Load Light guns from/to File
 void ComDeviceList::SaveLightGunList()
 {

COMDeviceList/ComDeviceList.h

@@ -71,6 +71,7 @@ class ComDeviceList
     void            DeassignPlayerLightGun(quint8 playerNum);
     quint8          GetPlayerLightGunAssignment(quint8 playerNum);
 
+
     //Save or Load Light Guns to/from a File
     void            SaveLightGunList();
     void            LoadLightGunList();

COMDeviceList/LightGun.cpp

@@ -1877,8 +1877,14 @@ QStringList LightGun::AmmoValueCommands(bool *isSet, quint16 ammoValue)
     quint8 cmdCount = ammoValueCmds.length ();
     bool doReloadCMD = false;
 
+    //If Ammo is the same, do nothing
+    if(ammoValue == lastAmmoValue)
+    {
+        *isSet = false;
+        return tempSL;
+    }
     //Check if Reload Happened
-    if(ammoValue > lastAmmoValue)
+    else if(ammoValue > lastAmmoValue)
     {
         lastAmmoValue = ammoValue;
         *isSet = reloadCmdsSet;

Global.h

@@ -3,7 +3,7 @@
 
 #include <qobject.h>
 
-#define VERSION                 "1.1.8"
+#define VERSION                 "1.1.9 QR"
 #define VERSIONMAIN             1
 #define VERSIONMID              1
 #define VERSIONLAST             3
@@ -380,6 +380,13 @@ extern QString DEFAULTLGFILENAMES_ARRAY[];
 #define PLAYER2CHHAR            'P'
 #define ALL2CHAR                'A'
 #define SLOWMODE                "Slow"
+#define STATESSECTION           "[States]"
+#define OPTIONSSECTION          "[Options]"
+#define ENDOPTIONS              "End Options"
+#define BLOCKSHAKEOPTION        "Block Shake"
+#define BLOCKRECOIL_R2SOPTION   "Block Recoil_R2S"
+#define BLOCKSHAKELENGTH        4
+#define BLOCKRECOIL_R2SLENGTH   4
 
 //Number of Supported Recoil Commands 4: Ammo_Value, Recoil, Recoil_R2S, and Recoil_Value
 #define NUMBEROFRECOILS         4
@@ -439,6 +446,7 @@ extern QString DEFAULTLGFILENAMES_ARRAY[];
 #define RELOADVALUECMD          ">Reload_Value"
 #define OFFSCREENBUTTONCMD      ">Offscreen_Button"
 #define OFFSCREENNORMALSHOTCMD  ">Offscreen_Normal_Shot"
+#define BLOCKSIGNALCOMMAND      ">Block_Signal"
 
 #define OPENCOMPORTONLY         "Open_COM"
 #define CLOSECOMPORTONLY        "Close_COM"

HookerEngine/HookCOMPortWin.cpp

@@ -104,9 +104,9 @@ HookCOMPortWin::~HookCOMPortWin()
             //qDebug() << "lastError: " << lastError;
             //qDebug() << "comPortArray[comPortNum]: " << comPortArray[comPortNum] << "GetLastError(): " << lastError;
 
-            FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
-                          GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                          (LPWSTR)&messageBuffer, 1020, NULL);
+            //FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
+            //              GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+            //              (LPWSTR)&messageBuffer, 1020, NULL);
 
             if(!bypassCOMPortConnectFailWarning)
             {
@@ -146,15 +146,15 @@ HookCOMPortWin::~HookCOMPortWin()
                 COMSTAT status;
                 DWORD errors;
 
-                FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
+                DWORD charsCopied = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
                               GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                              (LPWSTR)&messageBuffer, 1020, NULL);
+                              (LPWSTR)&messageBuffer, 0, NULL);
 
                 ClearCommError(comPortArray[comPortNum], &errors, &status);
 
                 QString critMessage;
 
-                if(messageBuffer == nullptr)
+                if(messageBuffer == nullptr || charsCopied == 0)
                     critMessage = "Can not get the CommState for the Serial COM Port: "+comPortName+" on Port: "+QString::number(comPortNum)+". This is the default settings for the serial port.";
                 else
                     critMessage = "Can not get the CommState for the Serial COM Port: "+comPortName+" on Port: "+QString::number(comPortNum)+". This is the default settings for the serial port. "+QString::fromWCharArray(messageBuffer);
@@ -245,18 +245,19 @@ HookCOMPortWin::~HookCOMPortWin()
                 COMSTAT status;
                 DWORD errors;
 
-                FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
+                DWORD charsCopied = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
                               GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                              (LPWSTR)&messageBuffer, 1020, NULL);
+                              (LPWSTR)&messageBuffer, 0, NULL);
 
                 ClearCommError(comPortArray[comPortNum], &errors, &status);
 
                 QString critMessage;
 
-                if(messageBuffer == nullptr)
+                if(messageBuffer == nullptr || charsCopied == 0)
                     critMessage = "Can not set the CommState for the Serial COM Port: "+comPortName+" on Port: "+QString::number(comPortNum)+". This is the settings for the serial port. ";
                 else
                     critMessage = "Can not set the CommState for the Serial COM Port: "+comPortName+" on Port: "+QString::number(comPortNum)+". This is the settings for the serial port. "+QString::fromWCharArray(messageBuffer);
+                critMessage = "Can not set the CommState for the Serial COM Port: "+comPortName+" on Port: "+QString::number(comPortNum)+". This is the settings for the serial port. ";
                 emit ErrorMessage("Serial COM Port Error",critMessage);
                 return;
             }
@@ -292,15 +293,15 @@ HookCOMPortWin::~HookCOMPortWin()
                 COMSTAT status;
                 DWORD errors;
 
-                FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
+                DWORD charsCopied = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
                               GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                              (LPWSTR)&messageBuffer, 1020, NULL);
+                              (LPWSTR)&messageBuffer, 0, NULL);
 
                 ClearCommError(comPortArray[comPortNum], &errors, &status);
 
                 QString critMessage;
 
-                if(messageBuffer == nullptr)
+                if(messageBuffer == nullptr || charsCopied == 0)
                     critMessage = "Serial COM Port failed to set TimeOuts, on COM Port: "+QString::number(comPortNum)+". Please check you Serial COM Port connections. Error: "+QString::number(errors);
                 else
                     critMessage = "Serial COM Port failed to set TimeOuts, on COM Port: : "+QString::number(comPortNum)+". Please check you Serial COM Port connections. Error: "+QString::number(errors)+" "+QString::fromWCharArray(messageBuffer);