Update to Master

2026-07-22 13:40:22 +02:00 · 2025-08-08 18:00:31 +03:00
parent b7bfd8a2eb 9ff8476c15
commit c62d767622
338 changed files with 110651 additions and 115875 deletions
@@ -186,7 +186,6 @@ jobs:
        merge-multiple: true

    - name: Checkout Repo
-      if: github.ref == 'refs/heads/master'
      uses: actions/checkout@v4
      with:
        path: source
@@ -201,6 +200,7 @@ jobs:
        git push --delete origin refs/tags/latest || true
        git tag latest
        git push --force origin refs/tags/latest
+        sleep 15 # make sure github can find the tag for gh release
        gh release create latest ../dist/* \
          --generate-notes \
          --title "Latest (unstable)" \
@@ -213,7 +213,6 @@ jobs:
      if: startsWith(github.ref, 'refs/tags/v')
      working-directory: source
      run: |
-        exit 0
        gh release upload "$GITHUB_REF_NAME" ../dist/* --clobber
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -54,12 +54,22 @@ jobs:
          sed -i "s|@Build@|${GAME_BUILD:0:255}|" Ja2/GameVersion.cpp
          cat Ja2/GameVersion.cpp

+      - name: Turn on link-time optimization?
+        if: fromJSON(inputs.assemble)
+        shell: bash
+        run: |
+          set -eux
+
+          echo "
+          LTO=ON
+          " >> $GITHUB_ENV
+
      - name: Prepare build properties
        shell: bash
        run: |
          set -eux
          
-          touch CMakeUserPresets.json
+          touch CMakePresets.json

          JA2Language=$(echo '${{ inputs.language }}' | tr '[:lower:]' '[:upper:]')
          JA2Application=$(echo '${{ matrix.application }}' | tr '[:lower:]' '[:upper:]')
@@ -77,7 +87,7 @@ jobs:
          arch: x86
      - name: Prepare build
        run: |
-          cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DLanguages="$Env:JA2Language" -DApplications="$Env:JA2Application"
+          cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DLanguages="$Env:JA2Language" -DApplications="$Env:JA2Application" -DLTO_OPTION="$Env:LTO"
      - name: Build
        run: |
          cmake --build build/ -- -v
@@ -6,6 +6,6 @@
 /.vs/
 /build/
 /out/
+/CMakePresets.json
 /CMakeSettings.json
-/CMakeUserPresets.json
 /lib/
@@ -9,10 +9,25 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)

+option(LTO_OPTION "Enable link-time optimization if supported by compiler" OFF)
+
+include(CheckIPOSupported)
+check_ipo_supported(RESULT LinkTimeOptimization OUTPUT IpoError LANGUAGES C CXX)
+if(LinkTimeOptimization AND LTO_OPTION)
+  message(STATUS "Configuring WITH link-time optimization")
+  set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+else()
+  message(STATUS "Configuring WITHOUT link-time optimization ${IpoError}")
+endif()
+
 option(ADDRESS_SANITIZER OFF)
 if(ADDRESS_SANITIZER)
-	message(STATUS "AddressSanitizer ENABLED for non-Release builds")
-	add_compile_options($<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>,-fsanitize=address,>)
+  message(STATUS "AddressSanitizer ENABLED for non-Release builds")
+  add_compile_options($<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>,-fsanitize=address,>)
+endif()
+
+if(MSVC)
+  add_compile_options("/wd4838")
 endif()

 # whether we are using MSBuild as a generator
@@ -23,7 +38,24 @@ set(usingMsBuild $<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

 add_compile_definitions(CINTERFACE XML_STATIC VFS_STATIC VFS_WITH_SLF VFS_WITH_7ZIP _CRT_SECURE_NO_DEPRECATE)
-include_directories(Ja2 "ext/VFS/include" Utils TileEngine TacticalAI "ModularizedTacticalAI/include" Tactical Strategic sgp "Ja2/Res" Lua Laptop Multiplayer Editor Console)
+include_directories(
+  "${CMAKE_SOURCE_DIR}/Ja2"
+  "${CMAKE_SOURCE_DIR}/ext/VFS/include"
+  "${CMAKE_SOURCE_DIR}/Utils"
+  "${CMAKE_SOURCE_DIR}/TileEngine"
+  "${CMAKE_SOURCE_DIR}/TacticalAI"
+  "${CMAKE_SOURCE_DIR}/ModularizedTacticalAI/include"
+  "${CMAKE_SOURCE_DIR}/Tactical"
+  "${CMAKE_SOURCE_DIR}/Strategic"
+  "${CMAKE_SOURCE_DIR}/sgp"
+  "${CMAKE_SOURCE_DIR}/Ja2/Res"
+  "${CMAKE_SOURCE_DIR}/Lua"
+  "${CMAKE_SOURCE_DIR}/Laptop"
+  "${CMAKE_SOURCE_DIR}/Multiplayer"
+  "${CMAKE_SOURCE_DIR}/Editor"
+  "${CMAKE_SOURCE_DIR}/Console"
+  "${CMAKE_SOURCE_DIR}/i18n/include"
+)

 # external libraries
 add_subdirectory("ext/libpng")
@@ -34,32 +66,46 @@ target_link_libraries(bfVFS PRIVATE 7z)
 # ja2export utility
 add_subdirectory("ext/export/src")

-# static libraries whose source files, header files or header files included
-# by header files do not rely on Applications or Languages preprocessor definitions,
-# and therefore only need to be compiled once. Good.
-add_subdirectory(Lua)
+# static libraries whose translation units don't rely on Application preprocessor definitions.
+add_subdirectory(lua)
 add_subdirectory(Multiplayer)
+add_subdirectory(wine)

-# static libraries whose source files, header files or header files included
-# by header files rely on Application and Language preprocessor definitions, and
-# therefore need to be compiled multiple times. Very Bad.
+set(Ja2_Libraries
+"${CMAKE_SOURCE_DIR}/binkw32.lib"
+"${CMAKE_SOURCE_DIR}/libexpatMT.lib"
+"${CMAKE_SOURCE_DIR}/lua51.lib"
+"${CMAKE_SOURCE_DIR}/lua51.vc9.lib"
+"${CMAKE_SOURCE_DIR}/SMACKW32.LIB"
+"Dbghelp.lib"
+"Winmm.lib"
+"ws2_32.lib"
+bfVFS
+Lua
+Multiplayer
+wine
+)
+
+# static libraries whose translation units rely on Application preprocessor definitions.
 set(Ja2_Libs
-TileEngine
-TacticalAI
-Utils
-Strategic
-sgp
-Laptop
-Editor
-Console
-Tactical
-ModularizedTacticalAI
+  Console
+  Editor
+  Ja2
+  Laptop
+  ModularizedTacticalAI
+  sgp
+  Strategic
+  Tactical
+  TacticalAI
+  TileEngine
+  Utils
 )
 foreach(lib IN LISTS Ja2_Libs)
-	add_subdirectory(${lib})
+  add_subdirectory(${lib})
 endforeach()

-add_subdirectory(Ja2)
+# language library relies on Application _and_ Language preprocessor definition. very bad.
+add_subdirectory(i18n)

 # simple function to validate Languages and Application choices
 include(cmake/ValidateOptions.cmake)
@@ -74,47 +120,50 @@ ValidateOptions("${ValidApplications}" "Applications" "${Applications}" "Applica
 # preprocessor definitions for Debug build, per the legacy MSBuild
 set(debugFlags $<IF:$<CONFIG:Debug>,JA2BETAVERSION;JA2TESTVERSION;DEBUG_ATTACKBUSY,>)

-# Due to widespread preprocessor definition abuse in the codebase, practically
-# every library-language-executable combination is its own compilation target
-# TODO: refactor preprocessor usage onto, ideally, a single translation unit
-foreach(lang IN LISTS LangTargets)
-	foreach(exe IN LISTS ApplicationTargets)
-		set(Executable ${exe}_${lang})
+foreach(app IN LISTS ApplicationTargets)
+  set(isEditor $<STREQUAL:${app},JA2MAPEDITOR>)
+  set(isUb $<STREQUAL:${app},JA2UB>)
+  set(isUbEditor $<STREQUAL:${app},JA2UBMAPEDITOR>)
+  set(compilationFlags
+    $<IF:${isEditor},JA2EDITOR;JA2BETAVERSION,>
+    $<IF:${isUb},JA2UB;JA2UBMAPS,>
+    $<IF:${isUbEditor},JA2UB;JA2UBMAPS;JA2EDITOR;JA2BETAVERSION,>
+  )

-		# executable for an application/language combination, e.g. JA2_ENGLISH.exe
-		add_executable(${Executable} WIN32)
-		target_sources(${Executable} PRIVATE ${Ja2Src})
+  foreach(lib IN LISTS Ja2_Libs)
+    # library for an application, e.g. JA2UB_sgp
+    set(game_library ${app}_${lib})
+    add_library(${game_library})
+    target_sources(${game_library} PRIVATE ${${lib}Src})
+    target_compile_definitions(${game_library} PRIVATE ${compilationFlags} ${debugFlags})
+  endforeach()

-		# Good libraries have already been built, can be simply linked here
-		target_link_libraries(${Executable} PRIVATE ${Ja2_Libraries} $<IF:${usingMsBuild},legacy_stdio_definitions.lib,>)
-		target_link_options(${Executable} PRIVATE $<IF:${usingMsBuild},/SAFESEH:NO,>)
+  foreach(lang IN LISTS LangTargets)
+    # executable for an application/language combination, e.g. JA2_ENGLISH.exe
+    set(exe ${app}_${lang})
+    add_executable(${exe} WIN32
+      sgp/sgp.cpp
+      Ja2/Res/ja2.rc
+    )
+    target_link_libraries(${exe} PRIVATE ${Ja2_Libraries} $<IF:${usingMsBuild},legacy_stdio_definitions.lib,>)
+    target_link_options(${exe} PRIVATE $<IF:${usingMsBuild},/SAFESEH:NO,>)
+    target_compile_definitions(${exe} PRIVATE ${compilationFlags} ${debugFlags})

-		# for each app/lang combination, the Very Bad libraries need to be built,
-		# with the appropriate preprocessor definitions
-		foreach(lib IN LISTS Ja2_Libs)
-			# syntactic sugar to hopefully make this more readable
-			set(VeryBadLib ${Executable}_${lib})
-			set(isEditor $<STREQUAL:${exe},JA2MAPEDITOR>)
-			set(isUb $<STREQUAL:${exe},JA2UB>)
-			set(isUbEditor $<STREQUAL:${exe},JA2UBMAPEDITOR>)
+    # language library for an application, e.g. JA2MAPEDITOR_ENGLISH_i18n
+    set(language_library ${exe}_i18n)
+    add_library(${language_library})
+    target_sources(${language_library} PRIVATE ${i18nSrc})
+    target_compile_definitions(${language_library} PRIVATE ${compilationFlags} ${debugFlags} ${lang})
+    target_link_libraries(${exe} PRIVATE ${language_library})

-			# static library for an app/lang combination, e.g. JA2_ENGLISH_sgp.lib
-			add_library(${VeryBadLib})
-			target_sources(${VeryBadLib} PRIVATE ${${lib}Src})
+    # go through all game libraries again and link them to the app/language executable
+    foreach(lib IN LISTS Ja2_Libs)
+      target_link_libraries(${exe} PRIVATE ${app}_${lib})
+    endforeach()
+  endforeach()

-			target_compile_definitions(${VeryBadLib} PUBLIC
-				$<IF:${isEditor},JA2EDITOR;JA2BETAVERSION,>
-				$<IF:${isUb},JA2UB;JA2UBMAPS,>
-				$<IF:${isUbEditor},JA2UB;JA2UBMAPS;JA2EDITOR;JA2BETAVERSION,>
-				${debugFlags}
-				${lang}
-			)
-			target_link_libraries(${Executable} PUBLIC ${VeryBadLib})
-		endforeach()
-
-		# for sgp only
-		target_link_libraries(${Executable}_sgp PRIVATE "ddraw.lib" "${PROJECT_SOURCE_DIR}/fmodvc.lib")
-		target_link_libraries(${Executable}_sgp PUBLIC libpng)
-		target_compile_definitions(${Executable}_sgp PRIVATE NO_ZLIB_COMPRESSION)
-	endforeach()
+  # for SGP only
+  target_link_libraries(${app}_sgp PRIVATE "ddraw.lib" "${PROJECT_SOURCE_DIR}/fmodvc.lib")
+  target_link_libraries(${app}_sgp PRIVATE libpng)
+  target_compile_definitions(${app}_sgp PRIVATE NO_ZLIB_COMPRESSION)
 endforeach()
@@ -78,4 +78,4 @@ public:
 /////////////////////////////////////////////////////////////////////////////


-#endif // _COMBSTROUT_H_
+#endif // _COMBSTROUT_H_
@@ -106,4 +106,4 @@ public:
 /////////////////////////////////////////////////////////////////////////////


-#endif // _COMVARIANTOUT_H_
+#endif // _COMVARIANTOUT_H_
@@ -40,4 +40,4 @@ extern BOOLEAN gfCurrentSelectionWithRightButton;

 #endif

-#endif
+#endif
@@ -14,4 +14,4 @@ void ShowExitGrids();
 void HideExitGrids();

 #endif
-#endif
+#endif
@@ -7,4 +7,4 @@
 void CreateEditorTaskbarInternal();

 #endif
-#endif
+#endif
@@ -67,4 +67,4 @@ extern UINT32 guiMercTempBuffer;
 extern INT32	giEditMercImage[2];

 #endif
-#endif
+#endif
@@ -173,7 +173,15 @@ void LoadSaveScreenEntry()
 		vfs::CVirtualProfile* prof = it.value();
 		memset(&FileInfo, 0, sizeof(GETFILESTRUCT));
 		strcpy(FileInfo.zFileName, "< ");
-		strcat(FileInfo.zFileName, prof->cName.utf8().c_str());
+		// Cut filename off if it's too long for the buffer
+		if (strlen(prof->cName.utf8().c_str()) > FILENAME_BUFLEN-4)
+		{
+			strncpy(FileInfo.zFileName+1, prof->cName.utf8().c_str(), FILENAME_BUFLEN-4);
+		}
+		else
+		{
+			strcat(FileInfo.zFileName, prof->cName.utf8().c_str());
+		}
 		strcat(FileInfo.zFileName, " >");
 		FileInfo.zFileName[FILENAME_BUFLEN] = 0;
 		FileInfo.uiFileAttribs = FILE_IS_DIRECTORY;
@@ -1,7 +1,7 @@
 #include "BuildDefines.h"
 #include "Fileman.h"

-#define FILENAME_BUFLEN (20 + 4 + 1)//dnl ch39 190909 +4 is for ".dat", +1 is for '\0' //dnl ch81 021213
+#define FILENAME_BUFLEN (30 + 4 + 1)//dnl ch39 190909 +4 is for ".dat", +1 is for '\0' //dnl ch81 021213

 #ifdef JA2EDITOR

@@ -403,14 +403,42 @@ void PlaceRoadMacroAtGridNo( INT32 iMapIndex, INT32 iMacroID )
 	while( gRoadMacros[ i ].sMacroID == iMacroID )
 	{
 		// need to recalc MACROSTRUCT::sOffset 'cause it sticked to 160*160 old map size
-		INT32 sdX = gRoadMacros[ i ].sOffset % OLD_WORLD_COLS;
-		INT32 sdY = gRoadMacros[ i ].sOffset / OLD_WORLD_COLS;
-		INT32 sOffset = sdY*WORLD_COLS + sdX;
+		INT32 sdY = gRoadMacros[ i ].sOffset / (OLD_WORLD_COLS);
+		INT32 sdX = gRoadMacros[ i ].sOffset -  (sdY*OLD_WORLD_COLS);
+
+		// Take into account the dfference between old and new row size for tiles that are shifted
+		// by one row due to X offset
+		// For example:
+		// {RBR, 159},
+		//{ RBR, -159 },
+		// 
+		// Offsets for 160x160 map
+		// []		[]		[-159]
+		// []		[0]		[]
+		// [159]	[]		[]
 		//
-		AddToUndoList( iMapIndex + sOffset );
-		RemoveAllObjectsOfTypeRange( iMapIndex + sOffset, ROADPIECES, ROADPIECES );//dnl this was but is very wrong and leading to stacking tilesets, RemoveAllObjectsOfTypeRange( i, ROADPIECES, ROADPIECES );
+		// Converted to 200x200 map
+		// []		[]		[-199]
+		// []		[0]		[]
+		// [199]	[]		[]
+		// 
+		// Without this the original conversion would output 159 and -159 for X coordinate
+		if (sdX < -OLD_WORLD_COLS/2)
+		{
+			sdX -= WORLD_COLS - OLD_WORLD_COLS;
+		}
+		else if (sdX > OLD_WORLD_COLS / 2)
+		{
+			sdX += WORLD_COLS - OLD_WORLD_COLS;
+		}
+
+		INT32 sOffset = sdY*WORLD_COLS + sdX;
+		INT32 newGridNo = iMapIndex + sOffset;
+
+		AddToUndoList( newGridNo );
+		RemoveAllObjectsOfTypeRange( newGridNo, ROADPIECES, ROADPIECES );//dnl this was but is very wrong and leading to stacking tilesets, RemoveAllObjectsOfTypeRange( i, ROADPIECES, ROADPIECES );
 		GetTileIndexFromTypeSubIndex( ROADPIECES, (UINT16)(i+1) , &usTileIndex );
-		AddObjectToHead( iMapIndex + sOffset, usTileIndex );
+		AddObjectToHead( newGridNo, usTileIndex );
 		i++;
 	}
 }
@@ -61,4 +61,4 @@ void InitializeRoadMacros();

 #endif

-#endif
+#endif
@@ -35,4 +35,4 @@ void GetSectorFromFileName(STR16 szFileName, INT16& sSectorX, INT16& sSectorY, I
 void ResetCustomFileSectorSummary(void);//dnl ch30 150909

 #endif
-#endif
+#endif
@@ -62,4 +62,4 @@ UINT16 GetHorizontalWallClass( INT32 iMapIndex );
 BOOLEAN ValidDecalPlacement( INT32 iMapIndex );

 #endif
-#endif
+#endif
@@ -1,4 +1,4 @@
-	#include "builddefines.h"
+#include "builddefines.h"

 #ifdef JA2EDITOR

@@ -1069,10 +1069,7 @@ void ShowCurrentDrawingMode( void )
 	// Set the color for the window's border. Blueish color = Normal, Red = Fake lighting is turned on
 	usFillColor = GenericButtonFillColors[0];
 	pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES );
-	if(gbPixelDepth==16)
-		RectangleDraw( FALSE, iScreenWidthOffset + 0, 2 * iScreenHeightOffset + 400, iScreenWidthOffset + 99, 2 * iScreenHeightOffset + 458, usFillColor, pDestBuf );
-	else if(gbPixelDepth==8)
-		RectangleDraw8( FALSE, iScreenWidthOffset + 0, 2 * iScreenHeightOffset + 400, iScreenWidthOffset + 99, 2 * iScreenHeightOffset + 458, usFillColor, pDestBuf );
+	RectangleDraw( FALSE, iScreenWidthOffset + 0, 2 * iScreenHeightOffset + 400, iScreenWidthOffset + 99, 2 * iScreenHeightOffset + 458, usFillColor, pDestBuf );

 	UnLockVideoSurface( FRAME_BUFFER );

@@ -2954,6 +2951,23 @@ UINT32 WaitForSelectionWindowResponse( void )
 		}
 	}

+	// Mousewheel scroll
+	if (_WheelValue > 0)
+	{
+		while (_WheelValue--)
+		{
+			ScrollSelWinUp();
+		}
+	}
+	else
+	{
+		while (_WheelValue++)
+		{
+			ScrollSelWinDown();
+		}
+	}
+	_WheelValue = 0;
+
 	if ( DoWindowSelection( ) )
 	{
 		fSelectionWindow = FALSE;
@@ -29,6 +29,16 @@ extern BOOLEAN fDontUseRandom;

 extern UINT16 GenericButtonFillColors[40];

+struct SelectionWindow
+{
+	SGPRect window;
+	SGPPoint displayAreaStart; // Area where selectable items are drawn
+	SGPPoint displayAreaEnd;
+	SGPPoint spacing; // For displayed items
+};
+
+SelectionWindow gSelection;
+
 BOOLEAN gfRenderSquareArea = FALSE;
 INT16 iStartClickX,iStartClickY;
 INT16 iEndClickX,iEndClickY;
@@ -40,7 +50,6 @@ INT32 iSelectWin,iCancelWin,iScrollUp,iScrollDown,iOkWin;
 BOOLEAN fAllDone=FALSE;
 BOOLEAN fButtonsPresent=FALSE;

-SGPPoint SelWinSpacing, SelWinStartPoint, SelWinEndPoint;

 //These definitions help define the start and end of the various wall indices.
 //This needs to be maintained if the walls change.
@@ -172,6 +181,30 @@ UINT16 SelWinHilightFillColor = 0x23BA;		//blue, formerly 0x000d a kind of mediu
 //
 void CreateJA2SelectionWindow( INT16 sWhat )
 {
+	auto selectWinWidth = 600;
+	const auto selectWinHeight = SCREEN_HEIGHT - 120; // From top edge to taskbar
+	if (iResolution > _800x600)
+	{
+		selectWinWidth = 900;
+	}
+	auto tlX = 0;
+	auto tlY = 0;
+	auto brX = tlX + selectWinWidth;
+	auto brY = tlY + selectWinHeight;
+	gSelection.window.iLeft = tlX;
+	gSelection.window.iTop = tlY;
+	gSelection.window.iRight = brX;
+	gSelection.window.iBottom = brY;
+	gSelection.displayAreaStart.iX = tlX + 1;
+	gSelection.displayAreaStart.iY = tlY + 15;
+	gSelection.displayAreaEnd.iX = brX - 1;
+	gSelection.displayAreaEnd.iY= brY - 1;
+	gSelection.spacing.iX = 2;
+	gSelection.spacing.iY = 2;
+
+	iTopWinCutOff = gSelection.displayAreaStart.iY;
+	iBotWinCutOff = gSelection.displayAreaEnd.iY;
+
 	DisplaySpec *pDSpec;
 	UINT16 usNSpecs;

@@ -185,32 +218,33 @@ void CreateJA2SelectionWindow( INT16 sWhat )
 	iButtonIcons[ SEL_WIN_DOWN_ICON ]	= LoadGenericButtonIcon( "EDITOR//lgDownArrow.sti" );
 	iButtonIcons[ SEL_WIN_OK_ICON ]		= LoadGenericButtonIcon( "EDITOR//checkmark.sti" );

-	iSelectWin = CreateHotSpot(0, 0, 600, 360, MSYS_PRIORITY_HIGH,
+
+	iSelectWin = CreateHotSpot(0, 0, selectWinWidth, selectWinHeight, MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, SelWinClkCallback);

 	iOkWin = CreateIconButton((INT16)iButtonIcons[SEL_WIN_OK_ICON], 0,
-														BUTTON_USE_DEFAULT, 600, 0,
+														BUTTON_USE_DEFAULT, selectWinWidth, 0,
 														40, 40, BUTTON_TOGGLE,
 														MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, OkClkCallback);
 	SetButtonFastHelpText(iOkWin,pDisplaySelectionWindowButtonText[0]);

 	iCancelWin = CreateIconButton((INT16)iButtonIcons[SEL_WIN_CANCEL_ICON], 0,
-														BUTTON_USE_DEFAULT, 600, 40,
+														BUTTON_USE_DEFAULT, selectWinWidth, 40,
 														40, 40, BUTTON_TOGGLE,
 														MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, CnclClkCallback);
 	SetButtonFastHelpText(iCancelWin,pDisplaySelectionWindowButtonText[1]);

 	iScrollUp = CreateIconButton((INT16)iButtonIcons[SEL_WIN_UP_ICON], 0,
-														BUTTON_USE_DEFAULT, 600, 80,
+														BUTTON_USE_DEFAULT, selectWinWidth, 80,
 														40, 160, BUTTON_NO_TOGGLE,
 														MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, UpClkCallback);
 	SetButtonFastHelpText(iScrollUp,pDisplaySelectionWindowButtonText[2]);

 	iScrollDown = CreateIconButton((INT16)iButtonIcons[SEL_WIN_DOWN_ICON], 0,
-														BUTTON_USE_DEFAULT, 600, 240,
+														BUTTON_USE_DEFAULT, selectWinWidth, 240,
 														40, 160, BUTTON_NO_TOGGLE,
 														MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, DwnClkCallback);
@@ -218,18 +252,6 @@ void CreateJA2SelectionWindow( INT16 sWhat )

 	fButtonsPresent = TRUE;

-	SelWinSpacing.iX = 2;
-	SelWinSpacing.iY = 2;
-
-	SelWinStartPoint.iX = 1;
-	SelWinStartPoint.iY = 15;
-
-	iTopWinCutOff = 15;
-
-	SelWinEndPoint.iX = 599;
-	SelWinEndPoint.iY = 359;
-
-	iBotWinCutOff = 359;

 	switch( sWhat )
 	{
@@ -347,8 +369,8 @@ void CreateJA2SelectionWindow( INT16 sWhat )
 			return;
 	}

-	BuildDisplayWindow( pDSpec, usNSpecs, &pDispList, &SelWinStartPoint, &SelWinEndPoint,
-										&SelWinSpacing, CLEAR_BACKGROUND);
+	BuildDisplayWindow( pDSpec, usNSpecs, &pDispList, &gSelection.displayAreaStart , &gSelection.displayAreaEnd,
+										&gSelection.spacing, CLEAR_BACKGROUND);
 }


@@ -849,12 +871,14 @@ void RenderSelectionWindow( void )
 		return;

 	ColorFillVideoSurfaceArea(FRAME_BUFFER,
-													0, 0, 600, 400,
-													GenericButtonFillColors[0]);
+		gSelection.window.iLeft, gSelection.window.iTop, gSelection.window.iRight, gSelection.window.iBottom,
+		GenericButtonFillColors[0]
+	);
 	DrawSelections( );
 	MarkButtonsDirty();
 	RenderButtons( );

+	// Draw selection rectangle
 	if ( gfRenderSquareArea )
 	{
 		button = ButtonList[iSelectWin];
@@ -862,7 +886,7 @@ void RenderSelectionWindow( void )
 			return;

 		if ( (abs( iStartClickX - button->Area.MouseXPos ) > 9) ||
-			(abs( iStartClickY - (button->Area.MouseYPos + iTopWinCutOff - (INT16)SelWinStartPoint.iY)) > 9) )
+			(abs( iStartClickY - (button->Area.MouseYPos + iTopWinCutOff - (INT16)gSelection.displayAreaStart.iY)) > 9) )
 		{
 //			iSX = (INT32)iStartClickX;
 //			iEX = (INT32)button->Area.MouseXPos;
@@ -870,7 +894,7 @@ void RenderSelectionWindow( void )
 //			iEY = (INT32)(button->Area.MouseYPos + iTopWinCutOff - (INT16)SelWinStartPoint.iY);

 			iSX = iStartClickX;
-			iSY = iStartClickY - iTopWinCutOff + SelWinStartPoint.iY;
+			iSY = iStartClickY - iTopWinCutOff + gSelection.displayAreaStart.iY;
 			iEX = gusMouseXPos;
 			iEY = gusMouseYPos;

@@ -889,10 +913,10 @@ void RenderSelectionWindow( void )
 				iEY ^= iSY;
 			}

-			iEX = min( iEX, 600 );
-			iSY = max( SelWinStartPoint.iY, iSY );
-			iEY = min( 359, iEY );
-			iEY = max( SelWinStartPoint.iY, iEY );
+			iEX = min( gSelection.displayAreaEnd.iX, iEX);
+			iSY = max( gSelection.displayAreaStart.iY, iSY );
+			iEY = min( gSelection.displayAreaEnd.iY, iEY );
+			iEY = max( gSelection.displayAreaStart.iY, iEY );

 			usFillColor = Get16BPPColor(FROMRGB(255, usFillGreen, 0));
 			usFillGreen += usDir;
@@ -928,7 +952,7 @@ void SelWinClkCallback( GUI_BUTTON *button, INT32 reason )
 		return;

 	iClickX = button->Area.MouseXPos;
-	iClickY = button->Area.MouseYPos + iTopWinCutOff - (INT16)SelWinStartPoint.iY;
+	iClickY = button->Area.MouseYPos + iTopWinCutOff - (INT16)gSelection.displayAreaStart.iY;

 	if (reason & MSYS_CALLBACK_REASON_LBUTTON_DWN)
 	{
@@ -1035,9 +1059,9 @@ void DisplaySelectionWindowGraphicalInformation()
 	UINT16 y;
 	//Determine if there is a valid picture at cursor position.
 	//iRelX = gusMouseXPos;
-	//iRelY = gusMouseYPos + iTopWinCutOff - (INT16)SelWinStartPoint.iY;
+	//iRelY = gusMouseYPos + iTopWinCutOff - (INT16)gSelection.displayAreaStart.iY;

-	y = gusMouseYPos + iTopWinCutOff - (UINT16)SelWinStartPoint.iY;
+	y = gusMouseYPos + iTopWinCutOff - (UINT16)gSelection.displayAreaStart.iY;
 	pNode = pDispList;
 	fDone = FALSE;
 	while( (pNode != NULL) && !fDone )
@@ -1470,10 +1494,10 @@ void DrawSelections( void )
 {
 	SGPRect					ClipRect, NewRect;

-	NewRect.iLeft = SelWinStartPoint.iX;
-	NewRect.iTop = SelWinStartPoint.iY;
-	NewRect.iRight = SelWinEndPoint.iX;
-	NewRect.iBottom = SelWinEndPoint.iY;
+	NewRect.iLeft = gSelection.displayAreaStart.iX;
+	NewRect.iTop = gSelection.displayAreaStart.iY;
+	NewRect.iRight = gSelection.displayAreaEnd.iX;
+	NewRect.iBottom = gSelection.displayAreaEnd.iY;

 	GetClippingRect(&ClipRect);
 	SetClippingRect(&NewRect);
@@ -1483,7 +1507,7 @@ void DrawSelections( void )
 	SetObjectShade( gvoLargeFontType1, 0 );
 //	SetObjectShade( gvoLargeFont, 0 );

-	DisplayWindowFunc( pDispList, iTopWinCutOff, iBotWinCutOff, &SelWinStartPoint, CLEAR_BACKGROUND );
+	DisplayWindowFunc( pDispList, iTopWinCutOff, iBotWinCutOff, &gSelection.displayAreaStart, CLEAR_BACKGROUND );

 	SetObjectShade( gvoLargeFontType1, 4 );

@@ -14,7 +14,6 @@ set(Ja2Src
 "${CMAKE_CURRENT_SOURCE_DIR}/JA2 Splash.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Ja25Update.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/jascreens.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/Language Defines.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Loading Screen.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/MainMenuScreen.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/MessageBoxScreen.cpp"
@@ -28,26 +27,11 @@ set(Ja2Src
 "${CMAKE_CURRENT_SOURCE_DIR}/profiler.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/SaveLoadGame.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/SaveLoadScreen.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/SCREENS.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Screens.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Sys Globals.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/TimeLogging.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/ub_config.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/XML_DifficultySettings.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/XML_IntroFiles.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/XML_Layout_MainMenu.cpp"
-${CMAKE_CURRENT_SOURCE_DIR}/Res/ja2.rc
-PARENT_SCOPE)
-
-set(Ja2_Libraries
-"${CMAKE_SOURCE_DIR}/libexpatMT.lib"
-"Dbghelp.lib"
-Lua
-"${CMAKE_SOURCE_DIR}/lua51.lib"
-"${CMAKE_SOURCE_DIR}/lua51.vc9.lib"
-"Winmm.lib"
-"${CMAKE_SOURCE_DIR}/SMACKW32.LIB"
-"${CMAKE_SOURCE_DIR}/binkw32.lib"
-bfVFS
-"ws2_32.lib"
-Multiplayer
 PARENT_SCOPE)
@@ -1,7 +1,6 @@
 #ifndef _CHEATS__H_
 #define _CHEATS__H_

-#include "Language Defines.h"

 extern UINT8 gubCheatLevel;

@@ -22,4 +21,4 @@ extern UINT8 gubCheatLevel;
 #define						RESET_CHEAT_LEVEL( )				( gubCheatLevel = 0 )
 #define						ACTIVATE_CHEAT_LEVEL()				( gubCheatLevel = 6 )

-#endif
+#endif
@@ -1,6 +1,5 @@
 	#include "Types.h"
 	#include "Credits.h"
-	#include "Language Defines.h"
 	#include "vsurface.h"
 	#include "mousesystem.h"
 	#include "Text.h"
@@ -681,13 +681,9 @@ BOOLEAN UpdateSaveBufferWithBackbuffer(void)
 	pSrcBuf = LockVideoSurface(FRAME_BUFFER, &uiSrcPitchBYTES);
 	pDestBuf = LockVideoSurface(guiSAVEBUFFER, &uiDestPitchBYTES);

-	if(gbPixelDepth==16)
-	{
-		// BLIT HERE
-		Blt16BPPTo16BPP((UINT16 *)pDestBuf, uiDestPitchBYTES,
-					(UINT16 *)pSrcBuf, uiSrcPitchBYTES,
-					0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
-	}
+	Blt16BPPTo16BPP((UINT16 *)pDestBuf, uiDestPitchBYTES,
+				(UINT16 *)pSrcBuf, uiSrcPitchBYTES,
+				0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );

 	UnLockVideoSurface(FRAME_BUFFER);
 	UnLockVideoSurface(guiSAVEBUFFER);
@@ -37,4 +37,4 @@ BOOLEAN HandleFadeInCallback( );
 void FadeInNextFrame( );
 void FadeOutNextFrame( );

-#endif
+#endif
@@ -26,7 +26,6 @@
 #include	"Text.h"
 #include	"Interface Control.h"
 #include	"Message.h"
-#include	"Language Defines.h"
 #include	"Multi Language Graphic Utils.h"
 #include	"Map Information.h"
 #include	"Sys Globals.h"
@@ -1830,7 +1830,7 @@ void BtnGIOSquadSizeSelectionRightCallback( GUI_BUTTON *btn,INT32 reason )
 	if( reason & MSYS_CALLBACK_REASON_LBUTTON_REPEAT )
 	{
 		UINT8 maxSquadSize = GIO_SQUAD_SIZE_10;
-		if (iResolution >= _800x600 && iResolution < _1024x768)
+		if (iResolution >= _800x600 && iResolution < _1280x720)
 			maxSquadSize = GIO_SQUAD_SIZE_8;

 		if ( iCurrentSquadSize < maxSquadSize )
@@ -1850,7 +1850,7 @@ void BtnGIOSquadSizeSelectionRightCallback( GUI_BUTTON *btn,INT32 reason )
 		btn->uiFlags|=(BUTTON_CLICKED_ON);

 		UINT8 maxSquadSize = GIO_SQUAD_SIZE_10;
-		if (iResolution >= _800x600 && iResolution < _1024x768)
+		if (iResolution >= _800x600 && iResolution < _1280x720 )
 			maxSquadSize = GIO_SQUAD_SIZE_8;

 		if ( iCurrentSquadSize < maxSquadSize )
@@ -10,7 +10,6 @@
 	#include	"GameVersion.h"
 	#include	"LibraryDataBase.h"
 	#include	"Debug.h"
-	#include	"Language Defines.h"
 	#include "HelpScreen.h"
 	#include "INIReader.h"
 	#include "Shade Table Util.h"
@@ -45,7 +44,7 @@
 #include <vfs/Core/vfs_file_raii.h>
 #include <vfs/Core/File/vfs_file.h>

-#define				GAME_SETTINGS_FILE				"Ja2_Settings.INI"
+#define				GAME_SETTINGS_FILE				"Ja2_Settings.ini"

 #define				FEATURE_FLAGS_FILE				"Ja2_Features.ini"

@@ -1999,6 +1998,7 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.fFoodDecayInSectors							= iniReader.ReadBoolean("Tactical Food Settings", "FOOD_DECAY_IN_SECTORS", TRUE);
 	gGameExternalOptions.sFoodDecayModificator							= iniReader.ReadFloat("Tactical Food Settings", "FOOD_DECAY_MODIFICATOR",			1.0f, 0.1f, 10.0f);
 	gGameExternalOptions.fFoodEatingSounds								= iniReader.ReadBoolean("Tactical Food Settings", "FOOD_EATING_SOUNDS", TRUE);
+	gGameExternalOptions.fAlwaysFood                                    = iniReader.ReadBoolean("Tactical Food Settings", "ALWAYS_FOOD", FALSE);
 	
 	//################# Disease Settings ##################
 	gGameExternalOptions.fDisease										= iniReader.ReadBoolean( "Disease Settings", "DISEASE", FALSE );
@@ -3794,7 +3794,7 @@ void LoadCTHConstants()
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_WIS						= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_WIS",1.0, 0.0, 100.0);
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_AGI						= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_AGI",1.0, 0.0, 100.0);
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_EXP_LEVEL					= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_EXP_LEVEL",2.0, 0.0, 100.0);
-	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_AUTO_WEAPONS_DIVISOR		= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_AUTO_WEAPONS_DIVISOR",2.0, 1.0, 100.0);
+	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_AUTO_WEAPONS_DIVISOR		= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_AUTO_WEAPONS_DIVISOR",2.0, 1.0, 100.0);
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_TRACER_BONUS				= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_TRACER_BONUS",10.0, -1000.0, 1000.0);
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_ANTICIPATION				= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_ANTICIPATION",25.0, -1000.0, 1000.0);
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_COMPENSATION				= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_COMPENSATION",2.0, 0.0, 5.0);
@@ -506,6 +506,7 @@ typedef struct
 	FLOAT	sFoodDecayModificator;
 	
 	BOOLEAN fFoodEatingSounds;
+	BOOLEAN fAlwaysFood;

 	// Flugente: disease settings
 	BOOLEAN fDisease;
@@ -23,7 +23,8 @@ extern	CHAR16		zBuildInformation[256];
 //		Keeps track of the saved game version.	Increment the saved game version whenever 
 //	you will invalidate the saved game file

-#define			INCREASED_TEAMSIZES								185 // Asdow: SOLDIERTYPE ubID changed from UINT8 -> UINT16
+#define			INCREASED_TEAMSIZES								186 // Asdow: SOLDIERTYPE ubID changed from UINT8 -> UINT16
+#define			MERC_PROFILE_INSERTION_DATA					    185 // Bigmap support for AddProfileToMap function
 #define			GROWTH_MODIFIERS								184
 #define			REBELCOMMAND									183
 #define			DRAGSTRUCTURE									182 // Flugente: we can drag structures behind us
@@ -72,4 +72,4 @@ void NewScreenSoResetHelpScreen( );
 INT8 HelpScreenDetermineWhichMapScreenHelpToShow();


-#endif
+#endif
@@ -35,7 +35,6 @@
 	#include "tile cache.h"
 	#include "strategicmap.h"
 	#include "Map Information.h"
-	#include "laptop.h"
 	#include "Shade Table Util.h"
 	#include "Exit Grids.h"
 	#include "Summary Info.h"
@@ -51,6 +50,7 @@
 	#include "Multilingual Text Code Generator.h"
 	#include "editscreen.h"
 	#include "Arms Dealer Init.h"
+#include "Map Screen Interface Bottom.h"
 #include "MPXmlTeams.hpp"
 #include "Strategic Mines LUA.h"
 #include "UndergroundInit.h"
@@ -76,7 +76,8 @@
 #include "AimArchives.h"
 #include "connect.h"
 #include "DynamicDialogueWidget.h"		// added by Flugente for InitMyBoxes()
-#include "Animation Data.h"				// added by Flugente
+
+#include <language.hpp>

 extern INT16 APBPConstants[TOTAL_APBP_VALUES] = {0};
 extern INT16 gubMaxActionPoints[TOTALBODYTYPES];//MAXBODYTYPES = 28... JUST GETTING IT TO WORK NOW.  GOTTHARD 7/2/08
@@ -134,34 +135,6 @@ static void AddLanguagePrefix(STR fileName, const STR language)
 	memmove( fileComponent, language, strlen( language) );
 }

-static const STR GetLanguagePrefix()
-{
-#ifdef ENGLISH
-	return "";
-#endif
-#ifdef GERMAN 
-	return GERMAN_PREFIX;
-#endif
-#ifdef RUSSIAN 
-	return RUSSIAN_PREFIX;
-#endif
-#ifdef DUTCH 
-	return DUTCH_PREFIX;
-#endif
-#ifdef POLISH 
-	return POLISH_PREFIX;
-#endif
-#ifdef FRENCH 
-	return FRENCH_PREFIX;
-#endif
-#ifdef ITALIAN 
-	return ITALIAN_PREFIX;
-#endif
-#ifdef CHINESE
-	return CHINESE_PREFIX;
-#endif
-}
-
 static void AddLanguagePrefix(STR fileName)
 {
 	AddLanguagePrefix( fileName, GetLanguagePrefix());
@@ -254,7 +227,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat(fileName, AMMOFILENAME);

 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 		
 	if ( FileExists(fileName) )
@@ -268,9 +241,9 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		strcat(fileName, AMMOFILENAME);
 		SGP_THROW_IFFALSE(ReadInAmmoStats(fileName),AMMOFILENAME);
 	}
-#else	
+} else {
 	SGP_THROW_IFFALSE(ReadInAmmoStats(fileName),AMMOFILENAME);
-#endif
+}

 	// Lesh: added this, begin
 	strcpy(fileName, directoryName);
@@ -294,14 +267,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 // the uiIndex (for reference), szItemName, szLongItemName, szItemDesc, szBRName, and szBRDesc tags


-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInItemStats(fileName,TRUE), fileName);
 	}
-#endif
+}

 	//if(!WriteItemStats())
 	//	return FALSE;
@@ -366,14 +339,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat( fileName, DISEASEFILENAME );
 	SGP_THROW_IFFALSE( ReadInDiseaseStats( fileName,FALSE ), DISEASEFILENAME );

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInDiseaseStats(fileName,TRUE), DISEASEFILENAME);
 	}
-#endif
+}

 	strcpy(fileName, directoryName);
 	strcat(fileName, STRUCTUREDECONSTRUCTFILENAME);
@@ -411,14 +384,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat(fileName, LOADSCREENHINTSFILENAME);
 	SGP_THROW_IFFALSE(ReadInLoadScreenHints(fileName, FALSE),LOADSCREENHINTSFILENAME);

-	#ifndef ENGLISH
+	if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInLoadScreenHints(fileName,TRUE), fileName);
 		}
-	#endif
+	}

 	strcpy(fileName, directoryName);
 	strcat(fileName, ARMOURSFILENAME);
@@ -438,22 +411,24 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		if (isMultiplayer == false)
 		{
 			using namespace LogicalBodyTypes;
-			SGP_THROW_IFFALSE(Layers::Instance().LoadFromFile(directoryName, LBT_LAYERSFILENAME), LBT_LAYERSFILENAME);
-			SGP_THROW_IFFALSE(PaletteDB::Instance().LoadFromFile(directoryName, LBT_PALETTESFILENAME), LBT_PALETTESFILENAME);
-			SGP_THROW_IFFALSE(SurfaceDB::Instance().LoadFromFile(directoryName, LBT_ANIMSURFACESFILENAME), LBT_ANIMSURFACESFILENAME);
-			SGP_THROW_IFFALSE(FilterDB::Instance().LoadFromFile(directoryName, LBT_FILTERSFILENAME), LBT_FILTERSFILENAME);
-			SGP_THROW_IFFALSE(BodyTypeDB::Instance().LoadFromFile(directoryName, LBT_BODYTYPESFILENAME), LBT_BODYTYPESFILENAME);
+			CHAR8 errorBuf[512]{"Failed loading LogicalBodyTypes external data!"};
+
+			SGP_THROW_IFFALSE(Layers::Instance().LoadFromFile(directoryName, LBT_LAYERSFILENAME, errorBuf), errorBuf);
+			SGP_THROW_IFFALSE(PaletteDB::Instance().LoadFromFile(directoryName, LBT_PALETTESFILENAME, errorBuf), errorBuf);
+			SGP_THROW_IFFALSE(SurfaceDB::Instance().LoadFromFile(directoryName, LBT_ANIMSURFACESFILENAME, errorBuf), errorBuf);
+			SGP_THROW_IFFALSE(FilterDB::Instance().LoadFromFile(directoryName, LBT_FILTERSFILENAME, errorBuf), errorBuf);
+			SGP_THROW_IFFALSE(BodyTypeDB::Instance().LoadFromFile(directoryName, LBT_BODYTYPESFILENAME, errorBuf), errorBuf);
 		}
 	}

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInLBEPocketStats(fileName,TRUE), fileName);
 	}
-#endif
+}

 	// THE_BOB : added for pocket popup definitions
 	LBEPocketPopup.clear();
@@ -461,7 +436,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat(fileName, LBEPOCKETPOPUPFILENAME);
 	SGP_THROW_IFFALSE(ReadInLBEPocketPopups(fileName),LBEPOCKETPOPUPFILENAME);

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);

 	if (FileExists(fileName))
@@ -476,10 +451,10 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		strcat(fileName, LBEPOCKETPOPUPFILENAME);
 		SGP_THROW_IFFALSE(ReadInLBEPocketPopups(fileName),LBEPOCKETPOPUPFILENAME);
 	}
-#else
+} else {
 	// WANNE: Load english file
 	SGP_THROW_IFFALSE(ReadInLBEPocketPopups(fileName),LBEPOCKETPOPUPFILENAME);
-#endif
+}


 #ifdef JA2UB
@@ -495,14 +470,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat(fileName, MERCSTARTINGGEARFILENAME);
 	SGP_THROW_IFFALSE(ReadInMercStartingGearStats(fileName, FALSE), MERCSTARTINGGEARFILENAME);

-	#ifndef ENGLISH
+	if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInMercStartingGearStats(fileName,TRUE), fileName);
 		}
-	#endif
+	}

 #endif

@@ -519,14 +494,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat(fileName, ATTACHMENTSLOTSFILENAME);
 	SGP_THROW_IFFALSE(ReadInAttachmentSlotsStats(fileName, FALSE),ATTACHMENTSLOTSFILENAME);

-	#ifndef ENGLISH
+	if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInAttachmentSlotsStats(fileName,TRUE), fileName);
 		}
-	#endif
+	}

 	// Flugente: created separate gun and item choices for different soldier classes - read in different xmls
 	strcpy(fileName, directoryName);
@@ -700,14 +675,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat(fileName, CITYTABLEFILENAME);
 	SGP_THROW_IFFALSE(ReadInMapStructure(fileName, FALSE),CITYTABLEFILENAME);

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInStrategicMapSectorTownNames(fileName,TRUE), fileName);
 	}
-#endif
+}

 	// Lesh: Strategic movement costs will be read in Strategic\Strategic Movement Costs.cpp,
 	//		function BOOLEAN InitStrategicMovementCosts();
@@ -758,14 +733,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInShippingDestinations(fileName, FALSE),SHIPPINGDESTINATIONSFILENAME);

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInShippingDestinations(fileName, TRUE),fileName);
 	}
-#endif
+}
 	
 	strcpy(fileName, directoryName);
 	strcat(fileName, DELIVERYMETHODSFILENAME);
@@ -778,14 +753,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInFacilityTypes(fileName,FALSE), FACILITYTYPESFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInFacilityTypes(fileName,TRUE), fileName);
 	}
-#endif
+}

 	// HEADROCK HAM 3.4: Read in facility locations
 	strcpy(fileName, directoryName);
@@ -799,14 +774,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInSectorNames(fileName,FALSE,0), SECTORNAMESFILENAME);

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInSectorNames(fileName,TRUE, 0), fileName);
 	}
-#endif	
+}

 	// HEADROCK HAM 5: Read in Coolness by Sector
 	strcpy(fileName, directoryName);
@@ -828,7 +803,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));		
 		SGP_THROW_IFFALSE(ReadInMercProfiles(fileName, FALSE), MERCPROFILESFILENAME25);
 		
-		#ifndef ENGLISH
+		if( g_lang != i18n::Lang::en ) {
 			AddLanguagePrefix(fileName);
 			if ( FileExists(fileName) )
 			{
@@ -836,7 +811,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 				if(!ReadInMercProfiles(fileName,TRUE))
 				return FALSE;
 			}
-		#endif
+		}
 		}

 		strcpy(fileName, directoryName);
@@ -854,14 +829,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInMercProfiles(fileName, FALSE), MERCPROFILESFILENAME);

-		#ifndef ENGLISH
+		if( g_lang != i18n::Lang::en ) {
 			AddLanguagePrefix(fileName);
 			if ( FileExists(fileName) )
 			{
 				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 				SGP_THROW_IFFALSE(ReadInMercProfiles(fileName,TRUE), fileName);
 			}
-		#endif
+		}

 		// HEADROCK PROFEX: Read in Merc Opinion data to replace PROF.DAT data
 		strcpy(fileName, directoryName);
@@ -924,14 +899,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInEnemyNames(fileName,FALSE), ENEMYNAMESFILENAME);		

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInEnemyNames(fileName,TRUE), fileName);
 		}
-#endif
+}
 	}
 	
 	
@@ -943,14 +918,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInCivGroupNamesStats(fileName,FALSE), CIVGROUPNAMESFILENAME);

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInCivGroupNamesStats(fileName,TRUE), fileName);
 		}
-#endif
+}
 	}
 	
 	
@@ -960,14 +935,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInSenderNameList(fileName,FALSE), EMAILSENDERNAMELIST);

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInSenderNameList(fileName,TRUE), fileName);
 		}
-#endif
+}
 	
 	if (gGameExternalOptions.fEnemyRank == TRUE)
    {
@@ -977,14 +952,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInEnemyRank(fileName,FALSE), ENEMYRANKFILENAME);		

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInEnemyRank(fileName,TRUE), fileName);
 		}
-#endif
+}
 	}

 	// Flugente: backgrounds
@@ -993,14 +968,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInBackgrounds(fileName,FALSE), BACKGROUNDSFILENAME);
 			
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInBackgrounds(fileName,TRUE), BACKGROUNDSFILENAME);
 	}
-#endif
+}

 	// Flugente: individual militia
 	strcpy( fileName, directoryName );
@@ -1014,14 +989,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInCampaignStatsEvents(fileName,FALSE), CAMPAIGNSTATSEVENTSFILENAME);
 			
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInCampaignStatsEvents(fileName,TRUE), CAMPAIGNSTATSEVENTSFILENAME);
 	}
-#endif
+}

 	// WANNE: Only in a singleplayer game...
 	// Externalised taunts
@@ -1042,14 +1017,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 			strcat(fileName, FileInfo.zFileName);
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
-	#ifndef ENGLISH
+	if( g_lang != i18n::Lang::en ) {
 			AddLanguagePrefix(fileName);
 			if ( FileExists(fileName) )
 			{
 				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 				SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
 			}
-	#endif
+	}
 			while( GetFileNext(&FileInfo) )
 			{
 				strcpy(fileName, directoryName);
@@ -1057,14 +1032,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 				strcat(fileName, FileInfo.zFileName);
 				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 				SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
-	#ifndef ENGLISH
+	if( g_lang != i18n::Lang::en ) {
 				AddLanguagePrefix(fileName);
 				if ( FileExists(fileName) )
 				{
 					DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 					SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
 				}
-	#endif
+	}
 			}
 			GetFileClose(&FileInfo);
 		}
@@ -1076,14 +1051,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInHistorys(fileName,FALSE), HISTORYNAMEFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInHistorys(fileName,TRUE), fileName);
 		}
-#endif
+}

 	// IMP Portraits List by Jazz
 	strcpy(fileName, directoryName);
@@ -1091,14 +1066,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInIMPPortraits(fileName,FALSE), IMPPORTRAITS);

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInIMPPortraits(fileName,TRUE), fileName);
 		}
-#endif
+}

 	LoadIMPPortraitsTEMP( );

@@ -1183,14 +1158,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	SGP_THROW_IFFALSE(ReadInFaceGear(zNewFaceGear, fileName), FACEGEARFILENAME);
 	//WriteFaceGear();
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInMercAvailability(fileName,TRUE), fileName);
 		}
-#endif
+}
 	UINT32 i;
 		for(i=0; i<NUM_PROFILES; i++)
 		{
@@ -1204,14 +1179,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInAimAvailability(fileName,FALSE), AIMAVAILABILITY);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInAimAvailability(fileName,TRUE), fileName);
 		}
-#endif
+}

 	//Main Menu by Jazz	
 	strcpy(fileName, directoryName);
@@ -1224,7 +1199,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInActionItems(fileName,FALSE), ACTIONITEMSFILENAME);	

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1232,7 +1207,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 			if(!ReadInActionItems(fileName,TRUE))
 				return FALSE;
 		}
-#endif
+}

 if ( ReadXMLEmail == TRUE )
 {
@@ -1242,7 +1217,7 @@ if ( ReadXMLEmail == TRUE )
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInEmailMercAvailable(fileName,FALSE), EMAILMERCAVAILABLE);

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1250,7 +1225,7 @@ if ( ReadXMLEmail == TRUE )
 			if(!ReadInEmailMercAvailable(fileName,TRUE))
 				return FALSE;
 		}
-#endif
+}

 		// EMAIL MERC LEVEL UP by Jazz
 		strcpy(fileName, directoryName);
@@ -1258,7 +1233,7 @@ if ( ReadXMLEmail == TRUE )
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInEmailMercLevelUp(fileName,FALSE), EMAILMERCLEVELUP);

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1266,7 +1241,7 @@ if ( ReadXMLEmail == TRUE )
 			if(!ReadInEmailMercLevelUp(fileName,TRUE))
 				return FALSE;
 		}
-#endif
+}
 }
 /*
 		// EMAIL OTHER by Jazz
@@ -1275,7 +1250,7 @@ if ( ReadXMLEmail == TRUE )
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInEmailOther(fileName,FALSE), EMAILOTHER);

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1283,7 +1258,7 @@ if ( ReadXMLEmail == TRUE )
 			if(!ReadInEmailOther(fileName,TRUE))
 				return FALSE;
 		}
-#endif
+}
 */
 	//new vehicles by Jazz	
 	
