- Fixed compilation error for JA2UB define (by anv)

- Added missing string to _FrenchText.cpp
- Renamed the "#if (defined JA2UB)" to "#ifdef JA2UB" so we are consistent through the code


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

Strategic/strategicmap.cpp

@@ -1487,7 +1487,7 @@ void BeginLoadScreen( void )
 
 	SetCurrentCursorFromDatabase( VIDEO_NO_CURSOR );
 
-#if (defined JA2UB) 
+#ifdef JA2UB
 	if( guiCurrentScreen == MAP_SCREEN && !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME) )
 #else
 //Ja25: No meanwhiles
@@ -1907,7 +1907,7 @@ void GetMapFileName(INT16 sMapX,INT16 sMapY, INT8 bSectorZ, STR8 bString, BOOLEA
 		}
 	}
 
-#if (defined JA2UB) 
+#ifdef JA2UB
 /* Ja25: No meanwhiles */
 #else
 	// If we are in a meanwhile...
@@ -2396,7 +2396,7 @@ void PrepareLoadedSector()
 	BOOLEAN fEnemyPresenceInThisSector = FALSE;
 	BOOLEAN fAddCivs = TRUE;
 	INT8 bMineIndex = -1;
-#if (defined JA2UB) 
+#ifdef JA2UB
 //Ja25 No meanwhiles
 #else
 	if( AreInMeanwhile( ) == FALSE )
@@ -2425,7 +2425,7 @@ void PrepareLoadedSector()
 	if( !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME ))
 	{
 
-#if (defined JA2UB) 
+#ifdef JA2UB
 //Ja25 No meanwhiles
 #else
 		if ( !AreReloadingFromMeanwhile( ) )
@@ -2550,7 +2550,7 @@ void PrepareLoadedSector()
 		{
 			AddProfilesNotUsingProfileInsertionData();
 		}
-#if (defined JA2UB) 
+#ifdef JA2UB
 //Ja25 No meanwhiles
 #else
 		if( !AreInMeanwhile() || GetMeanwhileID() == INTERROGATION )
@@ -2935,7 +2935,7 @@ BOOLEAN EnterSector( INT16 sSectorX, INT16 sSectorY , INT8 bSectorZ )
 		memset( &(gTacticalStatus.bNumFoughtInBattle), 0, MAXTEAMS ); 
 	}
 
-#if (defined JA2UB) 
+#ifdef JA2UB
 //Ja25 No meanwhiles
 #else
 	if( AreInMeanwhile() == FALSE )