cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6102 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Laptop/AimMembers.cpp

@@ -929,7 +929,6 @@ BOOLEAN EnterAIMMembers()
 		SetButtonCursor(giNextButton, CURSOR_WWW );
 	}
 
-	gbCurrentSoldier = AimMercArray[gbCurrentIndex];
 	gbCurrentSoldier = gAimAvailability[AimMercArray[gbCurrentIndex]].ProfilId;
 	gbCurrentSoldierBio = gAimAvailability[AimMercArray[gbCurrentIndex]].AimBio;
 
@@ -3294,7 +3293,6 @@ void SelectShutUpMercRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
 		else if (iReason & MSYS_CALLBACK_REASON_LBUTTON_UP)
 		{
 			fInCallBack = FALSE;
-
 			gfStopMercFromTalking = TRUE;
 			fInCallBack = TRUE;
 		}

Laptop/BobbyRGuns.cpp

@@ -2297,7 +2297,7 @@ UINT16 DisplayProtection(UINT16 usPosY, UINT16 usIndex, UINT16 usFontHeight)
 		break;
 	}
 	
-	swprintf(sTemp, L"%d", iProtection, Armour[ Item[ usIndex ].ubClassIndex ].ubProtection);
+	swprintf(sTemp, L"%d", iProtection, Armour[ Item[ usIndex ].ubClassIndex ].ubProtection); // FIXME: param4 is unused
 	wcscat( sTemp, L"%%" );
 	swprintf( sTemp2, L"(%d)", Armour[ Item[ usIndex ].ubClassIndex ].ubProtection );
 	wcscat( sTemp, sTemp2 );

Laptop/IMP Attribute Selection.cpp

@@ -2188,10 +2188,7 @@ INT32 DetermineNewValue( INT32 iNewX )
 	INT32 iNewValue=0;
 	INT32	iStartLoc = SKILL_SLIDE_START_X + LAPTOP_SCREEN_UL_X;
 	INT32 iPositionX = iNewX - iStartLoc;
-	FLOAT fPercentOfBar=0.0f;
-
-
-	fPercentOfBar = iPositionX / ( FLOAT)( BAR_WIDTH - SLIDER_BAR_WIDTH );
+	FLOAT fPercentOfBar = iPositionX / ( FLOAT)( BAR_WIDTH - SLIDER_BAR_WIDTH );
 
 	iNewValue = (INT32)( fPercentOfBar * ( iMaxAttribute - (FLOAT)iMinAttribute ) );
 
@@ -2235,4 +2232,4 @@ INT8 StartingLevelChosen()
 		return(iStartingLevel);
 	else
 		return(1);
-}
+}

Laptop/IMP Character Trait.cpp

@@ -483,7 +483,6 @@ void AssignCharacterTraitHelpText( UINT8 ubNumber )
 {
 	CHAR16	apStr[ 2000 ];
 
-	swprintf( apStr, L"" );
 	swprintf( apStr, gzIMPNewCharacterTraitsHelpTexts[ubNumber] );
 
 	// Set region help text

Laptop/IMP Voices.cpp

@@ -409,7 +409,7 @@ UINT32 PlayVoice( void )
 	char caVoiceSample[] = "Speech\\%03d_001.wav";
 
 	Assert((iSlot >= 0) && (iSlot <= 999));
-	sprintf(caVoiceSample, caVoiceSample, iSlot);
+	sprintf(caVoiceSample, "Speech\\%03d_001.wav", iSlot);
 
 	return( PlayJA2SampleFromFile( caVoiceSample, RATE_11025, MIDVOLUME, 1 , MIDDLEPAN ) );
 }

Laptop/email.cpp

@@ -5546,8 +5546,6 @@ BOOLEAN DisplayNumberOfPagesToThisEmail( INT32 iViewerY )
  // BltVideoObject( FRAME_BUFFER, hHandle, 0,VIEWER_X + INDENT_X_OFFSET, VIEWER_Y + iViewerY + INDENT_Y_OFFSET - 10, VO_BLT_SRCTRANSPARENCY,NULL );
  // DeleteVideoObjectFromIndex( uiMailIndent );
 
-	giNumberOfPagesToCurrentEmail = ( giNumberOfPagesToCurrentEmail );
-
 	// parse current page and max number of pages to email
 	swprintf( sString,L"%d / %d", ( giMessagePage + 1 ), ( giNumberOfPagesToCurrentEmail - 1 ) );
 

Laptop/finances.cpp

@@ -1465,7 +1465,7 @@ void ProcessTransactionString(STR16 pString, FinanceUnitPtr pFinance)
 			break;
 
 		case PAY_SPECK_FOR_MERC:
-			swprintf(pString, L"%s", pTransactionText[ PAY_SPECK_FOR_MERC ], gMercProfiles[pFinance->ubSecondCode].zName);
+			swprintf(pString, L"%s", pTransactionText[ PAY_SPECK_FOR_MERC ], gMercProfiles[pFinance->ubSecondCode].zName); // FIXME: param4 unused
 			break;
 
 		case MEDICAL_DEPOSIT:

Laptop/florist Gallery.cpp

@@ -401,7 +401,9 @@ void ChangingFloristGallerySubPage( UINT8 ubSubPageNumber )
 
 	//there are 3 flowers per page
 	if( ubSubPageNumber == FLOR_GALLERY_NUMBER_FLORAL_IMAGES )
-		ubSubPageNumber = 4;
+    {
+		ubSubPageNumber = 4;    Assert(false); // FIXME: out-of-bounds (FloristGallerySubPagesVisitedFlag[4])
+    }
 	else
 		ubSubPageNumber = ubSubPageNumber / 3;