@@ -1294,7 +1269,7 @@ if ( ReadXMLEmail == TRUE )
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInNewVehicles(fileName,FALSE), VEHICLESFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1302,9 +1277,9 @@ if ( ReadXMLEmail == TRUE )
 			if(!ReadInNewVehicles(fileName,TRUE))
 				return FALSE;
 		}
-#endif
+}

-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1312,7 +1287,7 @@ if ( ReadXMLEmail == TRUE )
 			if(!ReadInLanguageLocation(fileName,TRUE,zlanguageText,0))
 				return FALSE;
 		}
-#endif
+}

 #ifdef ENABLE_BRIEFINGROOM
 	strcpy(fileName, directoryName);
@@ -1320,14 +1295,14 @@ if ( ReadXMLEmail == TRUE )
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInBriefingRoom(fileName,FALSE,gBriefingRoomData, 4), BRIEFINGROOMFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInBriefingRoom(fileName,TRUE,gBriefingRoomData, 4), fileName);
 		}
-#endif
+}

 BackupBRandEncyclopedia ( gBriefingRoomData, gBriefingRoomDataBackup, 0);

@@ -1339,14 +1314,14 @@ BackupBRandEncyclopedia ( gBriefingRoomData, gBriefingRoomDataBackup, 0);
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInMinerals(fileName,FALSE), MINERALSFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInMinerals(fileName,TRUE), fileName);
 	}
