diff --git a/GameVersion.cpp b/GameVersion.cpp index 5852ec07..8c06e172 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.406" }; + INT16 zVersionLabel[256] = { L"Release v1.13.407" }; #endif diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 70301dec..0ec2f965 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -1256,7 +1256,7 @@ BOOLEAN WeaponInHand( SOLDIERTYPE * pSoldier ) { if (pSoldier->inv[HANDPOS].ubImprintID != NO_PROFILE) { - if (pSoldier->ubProfile != NO_PROFILE) + if (pSoldier->ubProfile != NO_PROFILE && pSoldier->ubProfile != MADLAB ) { if (pSoldier->inv[HANDPOS].ubImprintID != pSoldier->ubProfile) { @@ -2223,7 +2223,6 @@ UINT8 CalculateObjectWeight( OBJECTTYPE *pObject ) usWeight = 0; //Temporary calculation for minWeight. 0.2*ubWeight rounded correctly UINT32 uiMinWeight = (Item[pObject->usItem].ubWeight / 5.0) + 0.5; - //UINT32 uiMinWeight = Magazine[ Item[ pObject->usItem].ubClassIndex].ubMinWeight; //Minimum weight of magazine, now disabled because not corresponding entry in magazines.xml and weapons.h if( uiMinWeight < 1 || uiMinWeight > Item[pObject->usItem].ubWeight) { uiMinWeight = 1; diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index f85b0fee..4bcea7b6 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -1572,10 +1572,11 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) UIHandleLUIEndLock( NULL ); } - if ((InputEvent.usEvent == KEY_DOWN )&& ( InputEvent.usParam == ENTER ) && ( InputEvent.usKeyState & CTRL_DOWN ) ) - { - EscapeUILock( ); - } + } + //Madd: removed from cheat mode + if ((InputEvent.usEvent == KEY_DOWN )&& ( InputEvent.usParam == ENTER ) && ( InputEvent.usKeyState & CTRL_DOWN ) ) + { + EscapeUILock( ); } } else