1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

-madlab no longer allowed to set fingerprintid on rocket rifles

Browse Source 
-ctrl+enter deadlock abort keys no longer require cheat mode to be active

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@407 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-08-05 00:05:24 +00:00
parent d8c1e4d015
commit 0fedfb8c7d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else #else
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.406" }; INT16 zVersionLabel[256] = { L"Release v1.13.407" };
#endif #endif
Tactical/Items.cpp
+1 -2
View File
@@ -1256,7 +1256,7 @@ BOOLEAN WeaponInHand( SOLDIERTYPE * pSoldier )
{ {
if (pSoldier->inv[HANDPOS].ubImprintID != NO_PROFILE) 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) if (pSoldier->inv[HANDPOS].ubImprintID != pSoldier->ubProfile)
{ {
@@ -2223,7 +2223,6 @@ UINT8 CalculateObjectWeight( OBJECTTYPE *pObject )
usWeight = 0; usWeight = 0;
//Temporary calculation for minWeight. 0.2*ubWeight rounded correctly //Temporary calculation for minWeight. 0.2*ubWeight rounded correctly
UINT32 uiMinWeight = (Item[pObject->usItem].ubWeight / 5.0) + 0.5; 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) if( uiMinWeight < 1 || uiMinWeight > Item[pObject->usItem].ubWeight)
{ {
uiMinWeight = 1; uiMinWeight = 1;
Tactical/Turn Based Input.cpp
+5 -4
View File
@@ -1572,10 +1572,11 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
UIHandleLUIEndLock( NULL ); UIHandleLUIEndLock( NULL );
} }
if ((InputEvent.usEvent == KEY_DOWN )&& ( InputEvent.usParam == ENTER ) && ( InputEvent.usKeyState & CTRL_DOWN ) ) }
{ //Madd: removed from cheat mode
EscapeUILock( ); if ((InputEvent.usEvent == KEY_DOWN )&& ( InputEvent.usParam == ENTER ) && ( InputEvent.usKeyState & CTRL_DOWN ) )
} {
EscapeUILock( );
} }
} }
else else