-#endif
+}

 	// Old AIM Archive
 		UINT8 p;
@@ -1360,14 +1335,14 @@ BackupBRandEncyclopedia ( gBriefingRoomData, gBriefingRoomDataBackup, 0);
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInAimOldArchive(fileName,FALSE), OLDAIMARCHIVEFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInAimOldArchive(fileName,TRUE), fileName);
 		}
-#endif
+}
 		UINT8 emptyslotsinarchives = 0;
 		for (p=0;p<NUM_PROFILES;p++)
 		{
@@ -1417,14 +1392,14 @@ BackupBRandEncyclopedia ( gBriefingRoomData, gBriefingRoomDataBackup, 0);
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInDifficultySettings(fileName,FALSE), DIFFICULTYFILENAME);

-			#ifndef ENGLISH
+			if( g_lang != i18n::Lang::en ) {
 				AddLanguagePrefix(fileName);
 				if ( FileExists(fileName) )
 				{
 					DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 					SGP_THROW_IFFALSE(ReadInDifficultySettings(fileName,TRUE), fileName);
 				}
-			#endif
+			}

 	LuaState::INIT(lua::LUA_STATE_STRATEGIC_MINES_AND_UNDERGROUND, true);
 	g_luaUnderground.LoadScript(GetLanguagePrefix());
@@ -1498,6 +1473,10 @@ UINT32 InitializeJA2(void)
 		return( ERROR_SCREEN );
 	}

+	// InitRadarScreenCoords() depend on Mapscreen Interface Bottom coordinates -> need to initiate them first
+	// before calling InitTacticalEngine()
+	InitMapScreenInterfaceBottomCoords();
+
 	// Init tactical engine
 	if ( !InitTacticalEngine( ) )
 	{
@@ -36,6 +36,7 @@

 #include "LuaInitNPCs.h"
 #include "XML.h"
+#include <language.hpp>

 BOOLEAN Style_JA = TRUE;
 extern INT8 Test = 0;
@@ -726,11 +727,11 @@ void DisplaySirtechSplashScreen()
 			*								(2006-10-10, Sergeant_Kolja)
 			*/
 			#ifdef _DEBUG
-			#	if defined(ENGLISH)
+			if( g_lang == i18n::Lang::en ) {
 				AssertMsg( 0, String( "Wheter English nor German works. May be You built English - but have only German or other foreign Disk?" ) );
-			#	elif defined(GERMAN)
+			} else if( g_lang == i18n::Lang::de ) {
 				AssertMsg( 0, String( "Weder Englisch noch Deutsch geht. Deutsche Version kompiliert und mit englischer CDs gestartet? Das geht nicht!" ) );
-			#	endif
+			}
 			#endif
 			AssertMsg( 0, String( "Failed to load %s", VObjectDesc.ImageFile ) );
 			return;
@@ -12,13 +12,11 @@ void	StopIntroVideo();
 //enums used for when the intro screen can come up, used with 'gbIntroScreenMode'
 enum EIntroType
 {
-#ifdef JA2UB	
-	INTRO_HELI_CRASH,
-#endif
 	INTRO_BEGINNING,			//set when viewing the intro at the begining of the game
 	INTRO_ENDING,				//set when viewing the end game video.
-
 	INTRO_SPLASH,
+	// Unfinished Business
+	INTRO_HELI_CRASH
 };


@@ -42,4 +40,4 @@ typedef struct

 extern INTRO_NAMES_VALUES zVideoFile[255];

-#endif
+#endif
@@ -5,6 +5,7 @@
 #include "Timer Control.h"
 #include "Multi Language Graphic Utils.h"
 #include <stdio.h>
+#include <language.hpp>

 UINT32 guiSplashFrameFade = 10;
 UINT32 guiSplashStartTime = 0;
@@ -13,10 +14,10 @@ extern HVSURFACE ghFrameBuffer;
 //Simply create videosurface, load image, and draw it to the screen.
 void InitJA2SplashScreen()
 {
-#ifdef ENGLISH
+if( g_lang == i18n::Lang::en ) {
 	ClearMainMenu();

-#else
+} else {
 	UINT32 uiLogoID = 0;
 	HVSURFACE hVSurface; // unused jonathanl	// lalien reenabled for international versions
 	VSURFACE_DESC VSurfaceDesc; //unused jonathanl // lalien reenabled for international versions
@@ -69,7 +70,7 @@ void InitJA2SplashScreen()
 	GetVideoSurface( &hVSurface, uiLogoID );
 	BltVideoSurfaceToVideoSurface( ghFrameBuffer, hVSurface, 0, iScreenWidthOffset, iScreenHeightOffset, 0, NULL );
 	DeleteVideoSurfaceFromIndex( uiLogoID );
-#endif // ENGLISH
+} // ENGLISH

 	InvalidateScreen();
 	RefreshScreen( NULL );
@@ -6,4 +6,4 @@ void InitJA2SplashScreen();
 extern UINT32 guiSplashFrameFade;
 extern UINT32 guiSplashStartTime;

-#endif
+#endif
@@ -1,21 +0,0 @@
-#include "Language Defines.h"
-
-#if defined(ENGLISH)
-#	pragma message(" (Language set to ENGLISH, You'll need english CDs)")
-#elif defined(GERMAN)
-#	pragma message(" (Language set to GERMAN, You'll need Topware/german CDs)")
-#elif defined(RUSSIAN)
-#	pragma message(" (Language set to RUSSIAN, You'll need russian CDs)")
-#elif defined(DUTCH)
-#	pragma message(" (Language set to DUTCH, You'll need dutch CDs)")
-#elif defined(POLISH)
-#	pragma message(" (Language set to POLISH, You'll need polish CDs)")
-#elif defined(FRENCH)
-#	pragma message(" (Language set to FRENCH, You'll need french CDs)")
-#elif defined(ITALIAN)
-#	pragma message(" (Language set to ITALIAN, You'll need italian CDs)")
-#elif defined(CHINESE)
-#	pragma message(" (Language set to CHINESE, You'll need chinese CDs)")
-#else
-#	error "At least You have to specify a Language somewhere. See comments above."
-#endif
@@ -1,119 +0,0 @@
-#ifndef __LANGUAGE_DEFINES_H
-#define __LANGUAGE_DEFINES_H
-
-#pragma once
-
-/* ============================================================================
- * ONLY ONE OF THESE LANGUAGES CAN BE DEFINED AT A TIME!
- * BUT now You can define it _here_ by uncommenting one _or_ (better):
- * You can comment them all out and then set it _global_ in "Preprocessor 
- * options" (do it for ALL projects in the workspace and both debug & release)
- *   _or_
- * give it do Your MAKEFILE, f.i. make ENGLISH, but keep in mind that some 
- * weird make tools will require 'make ENGLISH=1' instead
- * 
- * using one of the two later methods will keep this SVN file unchanged for the
- * future, only Your private project files (workspace/solution) will differ 
- * from the SVN stuff.
- *											 (2006-10-10, Sergeant_Kolja)
- */
-
-
-/* The recommend approach for VS2010 multi-language builds is to use the command line or the ja2.props file.
-
-    By default the language is ENGLISH and the Language Prefix is EN.
-
-	There are 3 ways you can build the JA2 1.13 executable file:
-
-	// -------------------------------------------------------
-	// 1. Using the command line
-	// -------------------------------------------------------
-
-    For example, where msbuild is located in %SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ if not on your path
-	msbuild.exe /p:Configuration=Release ja2_VS2010.sln
-	msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=PL /p:JA2Language=POLISH ja2_VS2010.sln
-	msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=DE /p:JA2Language=GERMAN ja2_VS2010.sln
-	msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=RU /p:JA2Language=RUSSIAN ja2_VS2010.sln
-	msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=NL /p:JA2Language=DUTCH ja2_VS2010.sln
-	msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=FR /p:JA2Language=FRENCH ja2_VS2010.sln
-	msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=IT /p:JA2Language=ITALIAN ja2_VS2010.sln
-	msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=CN /p:JA2Language=CHINESE ja2_VS2010.sln
-
-	Note: If you want to build "Unfinished Business" version, just append the /p:JA2Config=JA2UB in the command line
-	msbuild.exe /p:Configuration=Release /p:JA2Config=JA2UB ja2_VS2010.sln
-	msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=DE /p:JA2Language=GERMAN /p:JA2Config=JA2UB ja2_VS2010.sln
-	
-	Note2: You can also specify the target output name with the parameter /p:TargetName
-	msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=DE /p:JA2Language=GERMAN /p:JA2Config=JA2UB /p:TargetName="JA2UB_113" ja2_VS2010.sln
-
-	// --------------------------------------------------------
-	// 2. Editing the ja2.props file and then build in VS 2010 
-	// -------------------------------------------------------
-	
-	1. Open the "ja2.props" file in a text editor and set the <BuildMacro> tags to your likeing.
-	
-	For example: If you want to build Russian Version (normal JA2, not UB) then set the following:
-
-	<BuildMacro Include="JA2Config">
-      <Value></Value>
-    </BuildMacro>
-    <BuildMacro Include="JA2LangPrefix">
-      <Value>RU</Value>
-    </BuildMacro>
-    <BuildMacro Include="JA2Language">
-      <Value>RUSSIAN</Value>
-    </BuildMacro>
-
-	2. Save the file
-	3. Build the project in Visual Studio 2010
-
-	// --------------------------------------------------------
-	// 3. The "old" way for building the executable
-	// -------------------------------------------------------
-
-	1. Enable the "#undef ENGLISH" define below, so English will not be used anymore
-	2. Set the desired language below
-	3. If you want to build "Unfinished Business" version, enable "#define JA2UB" and "#define JA2UBMAPS" in builddefines.h"
-	4. Build the executable in VS 2005 / 2008 / 2010
-	5. The output will be placed in the "Build\bin\" folder
-*/
-
-// Only enable this "undef", if you use the 3. way of building the executable!
-#undef ENGLISH
-
-#if !defined(ENGLISH) && !defined(GERMAN) && !defined(RUSSIAN) && !defined(DUTCH) && !defined(POLISH) && !defined(FRENCH) && !defined(ITALIAN) && !defined(CHINESE)
-/* please set one manually here (by uncommenting) if not willingly to set Workspace wide */
-
-#define ENGLISH
-//#define GERMAN
-//#define RUSSIAN
-//#define DUTCH
-//#define FRENCH
-//#define ITALIAN
-//#define POLISH
-
-// INFO: For Chinese 1.13 version, you also have to set USE_WINFONTS = 1 in ja2.ini inside your JA2 installation directory!
-//#define CHINESE
-
-#endif
-
-//**ddd direct link libraries
-#pragma comment (lib, "user32.lib")
-#pragma comment (lib, "gdi32.lib")
-#pragma comment (lib, "advapi32.lib")
-#pragma comment (lib, "shell32.lib")
-
-/* ====================================================================
- * Regardless of if we did it Workspace wide or by uncommenting above,
- * HERE we must see, what language was selected. If one, we
- */
-#if !defined(ENGLISH) && !defined(GERMAN) && !defined(RUSSIAN) && !defined(DUTCH) && !defined(POLISH) && !defined(FRENCH) && !defined(ITALIAN) && !defined(CHINESE)
-#  error "At least You have to specify a Language somewhere. See comments above."
-#endif
-
-//if the language represents words as single chars
-/*#ifdef TAIWAN
-	#define	SINGLE_CHAR_WORDS
-#endif*/
-
-#endif
@@ -26,4 +26,4 @@ extern BOOLEAN	gfInChatBox;
 INT32 DoChatBox( bool bIncludeChatLog, const STR16 zString, UINT32 uiExitScreen, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect );
 void ChatLogMessage( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ...);

-#endif
+#endif
@@ -11,4 +11,4 @@ void	SetConnectScreenHeadingA( const char* cmsg );
 void	SetConnectScreenSubMessageW( STR16 cmsg );
 void	SetConnectScreenSubMessageA( const char* cmsg );

-#endif
+#endif
@@ -9,4 +9,4 @@ UINT32	MPHostScreenShutdown( void );



-#endif
+#endif
@@ -9,4 +9,4 @@ UINT32	MPScoreScreenShutdown( void );



-#endif
+#endif
@@ -152,4 +152,4 @@ BOOLEAN DoOptionsMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32
 BOOLEAN DoSaveLoadMessageBoxWithRect( UINT8 ubStyle, const STR16 zString, UINT32 uiExitScreen, UINT32 usFlags, MSGBOX_CALLBACK ReturnCallback, SGPRect *pCenteringRect );


-#endif
+#endif
@@ -29,7 +29,6 @@
 	#include	"Text.h"
 	#include	"Interface Control.h"
 	#include	"Message.h"
-	#include	"Language Defines.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "Map Information.h"
 	#include "SmokeEffects.h"
@@ -152,6 +152,7 @@
 #endif

 #include "LuaInitNPCs.h"
+#include <language.hpp>


 #ifdef JA2UB
@@ -1466,7 +1467,17 @@ BOOLEAN MERCPROFILESTRUCT::Load(HWFILE hFile, bool forceLoadOldVersion, bool for
 		numBytesRead = ReadFieldByField( hFile, &this->ubLastDateSpokenTo, sizeof(this->ubLastDateSpokenTo), sizeof(UINT8), numBytesRead);
 		numBytesRead = ReadFieldByField( hFile, &this->bLastQuoteSaidWasSpecial, sizeof(this->bLastQuoteSaidWasSpecial), sizeof(UINT8), numBytesRead);
 		numBytesRead = ReadFieldByField( hFile, &this->bSectorZ, sizeof(this->bSectorZ), sizeof(INT8), numBytesRead);
-		numBytesRead = ReadFieldByField( hFile, &this->usStrategicInsertionData, sizeof(this->usStrategicInsertionData), sizeof(UINT16), numBytesRead);
+
+		if ( guiCurrentSaveGameVersion >= MERC_PROFILE_INSERTION_DATA )
+		{
+			numBytesRead = ReadFieldByField( hFile, &this->usStrategicInsertionData, sizeof( this->usStrategicInsertionData ), sizeof( UINT32 ), numBytesRead );
+		}
+		else
+		{
+			numBytesRead = ReadFieldByField( hFile, &this->usStrategicInsertionData, sizeof(UINT16), sizeof(UINT16), numBytesRead);
+			buffer += 4; // To make numBytesRead check match the struct size. 2 bytes from uint32 - uint16 and 2 bytes due to struct memory layout change when usStrategicInsertionData was increased to uint32
+		}
+
 		numBytesRead = ReadFieldByField( hFile, &this->bFriendlyOrDirectDefaultResponseUsedRecently, sizeof(this->bFriendlyOrDirectDefaultResponseUsedRecently), sizeof(INT8), numBytesRead);
 		numBytesRead = ReadFieldByField( hFile, &this->bRecruitDefaultResponseUsedRecently, sizeof(this->bRecruitDefaultResponseUsedRecently), sizeof(INT8), numBytesRead);
 		numBytesRead = ReadFieldByField( hFile, &this->bThreatenDefaultResponseUsedRecently, sizeof(this->bThreatenDefaultResponseUsedRecently), sizeof(INT8), numBytesRead);
@@ -7057,7 +7068,7 @@ BOOLEAN LoadSoldierStructure( HWFILE hFile )
 					}
 				}

-#ifdef GERMAN
+if( g_lang == i18n::Lang::de ) {
 				// Fix neutral flags
 				if ( guiCurrentSaveGameVersion < 94 )
 				{
@@ -7067,7 +7078,7 @@ BOOLEAN LoadSoldierStructure( HWFILE hFile )
 						Menptr[ cnt].aiData.bNeutral = FALSE;
 					}
 				}
-#endif
+}
 				//#ifdef JA2UB
 				//if the soldier has the NON weapon version of the merc knofe or merc umbrella
 				//ConvertWeapons( &Menptr[ cnt ] );
@@ -9749,9 +9760,9 @@ UINT32 CalcJA2EncryptionSet( SAVED_GAME_HEADER * pSaveGameHeader )
 		}
 	}

-	#ifdef GERMAN
+	if( g_lang == i18n::Lang::de ) {
 		uiEncryptionSet *= 11;
-	#endif
+	}

 	uiEncryptionSet = uiEncryptionSet % 10;

@@ -34,4 +34,4 @@ extern Screens GameScreens[MAX_SCREENS];

 #include "jascreens.h"

-#endif
+#endif
@@ -1,8 +1,6 @@
 #ifndef _BUILDDEFINES_H
 #define _BUILDDEFINES_H

-#include "Language Defines.h"
-
 //----- Briefing Room (Mission based JA2 like in JA/DG) - by Jazz -----
 // Once enabled here and also enabled in the ja2_options.ini (BRIEFING_ROOM), 
 // you can access the briefing room feature from the laptop
@@ -45,10 +45,10 @@
 	#include "Sound Control.h"
 	#include "WordWrap.h"
 	#include "text.h"
-	#include "Language Defines.h"
 	#include "IniReader.h"

 #include "sgp_logger.h"
+#include <language.hpp>

 #define _UNICODE
 // Networking Stuff
@@ -332,7 +332,7 @@ UINT32 InitScreenHandle(void)

 	if ( ubCurrentScreen == 255 )
 	{
-	#ifdef ENGLISH
+	if( g_lang == i18n::Lang::en ) {
 		if( gfDoneWithSplashScreen )
 		{
 			ubCurrentScreen = 0;
@@ -342,9 +342,9 @@ UINT32 InitScreenHandle(void)
 			SetCurrentCursorFromDatabase( VIDEO_NO_CURSOR );
 			return( INTRO_SCREEN );
 		}
-	#else
+	} else {
 		ubCurrentScreen = 0;
-	#endif
+	}
 	}

 	if ( ubCurrentScreen == 0 )
@@ -397,7 +397,7 @@ UINT32 InitScreenHandle(void)
 		// Handle queued .ini file error messages
 		int y = 40;
 		sgp::Logger_ID ini_id = sgp::Logger::instance().createLogger();
-		sgp::Logger::instance().connectFile(ini_id, L"iniErrorReport.txt", false, sgp::Logger::FLUSH_ON_DELETE);
+		sgp::Logger::instance().connectFile(ini_id, L"iniErrorReport.log", false, sgp::Logger::FLUSH_ON_DELETE);
 		sgp::Logger::LogInstance logger = sgp::Logger::instance().logger(ini_id);
 		while (! iniErrorMessages.empty()) {
 			static BOOL iniErrorMessage_create_out_file = TRUE;
@@ -407,7 +407,7 @@ UINT32 InitScreenHandle(void)
 			if (iniErrorMessage_create_out_file)
 			{
 				y += 25;
-				swprintf( str, L"%S", "Warning: found the following ini errors. iniErrorReport.txt has been created." );
+				swprintf( str, L"%S", "Warning: found the following ini errors. iniErrorReport.log has been created." );
 				DisplayWrappedString( 10, y, 560, 2, FONT12ARIAL, FONT_ORANGE, str, FONT_BLACK, TRUE, LEFT_JUSTIFIED );
 				iniErrorMessage_create_out_file = FALSE;
 			}
@@ -943,7 +943,6 @@ void DoneFadeOutForDemoExitScreen( void )
 // unused
 //extern INT8 gbFadeSpeed;

-#ifdef GERMAN
 void DisplayTopwareGermanyAddress()
 {
 	VOBJECT_DESC		vo_desc;
@@ -978,7 +977,6 @@ void DisplayTopwareGermanyAddress()
 	ExecuteBaseDirtyRectQueue();
 	EndFrameBufferRender();
 }
-#endif

 UINT32 DemoExitScreenHandle(void)
 {
@@ -184,4 +184,4 @@ extern std::list<SExceptionData> g_ExceptionList;
 void PrintExceptionList();


-#endif
+#endif
@@ -102,4 +102,4 @@ extern void RandomStats ();
 #endif

 extern void RandomStats ();
-#endif
+#endif
@@ -37,4 +37,4 @@ void ClearMainMenu( );

 void InitDependingGameStyleOptions();

-#endif
+#endif
@@ -47,4 +47,4 @@ enum ScreenTypes
 	MAX_SCREENS
 };

-#endif
+#endif
@@ -238,7 +238,8 @@ void LoadGameUBOptions()
 	gGameUBOptions.PowergenSectorGridNo3 = iniReader.ReadInteger("Unfinished Business Settings","POWERGEN_SECTOR_GRIDNO_3", 14155);	
 	gGameUBOptions.PowergenSectorGridNo4 = iniReader.ReadInteger("Unfinished Business Settings","POWERGEN_SECTOR_GRIDNO_4", 13980);	
 	
-	gGameUBOptions.PowergenSectorExitgridGridNo = iniReader.ReadInteger("Unfinished Business Settings","POWERGEN_SECTOR_EXITGRID_GRIDNO", 19749);	
+	gGameUBOptions.PowergenSectorExitgridGridNo = iniReader.ReadInteger( "Unfinished Business Settings", "POWERGEN_SECTOR_EXITGRID_GRIDNO", 19749 );
+	gGameUBOptions.PowergenSectorExitgridSrcGridNo = iniReader.ReadInteger("Unfinished Business Settings","POWERGEN_SECTOR_EXITGRID_SRC_GRIDNO", 10979 );
 	gGameUBOptions.PowergenFanSoundGridNo1 = iniReader.ReadInteger("Unfinished Business Settings","POWERGEN_FAN_SOUND_GRIDNO_1", 10979);	
 	gGameUBOptions.PowergenFanSoundGridNo2 = iniReader.ReadInteger("Unfinished Business Settings","POWERGEN_FAN_SOUND_GRIDNO_2", 19749);	
 	gGameUBOptions.StartFanbackupAgainGridNo = iniReader.ReadInteger("Unfinished Business Settings","START_FANBACKUP_AGAIN_GRIDNO", 10980);	
@@ -356,6 +357,11 @@ void LoadGameUBOptions()
 	gGameUBOptions.H10SectorPlayerQuoteZ = iniReader.ReadInteger("Unfinished Business Settings","H10_SECTOR_PLAYER_QUOTE_Z", 0); 


+	gGameUBOptions.BettyBloodCatSectorX = iniReader.ReadInteger( "Unfinished Business Settings", "BETTY_BLOODCAT_SECTOR_X", 10 );
+	gGameUBOptions.BettyBloodCatSectorY = iniReader.ReadInteger( "Unfinished Business Settings", "BETTY_BLOODCAT_SECTOR_Y", 9 );
+	gGameUBOptions.BettyBloodCatSectorZ = iniReader.ReadInteger( "Unfinished Business Settings", "BETTY_BLOODCAT_SECTOR_Z", 0 );
+
+
 	if ( gGameUBOptions.InGameHeli == TRUE ) 
 		gGameUBOptions.InGameHeliCrash = FALSE;
 	
@@ -67,6 +67,7 @@ typedef struct
 	UINT32  PowergenSectorGridNo3;
 	UINT32  PowergenSectorGridNo4;
 	UINT32  PowergenSectorExitgridGridNo;
+	UINT32  PowergenSectorExitgridSrcGridNo;
 	UINT32  PowergenFanSoundGridNo1;
 	UINT32  PowergenFanSoundGridNo2;
 	UINT32  StartFanbackupAgainGridNo;
@@ -219,7 +220,10 @@ typedef struct
 	UINT32 SectorDoorInTunnelGridNo;
 	
 	UINT8 MaxNumberOfMercs;
-       
+
+	INT16 BettyBloodCatSectorX;
+	INT16 BettyBloodCatSectorY;
+	INT8 BettyBloodCatSectorZ;
 } GAME_UB_OPTIONS;

 extern GAME_UB_OPTIONS gGameUBOptions; 
@@ -230,4 +234,4 @@ extern void RandomStats ();
 #endif

 extern void RandomStats ();
-#endif
+#endif
@@ -36,7 +36,6 @@
 	#include "Strategic Status.h"
 	#include "Merc Contract.h"
 	#include "Strategic Merc Handler.h"
-	#include "Language Defines.h"
 	#include "Assignments.h"
 	#include "Sound Control.h"
 	#include "Quests.h"
@@ -50,6 +49,7 @@
 #include "Encrypted File.h"
 #include "InterfaceItemImages.h"
 #include <sstream>
+#include <language.hpp>

 //
 //******	Defines	******
@@ -148,10 +148,16 @@
 #define		FEE_X					PRICE_X + 7
 #define		FEE_Y					NAME_Y
 #define		FEE_WIDTH				37
+#define		FEE_X_UB				PRICE_X + 40
+#define		FEE_Y_UB				STATS_Y + 28
+#define		FEE_Y_UB_NSGI			STATS_Y

 #define		AIM_CONTRACT_X			PRICE_X + 51
 #define		AIM_CONTRACT_Y			FEE_Y
 #define		AIM_CONTRACT_WIDTH		59
+#define		AIM_CONTRACT_X_UB		PRICE_X + 19
+#define		AIM_OFFER_X				PRICE_X + 3
+#define		AIM_OFFER_WIDTH			110

 #define		ONEDAY_X				AIM_CONTRACT_X
 #define		ONEWEEK_X				AIM_CONTRACT_X
@@ -1120,7 +1126,13 @@ BOOLEAN RenderAIMMembers()

 		UpdateMercInfo();

+		//Display AIM Member text
+		DrawTextToScreen(CharacterInfo[AIM_MEMBER_ACTIVE_MEMBERS], AIM_MEMBER_ACTIVE_TEXT_X_NSGI, AIM_MEMBER_ACTIVE_TEXT_Y_NSGI, AIM_MEMBER_ACTIVE_TEXT_WIDTH_NSGI, AIM_MAINTITLE_FONT, AIM_M_ACTIVE_MEMBER_TITLE_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
+
 		//Draw fee & contract
+#ifdef JA2UB
+		DrawTextToScreen(CharacterInfo[AIM_MEMBER_UB_MISSION_FEE], AIM_CONTRACT_X_UB, AIM_CONTRACT_Y_NSGI, 0, AIM_M_FONT_PREV_NEXT_CONTACT, AIM_M_FEE_CONTRACT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
+#else
 		DrawTextToScreen(CharacterInfo[AIM_MEMBER_FEE], FEE_X_NSGI, FEE_Y_NSGI, 0, AIM_M_FONT_PREV_NEXT_CONTACT, AIM_M_FEE_CONTRACT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED	);
 		DrawTextToScreen(CharacterInfo[AIM_MEMBER_CONTRACT], AIM_CONTRACT_X_NSGI, AIM_CONTRACT_Y_NSGI, AIM_CONTRACT_WIDTH_NSGI, AIM_M_FONT_PREV_NEXT_CONTACT, AIM_M_FEE_CONTRACT_COLOR, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED	);

@@ -1129,9 +1141,6 @@ BOOLEAN RenderAIMMembers()
 		DrawTextToScreen(CharacterInfo[AIM_MEMBER_1_WEEK], ONEWEEK_X_NSGI, MARKSMAN_Y_NSGI, AIM_CONTRACT_WIDTH_NSGI, AIM_M_FONT_STATIC_TEXT, AIM_M_COLOR_STATIC_TEXT, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED	);
 		DrawTextToScreen(CharacterInfo[AIM_MEMBER_2_WEEKS], TWOWEEK_X_NSGI, MECHANAICAL_Y_NSGI, AIM_CONTRACT_WIDTH_NSGI, AIM_M_FONT_STATIC_TEXT, AIM_M_COLOR_STATIC_TEXT, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED	);

-		//Display AIM Member text
-		DrawTextToScreen(CharacterInfo[AIM_MEMBER_ACTIVE_MEMBERS], AIM_MEMBER_ACTIVE_TEXT_X_NSGI, AIM_MEMBER_ACTIVE_TEXT_Y_NSGI, AIM_MEMBER_ACTIVE_TEXT_WIDTH_NSGI, AIM_MAINTITLE_FONT, AIM_M_ACTIVE_MEMBER_TITLE_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED	);
-
 		//Display Option Gear Cost text
 		DrawTextToScreen(CharacterInfo[AIM_MEMBER_OPTIONAL_GEAR_NSGI], AIM_MEMBER_OPTIONAL_GEAR_X_NSGI, EXPLOSIVE_Y_NSGI, AIM_CONTRACT_WIDTH_NSGI, AIM_M_FONT_STATIC_TEXT, AIM_M_COLOR_STATIC_TEXT, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED	);

@@ -1140,6 +1149,7 @@ BOOLEAN RenderAIMMembers()
 		InsertDollarSignInToString( wTemp );
 		uiPosX = AIM_MEMBER_OPTIONAL_GEAR_X_NSGI + StringPixLength( CharacterInfo[AIM_MEMBER_OPTIONAL_GEAR_NSGI], AIM_M_FONT_STATIC_TEXT) + 5;
 		DrawTextToScreen(wTemp, AIM_MEMBER_OPTIONAL_GEAR_COST_X_NSGI, EXPLOSIVE_Y_NSGI, FEE_WIDTH_NSGI, AIM_M_FONT_STATIC_TEXT, AIM_M_COLOR_DYNAMIC_TEXT, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED	);
+#endif // JA2UB
 	}
 	else
 	{
@@ -1163,6 +1173,12 @@ BOOLEAN RenderAIMMembers()

 		UpdateMercInfo();

+		//Display AIM Member text
+		DrawTextToScreen(CharacterInfo[AIM_MEMBER_ACTIVE_MEMBERS], AIM_MEMBER_ACTIVE_TEXT_X, AIM_MEMBER_ACTIVE_TEXT_Y, AIM_MEMBER_ACTIVE_TEXT_WIDTH, AIM_MAINTITLE_FONT, AIM_M_ACTIVE_MEMBER_TITLE_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
+
+#ifdef JA2UB
+		DrawTextToScreen(CharacterInfo[AIM_MEMBER_UB_MISSION_FEE], AIM_CONTRACT_X_UB, AIM_CONTRACT_Y, 0, AIM_M_FONT_PREV_NEXT_CONTACT, AIM_M_FEE_CONTRACT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
+#else
 		//Draw fee & contract
 		DrawTextToScreen(CharacterInfo[AIM_MEMBER_FEE], FEE_X, FEE_Y, 0, AIM_M_FONT_PREV_NEXT_CONTACT, AIM_M_FEE_CONTRACT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED	);
 		DrawTextToScreen(CharacterInfo[AIM_MEMBER_CONTRACT], AIM_CONTRACT_X, AIM_CONTRACT_Y, AIM_CONTRACT_WIDTH, AIM_M_FONT_PREV_NEXT_CONTACT, AIM_M_FEE_CONTRACT_COLOR, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED	);
@@ -1172,9 +1188,6 @@ BOOLEAN RenderAIMMembers()
 		DrawTextToScreen(CharacterInfo[AIM_MEMBER_1_WEEK], ONEWEEK_X, MARKSMAN_Y, AIM_CONTRACT_WIDTH, AIM_M_FONT_STATIC_TEXT, AIM_M_COLOR_STATIC_TEXT, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED	);
 		DrawTextToScreen(CharacterInfo[AIM_MEMBER_2_WEEKS], TWOWEEK_X, MECHANAICAL_Y, AIM_CONTRACT_WIDTH, AIM_M_FONT_STATIC_TEXT, AIM_M_COLOR_STATIC_TEXT, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED	);

-		//Display AIM Member text
-		DrawTextToScreen(CharacterInfo[AIM_MEMBER_ACTIVE_MEMBERS], AIM_MEMBER_ACTIVE_TEXT_X, AIM_MEMBER_ACTIVE_TEXT_Y, AIM_MEMBER_ACTIVE_TEXT_WIDTH, AIM_MAINTITLE_FONT, AIM_M_ACTIVE_MEMBER_TITLE_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED	);
-
 		//Display Option Gear Cost text
 		DrawTextToScreen(CharacterInfo[AIM_MEMBER_OPTIONAL_GEAR], AIM_MEMBER_OPTIONAL_GEAR_X, AIM_MEMBER_OPTIONAL_GEAR_Y, 0, AIM_M_FONT_STATIC_TEXT, AIM_M_COLOR_STATIC_TEXT, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED	);

@@ -1183,6 +1196,7 @@ BOOLEAN RenderAIMMembers()
 		InsertDollarSignInToString( wTemp );
 		uiPosX = AIM_MEMBER_OPTIONAL_GEAR_X + StringPixLength( CharacterInfo[AIM_MEMBER_OPTIONAL_GEAR], AIM_M_FONT_STATIC_TEXT) + 5;
 		DrawTextToScreen(wTemp, uiPosX, AIM_MEMBER_OPTIONAL_GEAR_Y, 0, AIM_M_FONT_STATIC_TEXT, AIM_M_COLOR_DYNAMIC_TEXT, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED	);
+#endif
 	}

 	DisableAimButton();
@@ -1309,6 +1323,10 @@ BOOLEAN	UpdateMercInfo(void)

 	if(gGameExternalOptions.gfUseNewStartingGearInterface)
 	{
+#ifdef JA2UB
+		DrawMoneyToScreen(gMercProfiles[gbCurrentSoldier].uiWeeklySalary, FEE_WIDTH, FEE_X_UB, FEE_Y_UB_NSGI, AIM_M_NUMBER_FONT, AIM_M_COLOR_DYNAMIC_TEXT);
+		DisplayWrappedString(AIM_OFFER_X, AGILITY_Y_NSGI, AIM_OFFER_WIDTH, 2, AIM_M_FONT_DYNAMIC_TEXT, AIM_FONT_MCOLOR_WHITE, zNewTacticalMessages[TACT_MSG__AIMMEMBER_FEE_TEXT], FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
+#else
 		//Display the salaries
 		DrawMoneyToScreen(gMercProfiles[gbCurrentSoldier].sSalary, FEE_WIDTH_NSGI, FEE_X_NSGI, HEALTH_Y_NSGI, AIM_M_NUMBER_FONT, AIM_M_COLOR_DYNAMIC_TEXT	);
 		DrawMoneyToScreen(gMercProfiles[gbCurrentSoldier].uiWeeklySalary, FEE_WIDTH_NSGI, FEE_X_NSGI, AGILITY_Y_NSGI, AIM_M_NUMBER_FONT, AIM_M_COLOR_DYNAMIC_TEXT	);
@@ -1335,6 +1353,8 @@ BOOLEAN	UpdateMercInfo(void)
 			else
 				DisplayWrappedString(AIM_MEDICAL_DEPOSIT_X_NSGI, AIM_MEDICAL_DEPOSIT_Y_NSGI, AIM_MEDICAL_DEPOSIT_WIDTH_NSGI, 2, AIM_FONT12ARIAL, AIM_M_COLOR_DYNAMIC_TEXT,	sMedicalString, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
 		}
+#endif // JA2UB
+
 		if(!g_bUseXML_Strings)
 		{
 		//	LoadMercBioInfo( gbCurrentSoldier, MercInfoString, AdditionalInfoString);
@@ -1363,6 +1383,10 @@ BOOLEAN	UpdateMercInfo(void)
 	}
 	else
 	{
+#ifdef JA2UB
+		DrawMoneyToScreen(gMercProfiles[gbCurrentSoldier].uiWeeklySalary, FEE_WIDTH, FEE_X_UB, FEE_Y_UB, AIM_M_NUMBER_FONT, AIM_M_COLOR_DYNAMIC_TEXT);
+		DisplayWrappedString(AIM_OFFER_X, AGILITY_Y, AIM_OFFER_WIDTH, 2, AIM_M_FONT_DYNAMIC_TEXT, AIM_FONT_MCOLOR_WHITE, zNewTacticalMessages[TACT_MSG__AIMMEMBER_FEE_TEXT], FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
+#else
 		//Display the salaries
 		DrawMoneyToScreen(gMercProfiles[gbCurrentSoldier].sSalary, FEE_WIDTH, FEE_X, HEALTH_Y, AIM_M_NUMBER_FONT, AIM_M_COLOR_DYNAMIC_TEXT	);
 		DrawMoneyToScreen(gMercProfiles[gbCurrentSoldier].uiWeeklySalary, FEE_WIDTH, FEE_X, AGILITY_Y, AIM_M_NUMBER_FONT, AIM_M_COLOR_DYNAMIC_TEXT	);
@@ -1389,6 +1413,7 @@ BOOLEAN	UpdateMercInfo(void)
 			else
 				DisplayWrappedString(AIM_MEDICAL_DEPOSIT_X, AIM_MEDICAL_DEPOSIT_Y, AIM_MEDICAL_DEPOSIT_WIDTH, 2, AIM_FONT12ARIAL, AIM_M_COLOR_DYNAMIC_TEXT,	sMedicalString, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED);
 		}
+#endif
 		if(!g_bUseXML_Strings)
 		{
 //			LoadMercBioInfo( gbCurrentSoldier, MercInfoString, AdditionalInfoString);
@@ -2529,6 +2554,21 @@ BOOLEAN DisplayVideoConferencingDisplay()

 	DisplayMercChargeAmount();

+#ifdef JA2UB
+	if (gubVideoConferencingMode == AIM_VIDEO_HIRE_MERC_MODE)
+	{
+		CHAR16	offerText[190];
+		swprintf(offerText, zNewTacticalMessages[TACT_MSG__AIMMEMBER_ONE_TIME_FEE], gMercProfiles[gbCurrentSoldier].zNickname);
+		const auto xCoord = AIM_MEMBER_VIDEO_CONF_TERMINAL_X + 115;
+		const auto yCoord = AIM_MEMBER_VIDEO_CONF_TERMINAL_Y + 45;
+		const auto textAreaWidth = 245;
+		SetFontShadow(AIM_M_VIDEO_NAME_SHADOWCOLOR);
+		DisplayWrappedString(xCoord, yCoord, textAreaWidth, 2, AIM_M_FONT_DYNAMIC_TEXT, FONT_MCOLOR_BLACK, offerText, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
+		SetFontShadow(DEFAULT_SHADOW);
+	}
+#endif // JA2UB
+
+
 //	if( gfMercIsTalking && !gfIsAnsweringMachineActive)
 	if( gfMercIsTalking && gGameSettings.fOptions[ TOPTION_SUBTITLES ] )
 	{
@@ -2578,6 +2618,9 @@ BOOLEAN DisplayMercsVideoFace()

 void DisplaySelectLights(BOOLEAN fContractDown, BOOLEAN fBuyEquipDown)
 {
+#ifdef JA2UB
+	return;
+#else
 	UINT16 i, usPosY, usPosX;

 	//First draw the select light for the contract length buttons
@@ -2631,6 +2674,8 @@ void DisplaySelectLights(BOOLEAN fContractDown, BOOLEAN fBuyEquipDown)
 		usPosY += AIM_MEMBER_BUY_EQUIPMENT_GAP;
 	}
 	InvalidateRegion(LAPTOP_SCREEN_UL_X,LAPTOP_SCREEN_WEB_UL_Y,LAPTOP_SCREEN_LR_X,LAPTOP_SCREEN_WEB_LR_Y);
+
+#endif // JA2UB
 }


@@ -2654,7 +2699,10 @@ UINT32 DisplayMercChargeAmount()
 		giContractAmount = 0;

 		//the contract charge amount
-
+#ifdef JA2UB
+		// Special offer for a limited time! Act fast!
+		giContractAmount = gMercProfiles[gbCurrentSoldier].uiWeeklySalary;
+#else
 		// Get the salary rate
 		if( gubContractLength == AIM_CONTRACT_LENGTH_ONE_DAY)
 			giContractAmount = gMercProfiles[gbCurrentSoldier].sSalary;
@@ -2676,6 +2724,7 @@ UINT32 DisplayMercChargeAmount()
 		{
 			giContractAmount += gMercProfiles[gbCurrentSoldier].usOptionalGearCost;
 		}
+#endif
 	}


@@ -2686,10 +2735,15 @@ UINT32 DisplayMercChargeAmount()
 	//if the merc hasnt just been hired
 //	if( FindSoldierByProfileID( gbCurrentSoldier, TRUE ) == NULL )
 	{
+#ifdef JA2UB
+		// Don't even have to pay for medical insurance! What a DEAL!
+		swprintf(wTemp, L"%s", wDollarTemp);
+#else
 		if( gMercProfiles[ gbCurrentSoldier ].bMedicalDeposit )
 			swprintf(wTemp, L"%s %s", wDollarTemp, VideoConfercingText[AIM_MEMBER_WITH_MEDICAL] );
 		else
 			swprintf(wTemp, L"%s", wDollarTemp );
+#endif // JA2UB

 		DrawTextToScreen(wTemp, AIM_CONTRACT_CHARGE_AMOUNNT_X+1, AIM_CONTRACT_CHARGE_AMOUNNT_Y+3, 0, AIM_M_VIDEO_CONTRACT_AMOUNT_FONT, AIM_M_VIDEO_CONTRACT_AMOUNT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 	}
@@ -3888,14 +3942,14 @@ BOOLEAN InitDeleteVideoConferencePopUp( )
 		MSYS_DisableRegion(&gSelectedShutUpMercRegion);

 		//Enable the ability to click on the BIG face to go to different screen
-	MSYS_EnableRegion(&gSelectedFaceRegion);
+		MSYS_EnableRegion(&gSelectedFaceRegion);

 //		EnableDisableCurrentVideoConferenceButtons(FALSE);
-			if( gubVideoConferencingPreviousMode == AIM_VIDEO_HIRE_MERC_MODE )
-			{
-				// Enable the current video conference buttons
-				EnableDisableCurrentVideoConferenceButtons(FALSE);
-			}
+		if( gubVideoConferencingPreviousMode == AIM_VIDEO_HIRE_MERC_MODE )
+		{
+			// Enable the current video conference buttons
+			EnableDisableCurrentVideoConferenceButtons(FALSE);
+		}


 		fVideoConferenceCreated = FALSE;
@@ -4086,6 +4140,22 @@ BOOLEAN InitDeleteVideoConferencePopUp( )

 //		InitVideoFaceTalking(gbCurrentSoldier, QUOTE_LENGTH_OF_CONTRACT);
 		DelayMercSpeech( gbCurrentSoldier, QUOTE_LENGTH_OF_CONTRACT, 750, TRUE, FALSE );
+
+#ifdef JA2UB
+		// Disable and hide contract length & gear purchase buttons
+		gfBuyEquipment = TRUE;
+		for (size_t i = 0; i < 3; i++)
+		{
+			DisableButton(giContractLengthButton[i]);
+			HideButton(giContractLengthButton[i]);
+
+			if (i < 2)
+			{
+				DisableButton(giBuyEquipmentButton[i]);
+				HideButton(giBuyEquipmentButton[i]);
+			}
+		}
+#endif // JA2UB
 	}


@@ -5298,11 +5368,17 @@ BOOLEAN DisplayShadedStretchedMercFace( UINT8 ubMercID, UINT16 usPosX, UINT16 us
 void DemoHiringOfMercs( )
 {
 	INT16	i;
-	#ifdef GERMAN
-		UINT8	MercID[]={ 7, 10, 4, 14, 50 };
-	#else
-		UINT8	MercID[]={ 7, 10, 4, 42, 33 };
-	#endif
+	UINT8 MercID[5];
+	MercID[0] = 7;
+	MercID[1] = 10;
+	MercID[2] = 4;
+	if( g_lang == i18n::Lang::de ) {
+		MercID[3] = 14;
+		MercID[4] = 50;
+	} else {
+		MercID[3] = 42;
+		MercID[4] = 33;
+	}
 	MERC_HIRE_STRUCT HireMercStruct;
 	static BOOLEAN	fHaveCalledBefore=FALSE;

@@ -5393,20 +5469,20 @@ void DisplayPopUpBoxExplainingMercArrivalLocationAndTime( )
 	//create the string to display to the user, looks like....
 	//	L"%s should arrive at the designated drop-off point ( sector %d:%d %s ) on day %d, at approximately %s.",		//first %s is mercs name, next is the sector location and name where they will be arriving in, lastely is the day an the time of arrival

-#ifdef GERMAN
+if( g_lang == i18n::Lang::de ) {
 	//Germans version has a different argument order
 	swprintf( szLocAndTime, pMessageStrings[ MSG_JUST_HIRED_MERC_ARRIVAL_LOCATION_POPUP ],
 							gMercProfiles[ pSoldier->ubProfile ].zNickname,
 							LaptopSaveInfo.sLastHiredMerc.uiArrivalTime / 1440,
 							zTimeString,
 							zSectorIDString );
-#else
+} else {
 	swprintf( szLocAndTime, pMessageStrings[ MSG_JUST_HIRED_MERC_ARRIVAL_LOCATION_POPUP ],
 							gMercProfiles[ pSoldier->ubProfile ].zNickname,
 							zSectorIDString,
 							LaptopSaveInfo.sLastHiredMerc.uiArrivalTime / 1440,
 							zTimeString );
-#endif
+}



@@ -627,7 +627,7 @@ TestTable::Display( )
 				{
 					MSYS_DefineRegion( &it->mMouseRegion[i - mFirstEntryShown],
 						usPosX, usPosY, usPosX + it->GetRequiredLength(), usPosY + heightperrow,
-						MSYS_PRIORITY_HIGHEST, CURSOR_WWW,
+						MSYS_PRIORITY_HIGHEST-3, CURSOR_WWW,
 						MSYS_NO_CALLBACK, ( *it ).RegionClickCallBack );
 					MSYS_AddRegion( &it->mMouseRegion[i - mFirstEntryShown] );

@@ -20,6 +20,7 @@
 	// HEADROCK HAM 4
 	#include "input.h"
 	#include "Encyclopedia_new.h"	//update encyclopedia item visibility when viewing that item
+	#include <language.hpp>


 #define		BOBBYR_DEFAULT_MENU_COLOR					255
@@ -115,11 +116,7 @@
 #define		BOBBYR_ITEM_QTY_NUM_X							BOBBYR_GRIDLOC_X + 105//BOBBYR_ITEM_COST_TEXT_X + 1
 #define		BOBBYR_ITEM_QTY_NUM_Y							BOBBYR_ITEM_QTY_TEXT_Y//BOBBYR_ITEM_COST_TEXT_Y + 40

-#ifdef CHINESE
-	#define		BOBBYR_ITEMS_BOUGHT_X							BOBBYR_GRIDLOC_X + 105 - BOBBYR_ORDER_NUM_WIDTH - 10	//BOBBYR_ITEM_QTY_NUM_X
-#else
-	#define		BOBBYR_ITEMS_BOUGHT_X							BOBBYR_GRIDLOC_X + 105 - BOBBYR_ORDER_NUM_WIDTH//BOBBYR_ITEM_QTY_NUM_X
-#endif
+#define		BOBBYR_ITEMS_BOUGHT_X							BOBBYR_GRIDLOC_X + 105 - BOBBYR_ORDER_NUM_WIDTH//BOBBYR_ITEM_QTY_NUM_X

 #define		BOBBY_RAY_NOT_PURCHASED						255
 #define		BOBBY_RAY_MAX_AMOUNT_OF_ITEMS_TO_PURCHASE		200
@@ -2506,7 +2503,11 @@ void DisplayItemNameAndInfo(UINT16 usPosY, UINT16 usIndex, UINT16 usBobbyIndex,
 		if( ubPurchaseNumber != BOBBY_RAY_NOT_PURCHASED)
 		{
 			swprintf(sTemp, L"% 4d", BobbyRayPurchases[ ubPurchaseNumber ].ubNumberPurchased);
-			DrawTextToScreen(sTemp, BOBBYR_ITEMS_BOUGHT_X, (UINT16)usPosY, 0, FONT14ARIAL, BOBBYR_ITEM_DESC_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
+			auto bobbyRItemsBoughtX{ BOBBYR_ITEMS_BOUGHT_X };
+			if (g_lang == i18n::Lang::zh) {
+				bobbyRItemsBoughtX -= 10;
+			}
+			DrawTextToScreen(sTemp, bobbyRItemsBoughtX, (UINT16)usPosY, 0, FONT14ARIAL, BOBBYR_ITEM_DESC_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 		}
 	}

@@ -2516,11 +2517,11 @@ void DisplayItemNameAndInfo(UINT16 usPosY, UINT16 usIndex, UINT16 usBobbyIndex,
 	//if it's a used item, display how damaged the item is
 	if( fUsed )
 	{
-		#ifdef CHINESE
+		if ( g_lang == i18n::Lang::zh ) {
 			swprintf( sTemp, ChineseSpecString2, LaptopSaveInfo.BobbyRayUsedInventory[ usBobbyIndex ].ubItemQuality );//zww
-		#else
+		} else {
 			swprintf( sTemp, L"*%3d%%%%", LaptopSaveInfo.BobbyRayUsedInventory[ usBobbyIndex ].ubItemQuality );
-		#endif
+		}
 		
 		DrawTextToScreen(sTemp, (UINT16)(BOBBYR_ITEM_NAME_X-2), (UINT16)(usPosY - BOBBYR_ORDER_NUM_Y_OFFSET), BOBBYR_ORDER_NUM_WIDTH, BOBBYR_ITEM_NAME_TEXT_FONT, BOBBYR_ITEM_NAME_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 	}
@@ -30,6 +30,7 @@
 #include "GameSettings.h"
 #include <vfs/Core/vfs.h>
 #include <vfs/Core/File/vfs_file.h>
+#include <language.hpp>

 /*
 typedef struct
@@ -488,11 +489,11 @@ BOOLEAN EnterBobbyRMailOrder()
 	SetButtonCursor(guiBobbyRClearOrder, CURSOR_LAPTOP_SCREEN);
 	SpecifyDisabledButtonStyle( guiBobbyRClearOrder, DISABLED_STYLE_NONE );
 //inshy: fix position of text for buttons
-#ifdef FRENCH
+if(g_lang == i18n::Lang::fr) {
 	SpecifyButtonTextOffsets( guiBobbyRClearOrder, 13, 10, TRUE );
-#else
+} else {
 	SpecifyButtonTextOffsets( guiBobbyRClearOrder, 39, 10, TRUE );
-#endif
+}

 	// Accept Order button
 	guiBobbyRAcceptOrderImage = LoadButtonImage("LAPTOP\\AcceptOrderButton.sti", 2,0,-1,1,-1 );
@@ -504,11 +505,11 @@ BOOLEAN EnterBobbyRMailOrder()
 													DEFAULT_MOVE_CALLBACK, BtnBobbyRAcceptOrderCallback);
 	SetButtonCursor( guiBobbyRAcceptOrder, CURSOR_LAPTOP_SCREEN);
 //inshy: fix position of text for buttons
-#ifdef FRENCH
+if(g_lang == i18n::Lang::fr) {
 	SpecifyButtonTextOffsets( guiBobbyRAcceptOrder, 15, 24, TRUE );
-#else
+} else {
 	SpecifyButtonTextOffsets( guiBobbyRAcceptOrder, 43, 24, TRUE );
-#endif
+}
 	SpecifyDisabledButtonStyle( guiBobbyRAcceptOrder, DISABLED_STYLE_SHADED );

 	if( gbSelectedCity == -1 )
@@ -17,4 +17,4 @@ BOOLEAN DrawBriefingRoomDefaults();
 BOOLEAN DisplayBriefingRoomSlogan();
 BOOLEAN DisplayBriefingRoomCopyright();

-#endif
+#endif
@@ -17,4 +17,4 @@ BOOLEAN DrawBriefingRoomEnterDefaults();
 BOOLEAN DisplayBriefingRoomEnterSlogan();
 BOOLEAN DisplayBriefingRoomEnterCopyright();

-#endif
+#endif
@@ -133,4 +133,4 @@ extern BOOLEAN SaveBriefingRoomToSaveGameFile( HWFILE hFile );



-#endif
+#endif
@@ -3,4 +3,4 @@



-#endif	// __CAMPAIGNHISTORY_DATA_H
+#endif	// __CAMPAIGNHISTORY_DATA_H
@@ -27,4 +27,4 @@ void ExitCampaignHistory_News();
 void HandleCampaignHistory_News();
 void RenderCampaignHistory_News();

-#endif	// __CAMPAIGNHISTORY_SUMMARY_H
+#endif	// __CAMPAIGNHISTORY_SUMMARY_H
@@ -332,4 +332,4 @@ STR16	GetIncidentName( UINT32 aIncidentId );

 UINT32 GetIdOfCurrentlyOngoingIncident();

-#endif	// __CAMPAIGNSTATS_H
+#endif	// __CAMPAIGNSTATS_H
@@ -7,4 +7,4 @@ void ExitIMPAboutUs( void );
 void EnterIMPAboutUs( void );
 void HandleIMPAboutUs( void );

-#endif
+#endif
@@ -8,4 +8,4 @@ void HandleIMPAttributeEntrance( void );



-#endif
+#endif
@@ -7,4 +7,4 @@ void RenderIMPAttributeFinish( void );
 void ExitIMPAttributeFinish( void );
 void HandleIMPAttributeFinish( void );

-#endif
+#endif
@@ -22,4 +22,4 @@ extern BOOLEAN fReturnStatus;

 INT8 StartingLevelChosen(); // added - SANDRO

-#endif
+#endif
@@ -24,6 +24,7 @@
 	#include "text.h"
 	#include "LaptopSave.h"

+#include <language.hpp>

 #define FULL_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 138
 #define NICK_NAME_CURSOR_Y LAPTOP_SCREEN_WEB_UL_Y + 195
@@ -552,14 +553,14 @@ void HandleBeginScreenTextEvent( UINT32 uiKey )
 		//Heinz (18.01.2009): Russian layout
 		// ViSoR (07.01.2012) : Russian and Belarussian layouts
 		//
-#if defined(RUSSIAN) || defined(BELARUSSIAN)
+if(g_lang == i18n::Lang::ru) {
 		// ViSoR (02.02.2013): Fix for Cyrillic layouts
 		DWORD threadId = GetWindowThreadProcessId( ghWindow, 0 );
 		DWORD layout = (DWORD)GetKeyboardLayout( threadId ) & 0xFFFF;
 		if( layout == 0x419 ) // Russian
 		{
 			unsigned char TranslationTable[] = 
-				" #Ý####ý####á-þ.0123456789ÆæÁ#Þ,#ÔÈÑÂÓÀÏÐØÎËÄÜÒÙÇÉÊÛÅÃÌÖ×Íßõ#ú#_¸ôèñâóàïðøîëäüòùçéêûåãìö÷íÿÕ#Ú¨";
+				" #Ý####ý####á-þ.0123456789ÆæÁ#Þ,#ÔÈÑÂÓÀÏÐØÎËÄÜÒÙÇÉÊÛÅÃÌÖ×Íßõ#ú#_¸ôèñâóàïðøîëäüòùçéêûåãìö÷íÿÕ#Ú¨ ";

 			uiKey = TranslateKey( uiKey, TranslationTable );
 			uiKey = GetCyrillicUnicodeChar( uiKey );
@@ -567,28 +568,23 @@ void HandleBeginScreenTextEvent( UINT32 uiKey )
 		else if( layout == 0x423 ) // Belarussian
 		{
 			unsigned char TranslationTable[] = 
-				" #Ý####ý####á-þ.0123456789ÆæÁ#Þ,#Ô²ÑÂÓÀÏÐØÎËÄÜÒ¡ÇÉÊÛÅÃÌÖ×Íßõ#'#_¸ô³ñâóàïðøîëäüò¢çéêûåãìö÷íÿÕ#'¨";
+				" #Ý####ý####á-þ.0123456789ÆæÁ#Þ,#Ô²ÑÂÓÀÏÐØÎËÄÜÒ¡ÇÉÊÛÅÃÌÖ×Íßõ#'#_¸ô³ñâóàïðøîëäüò¢çéêûåãìö÷íÿÕ#'¨ ";

 			uiKey = TranslateKey( uiKey, TranslationTable );
 			uiKey = GetCyrillicUnicodeChar( uiKey );
 		}
 		else if( !CheckIsKeyValid( uiKey ) )
 			uiKey = '#';
-
-		if( uiKey != '#')
-#else
-	#ifndef USE_CODE_PAGE
-		if( uiKey >= 'A' && uiKey <= 'Z' ||
+}
+		if( (g_lang != i18n::Lang::ru &&
+			uiKey >= 'A' && uiKey <= 'Z' ||
 					uiKey >= 'a' && uiKey <= 'z' ||
 					uiKey >= '0' && uiKey <= '9' ||
 					uiKey == '_' || uiKey == '.' ||
 					uiKey == ' ' || uiKey == '"' ||
 					uiKey == 39 // This is ' which cannot be written explicitly here of course
-					)
-	#else
-		if( charSet::IsFromSet( uiKey, charSet::CS_SPACE|charSet::CS_ALPHA_NUM|charSet::CS_SPECIAL_ALPHA ) )
-	#endif
-#endif
+					) ||
+			uiKey != '#')
 		{
 			// if the current string position is at max or great, do nothing
 			switch( ubTextEnterMode )
@@ -9,4 +9,4 @@ void HandleIMPBeginScreen( void );



-#endif
+#endif
@@ -7,4 +7,4 @@ void RenderIMPCharacterAndDisabilityEntrance( void );
 void ExitIMPCharacterAndDisabilityEntrance( void );
 void HandleIMPCharacterAndDisabilityEntrance( void );

-#endif
+#endif
@@ -20,4 +20,4 @@ void ClearAllSkillsList( void );

 extern STR8 pPlayerSelectedFaceFileNames[ NUMBER_OF_PLAYER_PORTRAITS ];
 extern STR8 pPlayerSelectedBigFaceFileNames[ NUMBER_OF_PLAYER_PORTRAITS ];
-#endif
+#endif
@@ -10,4 +10,4 @@ void HandleIMPFinish( void );
 extern BOOLEAN fFinishedCharGeneration; 


-#endif
+#endif
@@ -15,4 +15,4 @@ void HandleImpHomePage( void );
 #define IMP_MERC_FILENAME "IMP"

 extern INT32 GlowColorsList[][3];
-#endif
+#endif
@@ -29,4 +29,4 @@ enum
 	IMP__FINISH,
 };

-#endif
+#endif
@@ -9,4 +9,4 @@ void HandleIMPPersonalityEntrance( void );

 STR16 pSkillTraitBeginIMPStrings[];

-#endif
+#endif
@@ -9,4 +9,4 @@ void HandleIMPPersonalityFinish( void );
 extern UINT8 bPersonalityEndState; 


-#endif
+#endif
@@ -12,4 +12,4 @@ void BltAnswerIndents( INT32 iNumberOfIndents );
 extern INT32 giCurrentPersonalityQuizQuestion;
 extern INT32 iCurrentAnswer;

-#endif
+#endif
@@ -10,4 +10,4 @@ BOOLEAN RenderPortrait( INT16 sX, INT16 sY );
 extern INT32 iPortraitNumber;


-#endif
+#endif
@@ -38,6 +38,7 @@
 	#include "GameSettings.h"
 #endif

+#include <language.hpp>

 #define IMP_SEEK_AMOUNT 5 * 80 * 2

@@ -204,18 +205,18 @@ void PrintImpText( void )
 			LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 81, LAPTOP_SCREEN_WEB_UL_Y + 259, ( 640	), IMP_BEGIN_6, FONT14ARIAL, FONT_BLACK, FALSE, 0);

 //inshy (18.01.2009): fix position for russian text
-	#ifdef RUSSIAN
+	if( g_lang == i18n::Lang::ru ) {
 			// male
 			LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 225, LAPTOP_SCREEN_WEB_UL_Y + 259, ( 640	), IMP_BEGIN_10, FONT14ARIAL, FONT_BLACK, FALSE, 0);
 			// female
 			LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 335, LAPTOP_SCREEN_WEB_UL_Y + 259, ( 640	), IMP_BEGIN_11, FONT14ARIAL, FONT_BLACK, FALSE, 0);
-	#else
+	} else {
 			// male
 			LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 240, LAPTOP_SCREEN_WEB_UL_Y + 259, ( 640	), IMP_BEGIN_10, FONT14ARIAL, FONT_BLACK, FALSE, 0);

 			// female
 			LoadAndDisplayIMPText( LAPTOP_SCREEN_UL_X + 360, LAPTOP_SCREEN_WEB_UL_Y + 259, ( 640	), IMP_BEGIN_11, FONT14ARIAL, FONT_BLACK, FALSE, 0);
-	#endif
+	}

 		break;
 		case ( IMP_PERSONALITY ):
@@ -145,4 +145,4 @@ enum{

 };

-#endif
+#endif
@@ -9,4 +9,4 @@ UINT32 PlayVoice( void );

 extern UINT32 iSelectedIMPVoiceSet;

-#endif
+#endif
@@ -835,4 +835,4 @@ template<>  void	TestTableTemplate<3>::Init( UINT16 sX, UINT16 sY, UINT16 sX_End
 	AddColumnDataProvider( itemnamecol );*/

 	TestTable::Init( sX, sY, sX_End, sY_End );
-}
+}
@@ -851,4 +851,4 @@ BOOLEAN LoadPMC( HWFILE hwFile )
 	}

 	return TRUE;
-}
+}
@@ -254,4 +254,4 @@ private:
 protected:
 };

-#endif
+#endif
@@ -305,4 +305,4 @@ enum{
 };
 #endif

-#endif
+#endif
@@ -227,4 +227,4 @@ BOOLEAN WriteAimAvailability(STR fileName)
 	FileClose( hFile );

 	return( TRUE );
-}
+}
@@ -287,4 +287,4 @@ BOOLEAN WriteMercAvailability(STR fileName)
 	FileClose( hFile );

 	return( TRUE );
-}
+}
@@ -268,4 +268,4 @@ BOOLEAN ReadInDeliveryMethods(STR fileName)
 	

 	return( TRUE );
-}
+}
@@ -236,4 +236,4 @@ BOOLEAN ReadInShippingDestinations(STR fileName, BOOLEAN localizedVersion)
 	XML_ParserFree(parser);

 	return( TRUE );
-}
+}
@@ -16,4 +16,4 @@ void RenderFloristCards();

 extern INT8			gbCurrentlySelectedCard;

-#endif
+#endif
@@ -21,4 +21,4 @@ extern	UINT32	guiCurrentlySelectedFlower;
 extern	UINT8		gubCurFlowerIndex;


-#endif
+#endif
@@ -12,4 +12,4 @@ void InitFloristOrderForm();

 void InitFloristOrderFormVariables();

-#endif
+#endif
@@ -7,4 +7,4 @@ void ExitInsuranceComments();
 void HandleInsuranceComments();
 void RenderInsuranceComments();

-#endif
+#endif
@@ -9,4 +9,4 @@ void RenderInsuranceInfo();
 void EnterInitInsuranceInfo();	


-#endif
+#endif
@@ -9,4 +9,4 @@ void RenderMercsAccount();

 UINT32	CalculateHowMuchPlayerOwesSpeck();

-#endif
+#endif
@@ -418,6 +418,34 @@ BOOLEAN EnterMercsFiles()
 	return( TRUE );
 }

+static void TryToHireMERC()
+{
+	if ( (gMercProfiles[GetAvailableMercIDFromMERCArray( gubCurMercIndex )].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS) && !gGameExternalOptions.fGearKitsAlwaysAvailable )
+	{
+		//bought gear before
+		fMercBuyEquipment = 0;
+		MercProcessHireAfterGear();
+	}
+	else
+	{
+#ifdef JA2UB
+		if ( gSelectedMercKit == 0 ) // First kit is free, due to M.E.R.C special offer
+		{
+			fMercBuyEquipment = 1;
+			MercProcessHireAfterGear();
+		}
+		else
+		{
+			//prompt to buy gear
+			DoLapTopMessageBox( MSG_BOX_BLUE_ON_GREY, MercInfo[MERC_FILES_BUY_GEAR], LAPTOP_SCREEN, MSG_BOX_FLAG_YESNO, MercHireButtonGearYesNoCallback );
+		}
+#else
+		//prompt to buy gear
+		DoLapTopMessageBox( MSG_BOX_BLUE_ON_GREY, MercInfo[MERC_FILES_BUY_GEAR], LAPTOP_SCREEN, MSG_BOX_FLAG_YESNO, MercHireButtonGearYesNoCallback );
+#endif // JA2UB
+	}
+}
+
 void SelectMercsFaceRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
 {
 	if (iReason & MSYS_CALLBACK_REASON_RBUTTON_UP)
@@ -442,15 +470,7 @@ void SelectMercsFaceRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason )
 		//else try to hire the merc
 		else
 		{
-			if ( (gMercProfiles[ GetAvailableMercIDFromMERCArray( gubCurMercIndex ) ].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS) && !gGameExternalOptions.fGearKitsAlwaysAvailable )
-			{	
-				//bought gear before
-				fMercBuyEquipment = 0;
-				MercProcessHireAfterGear();
-			}
-			else
-				//prompt to buy gear
-				DoLapTopMessageBox( MSG_BOX_BLUE_ON_GREY, MercInfo[ MERC_FILES_BUY_GEAR ], LAPTOP_SCREEN, MSG_BOX_FLAG_YESNO, MercHireButtonGearYesNoCallback );
+			TryToHireMERC();
 		}
 	}
 }
@@ -701,15 +721,7 @@ void BtnMercHireButtonCallback(GUI_BUTTON *btn,INT32 reason)
 			//else try to hire the merc
 			else
 			{
-				if ( (gMercProfiles[ GetAvailableMercIDFromMERCArray( gubCurMercIndex ) ].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS) && !gGameExternalOptions.fGearKitsAlwaysAvailable )
-				{	
-					//bought gear before
-					fMercBuyEquipment = 0;
-					MercProcessHireAfterGear();
-				}
-				else
-					//prompt to buy gear
-					DoLapTopMessageBox( MSG_BOX_BLUE_ON_GREY, MercInfo[ MERC_FILES_BUY_GEAR ], LAPTOP_SCREEN, MSG_BOX_FLAG_YESNO, MercHireButtonGearYesNoCallback );
+				TryToHireMERC();
 			}

 			InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
@@ -1040,14 +1052,25 @@ void DisplayMercsStats( UINT8 ubMercID )
 	DrawNumeralsToScreen(gMercProfiles[ ubMercID ].bMedical, 3, MERC_STATS_SECOND_NUM_COL_X, usPosY, MERC_STATS_FONT, ubColor);
 	usPosY += MERC_SPACE_BN_LINES;

-	//Daily Salary
-	DrawTextToScreen( MercInfo[MERC_FILES_SALARY], MERC_STATS_SECOND_COL_X, usPosY, 0, MERC_STATS_FONT, MERC_STATIC_STATS_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
+	//Merc Salary
+#ifdef JA2UB
+	// One time "Fee" instead of "Salary" per day
+	DrawTextToScreen( CharacterInfo[AIM_MEMBER_FEE], MERC_STATS_SECOND_COL_X, usPosY, 0, MERC_TITLE_FONT, MERC_TITLE_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );

-	usPosX = MERC_STATS_SECOND_COL_X + StringPixLength(MercInfo[MERC_FILES_SALARY], MERC_NAME_FONT);
-	swprintf(sString, L"%d", gMercProfiles[ ubMercID ].sSalary);
+	usPosX = MERC_STATS_SECOND_COL_X + StringPixLength( CharacterInfo[AIM_MEMBER_FEE], MERC_NAME_FONT );
+	swprintf( sString, L"%d", gMercProfiles[ubMercID].uiWeeklySalary );
 	InsertCommasForDollarFigure( sString );
 	InsertDollarSignInToString( sString );
-	swprintf(sTemp, L" %s", MercInfo[MERC_FILES_PER_DAY]);
+#else
+	DrawTextToScreen( MercInfo[MERC_FILES_SALARY], MERC_STATS_SECOND_COL_X, usPosY, 0, MERC_STATS_FONT, MERC_STATIC_STATS_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED );
+
+	usPosX = MERC_STATS_SECOND_COL_X + StringPixLength( MercInfo[MERC_FILES_SALARY], MERC_NAME_FONT );
+	swprintf( sString, L"%d", gMercProfiles[ubMercID].sSalary );
+	InsertCommasForDollarFigure( sString );
+	InsertDollarSignInToString( sString );
+	swprintf( sTemp, L" %s", MercInfo[MERC_FILES_PER_DAY] );
+#endif // JA2UB
+
 	wcscat( sString, sTemp );
 	DrawTextToScreen( sString, usPosX, usPosY, 95, MERC_NAME_FONT, MERC_DYNAMIC_STATS_COLOR, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED);

@@ -1059,14 +1082,27 @@ void DisplayMercsStats( UINT8 ubMercID )
 	if (gubCurMercFilesTogglePage == MERC_FILES_INV_PAGE)
 	{
 		//Gear Cost
-		usPosY = usPosY + 145;
+		usPosY = usPosY + 148;
 		DrawTextToScreen( MercInfo[MERC_FILES_GEAR], MERC_STATS_SECOND_COL_X, usPosY, 0, MERC_STATS_FONT, MERC_STATIC_STATS_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);
 		
-		if ( (gMercProfiles[ ubMercID ].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS ) 
-			&& ( !(gMercProfiles[ ubMercID ].ubMiscFlags2 & PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID) || gGameExternalOptions.fGearKitsAlwaysAvailable ) )
+		if ( (gMercProfiles[ubMercID].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS)
+			&& (!(gMercProfiles[ubMercID].ubMiscFlags2 & PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID) || gGameExternalOptions.fGearKitsAlwaysAvailable) )
+		{
 			gMercProfiles[ ubMercID ].usOptionalGearCost = 0;
+		}
+#ifdef JA2UB
+		if ( gSelectedMercKit == 0 ) // First kit is free, due to M.E.R.C special offer
+		{
+			gMercProfiles[ubMercID].usOptionalGearCost = 0;

-		swprintf(NsString, L"+ ");
+			// Special offer text above the gear cost
+			const auto y = usPosY - MERC_SPACE_BN_LINES + 2;
+			swprintf( NsString, MercInfo[MERC_FILES_SPECIAL_OFFER] );
+			DrawTextToScreen( NsString, usPosX, y, 95, MERC_TITLE_FONT, MERC_TITLE_COLOR, FONT_MCOLOR_BLACK, FALSE, RIGHT_JUSTIFIED );
+		}
+#endif // JA2UB
+
+		swprintf( NsString, L"+ " );
 		swprintf(sTemp, L"%d",gMercProfiles[ ubMercID ].usOptionalGearCost);
 		InsertCommasForDollarFigure( sTemp );
 		InsertDollarSignInToString( sTemp );
@@ -1078,7 +1114,11 @@ void DisplayMercsStats( UINT8 ubMercID )
 		DrawTextToScreen( MercInfo[MERC_FILES_TOTAL], MERC_STATS_SECOND_COL_X, usPosY, 0, MERC_NAME_FONT, MERC_STATIC_STATS_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED);

 		swprintf(N2sString, L"= ");
+#ifdef JA2UB
+		swprintf( sTemp, L"%d", gMercProfiles[ubMercID].usOptionalGearCost + gMercProfiles[ubMercID].uiWeeklySalary );
+#else
 		swprintf(sTemp, L"%d",gMercProfiles[ ubMercID ].usOptionalGearCost+gMercProfiles[ ubMercID ].sSalary);
+#endif
 		InsertCommasForDollarFigure( sTemp );
 		InsertDollarSignInToString( sTemp );
 		wcscat( N2sString, sTemp );
@@ -1175,6 +1215,22 @@ BOOLEAN MercFilesHireMerc(UINT8 ubMercID)
 		return(FALSE);//not enough big ones $$$sATMText
 	}

+#ifdef JA2UB
+	Namount = 0;
+	Namount += gMercProfiles[ubMercID].uiWeeklySalary;
+	if ( gSelectedMercKit > 0 )
+	{
+		Namount += gMercProfiles[ubMercID].usOptionalGearCost;
+	}
+
+	if ( Namount > LaptopSaveInfo.iCurrentBalance )
+	{
+		DoLapTopMessageBox( MSG_BOX_LAPTOP_DEFAULT, sATMText[4], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL );
+		return(FALSE);//not enough big ones $$$sATMText
+	}
+#endif // JA2UB
+
+
 	bReturnCode = HireMerc( &HireMercStruct );

 	//already have limit of mercs on the team
@@ -1196,16 +1252,25 @@ BOOLEAN MercFilesHireMerc(UINT8 ubMercID)
 			AddTransactionToPlayersBook( HIRED_MERC, ubMercID, GetWorldTotalMin(), Namount );
 		}
 		
-		#ifdef JA2UB
+#ifdef JA2UB
 		//add an entry in the finacial page for the hiring of the merc
-		AddTransactionToPlayersBook(PAY_SPECK_FOR_MERC, ubMercID, GetWorldTotalMin(), -(INT32)( gMercProfiles[ubMercID].uiWeeklySalary ) );
-		#endif
+		INT32 totalCost = gMercProfiles[ubMercID].uiWeeklySalary;
+		if ( gSelectedMercKit > 0 ) // First kit is included in the initial fee
+		{
+			totalCost += gMercProfiles[ubMercID].usOptionalGearCost;
+		}
+		AddTransactionToPlayersBook(PAY_SPECK_FOR_MERC, ubMercID, GetWorldTotalMin(), -totalCost );
+#endif

 		//JMich_MMG: Setting the flag that we bought the gear and still haven't paid for it if we succesfully hired the merc
 		if ( fMercBuyEquipment )
 		{
 			gMercProfiles[ ubMercID ].ubMiscFlags |= PROFILE_MISC_FLAG_ALREADY_USED_ITEMS;
+#ifdef JA2UB
+			// Gear cost gets added to initial hiring fee in UB
+#else
 			gMercProfiles[ ubMercID ].ubMiscFlags2 |= PROFILE_MISC_FLAG2_MERC_GEARKIT_UNPAID;
+#endif // JA2UB
 		}

 		return(TRUE);
@@ -1305,15 +1370,7 @@ void HandleMercsFilesKeyBoardInput( )
 						//else try to hire the merc
 						else
 						{
-							//bought gear before
-							if ( (gMercProfiles[ GetAvailableMercIDFromMERCArray( gubCurMercIndex ) ].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS) && !gGameExternalOptions.fGearKitsAlwaysAvailable )
-							{	
-								fMercBuyEquipment = 0;
-								MercProcessHireAfterGear();
-							}
-							//prompt to buy gear
-							else
-								DoLapTopMessageBox( MSG_BOX_BLUE_ON_GREY, MercInfo[ MERC_FILES_BUY_GEAR ], LAPTOP_SCREEN, MSG_BOX_FLAG_YESNO, MercHireButtonGearYesNoCallback );
+							TryToHireMERC();
 						}
 					}
 				break;
@@ -1783,11 +1840,22 @@ void MercWeaponKitSelectionUpdate(UINT8 selectedInventory)
 void MercHireButtonGearYesNoCallback (UINT8 bExitValue)
 {
 	//yes, buy gear
-	if( bExitValue == MSG_BOX_RETURN_YES )
+	if ( bExitValue == MSG_BOX_RETURN_YES )
+	{
 		fMercBuyEquipment = 1;
+	}
 	//no, no gear 
 	else
+	{
+#ifdef JA2UB
+		// Switch to the free, first kit
+		gSelectedMercKit = 0;
+		MercWeaponKitSelectionUpdate( gSelectedMercKit );
+		fMercBuyEquipment = 1;
+#else
 		fMercBuyEquipment = 0;
+#endif // JA2UB
+	}
 	
 	MercProcessHireAfterGear();
 }
@@ -1810,6 +1878,10 @@ void MercProcessHireAfterGear()

 void NextMercMember()
 {
+	// Reset selected kit, cannot assume next merc has more than 1 kit
+	gSelectedMercKit = 0;
+	MercWeaponKitSelectionUpdate( gSelectedMercKit );
+
 	if (gfKeyState [ CTRL ])
 		gubCurMercIndex = LaptopSaveInfo.gubLastMercIndex;
 	else if (gfKeyState [ SHIFT ])
@@ -1840,6 +1912,10 @@ void NextMercMember()

 void PrevMercMember()
 {
+	// Reset selected kit, cannot assume next merc has more than 1 kit
+	gSelectedMercKit = 0;
+	MercWeaponKitSelectionUpdate( gSelectedMercKit );
+
 	if (gfKeyState [ CTRL ])
 		gubCurMercIndex = 0;
 	else if (gfKeyState [ SHIFT ])
@@ -7,4 +7,4 @@ void ExitMercsFiles();
 void HandleMercsFiles();
 void RenderMercsFiles();

-#endif
+#endif
@@ -7,4 +7,4 @@ void ExitMercsNoAccount();
 void HandleMercsNoAccount();
 void RenderMercsNoAccount();

-#endif
+#endif
@@ -15,7 +15,7 @@
 #include "../../TileEngine/Isometric Utils.h"   // defines NOWHERE
 #include "../../Utils/Debug Control.h"          // LiveMessage
 #include "../../Utils/Font Control.h"           // ScreenMsg about deadlock
-#include "../../Utils/Text.h"                   // Sniper warning
+#include <Text.h>                               // Sniper warning
 #include "../../Utils/message.h"                // ditto


@@ -159,4 +159,4 @@ namespace ja2
 	{
 		void InitializeMultiplayerProfile(vfs::Path const& profileRoot);
 	}
-}
+}
@@ -88,4 +88,4 @@ void WriteAsynch( HANDLE handle, ExtendedOverlappedStruct *extended );
 BOOL ReadAsynch( HANDLE handle, ExtendedOverlappedStruct *extended );

 #endif
-*/
+*/
--- a/Show More
+++ b/Show More