Fixed tagged releases #2

Fixed tagged releases

.github/workflows/build.yml

@@ -169,8 +169,6 @@ jobs:
     with:
       language: ${{ matrix.language }}
       assemble: ${{ needs.workflow_setup.outputs.assemble_release == 'true' }}
-      # TODO check if English and German build faster for code changes on master, if not remove caching
-      build-cache-enabled: ${{ matrix.language == 'English' || matrix.language == 'German' }}
       # at least English and some other lang have to work
       continue-on-error: ${{ matrix.language != 'English' && matrix.language != 'German' }}
 
@@ -188,7 +186,6 @@ jobs:
         merge-multiple: true
 
     - name: Checkout Repo
-      if: github.ref == 'refs/heads/master'
       uses: actions/checkout@v4
       with:
         path: source
@@ -215,7 +212,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 }}

.github/workflows/build_language.yml

@@ -13,11 +13,6 @@ on:
         required: true
         default: true
         type: boolean
-      build-cache-enabled:
-        description: 'enable sscache'
-        required: true
-        default: false
-        type: boolean
       continue-on-error:
         description: 'allows a language to fail, used when building all languages'
         required: false
@@ -32,8 +27,6 @@ jobs:
       fail-fast: false
       matrix:
         application: [ja2, ja2mapeditor, ja2ub, ja2ubmapeditor]
-    env:
-      SCCACHE_GHA_ENABLED: ${{ inputs.build-cache-enabled }}
 
     steps:
       - name: Checkout source
@@ -61,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:]')
@@ -82,19 +85,9 @@ jobs:
       - uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: x86
-      - name: Prepare build cache
-        if: ${{ inputs.build-cache-enabled }}
-        uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: ${{ inputs.language }}_${{ matrix.application }}
-          save: ${{ github.ref == 'refs/heads/master' }}
-          variant: sccache
       - name: Prepare build
-        run: >
+        run: |
-          cmake -S . -B build -GNinja
+          cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DLanguages="$Env:JA2Language" -DApplications="$Env:JA2Application" -DLTO_OPTION="$Env:LTO"
-          -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
-          -DCMAKE_BUILD_TYPE=Release
-          -DLanguages="$Env:JA2Language" -DApplications="$Env:JA2Application"
       - name: Build
         run: |
           cmake --build build/ -- -v

.gitignore

@@ -6,6 +6,6 @@
 /.vs/
 /build/
 /out/
+/CMakePresets.json
 /CMakeSettings.json
-/CMakeUserPresets.json
 /lib/

CMakeLists.txt

@@ -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")
+  message(STATUS "AddressSanitizer ENABLED for non-Release builds")
-	add_compile_options($<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>,-fsanitize=address,>)
+  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
+# static libraries whose translation units don't rely on Application preprocessor definitions.
-# by header files do not rely on Applications or Languages preprocessor definitions,
+add_subdirectory(lua)
-# and therefore only need to be compiled once. Good.
-add_subdirectory(Lua)
 add_subdirectory(Multiplayer)
+add_subdirectory(wine)
 
-# static libraries whose source files, header files or header files included
+set(Ja2_Libraries
-# by header files rely on Application and Language preprocessor definitions, and
+"${CMAKE_SOURCE_DIR}/binkw32.lib"
-# therefore need to be compiled multiple times. Very Bad.
+"${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
+  Console
-TacticalAI
+  Editor
-Utils
+  Ja2
-Strategic
+  Laptop
-sgp
+  ModularizedTacticalAI
-Laptop
+  sgp
-Editor
+  Strategic
-Console
+  Tactical
-Tactical
+  TacticalAI
-ModularizedTacticalAI
+  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,49 @@ 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
+foreach(app IN LISTS ApplicationTargets)
-# every library-language-executable combination is its own compilation target
+  set(isEditor $<STREQUAL:${app},JA2MAPEDITOR>)
-# TODO: refactor preprocessor usage onto, ideally, a single translation unit
+  set(isUb $<STREQUAL:${app},JA2UB>)
-foreach(lang IN LISTS LangTargets)
+  set(isUbEditor $<STREQUAL:${app},JA2UBMAPEDITOR>)
-	foreach(exe IN LISTS ApplicationTargets)
+  set(compilationFlags
-		set(Executable ${exe}_${lang})
+    $<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
+  foreach(lib IN LISTS Ja2_Libs)
-		add_executable(${Executable} WIN32)
+    # library for an application, e.g. JA2UB_sgp
-		target_sources(${Executable} PRIVATE ${Ja2Src})
+    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
+  foreach(lang IN LISTS LangTargets)
-		target_link_libraries(${Executable} PRIVATE ${Ja2_Libraries} $<IF:${usingMsBuild},legacy_stdio_definitions.lib,>)
+    # executable for an application/language combination, e.g. JA2_ENGLISH.exe
-		target_link_options(${Executable} PRIVATE $<IF:${usingMsBuild},/SAFESEH:NO,>)
+    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,>)
 
-		# for each app/lang combination, the Very Bad libraries need to be built,
+    # language library for an application, e.g. JA2MAPEDITOR_ENGLISH_i18n
-		# with the appropriate preprocessor definitions
+    set(language_library ${exe}_i18n)
-		foreach(lib IN LISTS Ja2_Libs)
+    add_library(${language_library})
-			# syntactic sugar to hopefully make this more readable
+    target_sources(${language_library} PRIVATE ${i18nSrc})
-			set(VeryBadLib ${Executable}_${lib})
+    target_compile_definitions(${language_library} PRIVATE ${compilationFlags} ${debugFlags} ${lang})
-			set(isEditor $<STREQUAL:${exe},JA2MAPEDITOR>)
+    target_link_libraries(${exe} PRIVATE ${language_library})
-			set(isUb $<STREQUAL:${exe},JA2UB>)
-			set(isUbEditor $<STREQUAL:${exe},JA2UBMAPEDITOR>)
 
-			# static library for an app/lang combination, e.g. JA2_ENGLISH_sgp.lib
+    # go through all game libraries again and link them to the app/language executable
-			add_library(${VeryBadLib})
+    foreach(lib IN LISTS Ja2_Libs)
-			target_sources(${VeryBadLib} PRIVATE ${${lib}Src})
+      target_link_libraries(${exe} PRIVATE ${app}_${lib})
+    endforeach()
+  endforeach()
 
-			target_compile_definitions(${VeryBadLib} PUBLIC
+  # for SGP only
-				$<IF:${isEditor},JA2EDITOR;JA2BETAVERSION,>
+  target_link_libraries(${app}_sgp PRIVATE "ddraw.lib" "${PROJECT_SOURCE_DIR}/fmodvc.lib")
-				$<IF:${isUb},JA2UB;JA2UBMAPS,>
+  target_link_libraries(${app}_sgp PRIVATE libpng)
-				$<IF:${isUbEditor},JA2UB;JA2UBMAPS;JA2EDITOR;JA2BETAVERSION,>
+  target_compile_definitions(${app}_sgp PRIVATE NO_ZLIB_COMPRESSION)
-				${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()
 endforeach()

Console/ComBSTROut.h

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

Console/ComVariantOut.h

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

Editor/Cursor Modes.h

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

Editor/Editor Modes.h

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

Editor/Editor Taskbar Creation.h

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

Editor/Editor Taskbar Utils.h

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

Editor/EditorItems.cpp

@@ -152,7 +152,7 @@ void EntryInitEditorItemsInfo()
 			item = &Item[i];
 			//if( Item[i].fFlags & ITEM_NOT_EDITOR )
 			//	continue;
-			if(item->notineditor)
+			if(ItemIsNotInEditor(i))
 				continue;
 			if( i == SWITCH || i == ACTION_ITEM )
 			{
@@ -331,7 +331,7 @@ void InitEditorItemsInfo(UINT32 uiItemType)
 				continue;
 			}
 			item = &Item[usCounter];
-			if(item->notineditor)
+			if(ItemIsNotInEditor(usCounter))
 			{
 				usCounter++;
 				continue;

Editor/LoadScreen.cpp

@@ -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;

Editor/LoadScreen.h

@@ -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
 

Editor/Road Smoothing.cpp

@@ -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 sdY = gRoadMacros[ i ].sOffset / OLD_WORLD_COLS;
+		INT32 sdX = gRoadMacros[ i ].sOffset -  (sdY*OLD_WORLD_COLS);
-		INT32 sOffset = sdY*WORLD_COLS + sdX;
+
+		// 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 );
+		// Converted to 200x200 map
-		RemoveAllObjectsOfTypeRange( iMapIndex + sOffset, ROADPIECES, ROADPIECES );//dnl this was but is very wrong and leading to stacking tilesets, RemoveAllObjectsOfTypeRange( i, ROADPIECES, ROADPIECES );
+		// []		[]		[-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++;
 	}
 }

Editor/Road Smoothing.h

@@ -61,4 +61,4 @@ void InitializeRoadMacros();
 
 #endif
 
-#endif
+#endif

Editor/Sector Summary.h

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

Editor/Smoothing Utils.h

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

Editor/editscreen.cpp

@@ -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 );
-		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 );
 
 	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;

Editor/selectwin.cpp

@@ -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,
+	BuildDisplayWindow( pDSpec, usNSpecs, &pDispList, &gSelection.displayAreaStart , &gSelection.displayAreaEnd,
-										&SelWinSpacing, CLEAR_BACKGROUND);
+										&gSelection.spacing, CLEAR_BACKGROUND);
 }
 
 
@@ -849,12 +871,14 @@ void RenderSelectionWindow( void )
 		return;
 
 	ColorFillVideoSurfaceArea(FRAME_BUFFER,
-													0, 0, 600, 400,
+		gSelection.window.iLeft, gSelection.window.iTop, gSelection.window.iRight, gSelection.window.iBottom,
-													GenericButtonFillColors[0]);
+		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 );
+			iEX = min( gSelection.displayAreaEnd.iX, iEX);
-			iSY = max( SelWinStartPoint.iY, iSY );
+			iSY = max( gSelection.displayAreaStart.iY, iSY );
-			iEY = min( 359, iEY );
+			iEY = min( gSelection.displayAreaEnd.iY, iEY );
-			iEY = max( SelWinStartPoint.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.iLeft = gSelection.displayAreaStart.iX;
-	NewRect.iTop = SelWinStartPoint.iY;
+	NewRect.iTop = gSelection.displayAreaStart.iY;
-	NewRect.iRight = SelWinEndPoint.iX;
+	NewRect.iRight = gSelection.displayAreaEnd.iX;
-	NewRect.iBottom = SelWinEndPoint.iY;
+	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 );
 

Ja2/CMakeLists.txt

@@ -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,25 +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)

Ja2/Cheats.h

@@ -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

Ja2/Credits.cpp

@@ -1,6 +1,5 @@
 	#include "Types.h"
 	#include "Credits.h"
-	#include "Language Defines.h"
 	#include "vsurface.h"
 	#include "mousesystem.h"
 	#include "Text.h"

Ja2/Fade Screen.cpp

@@ -681,13 +681,9 @@ BOOLEAN UpdateSaveBufferWithBackbuffer(void)
 	pSrcBuf = LockVideoSurface(FRAME_BUFFER, &uiSrcPitchBYTES);
 	pDestBuf = LockVideoSurface(guiSAVEBUFFER, &uiDestPitchBYTES);
 
-	if(gbPixelDepth==16)
+	Blt16BPPTo16BPP((UINT16 *)pDestBuf, uiDestPitchBYTES,
-	{
+				(UINT16 *)pSrcBuf, uiSrcPitchBYTES,
-		// BLIT HERE
+				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);

Ja2/Fade Screen.h

@@ -37,4 +37,4 @@ BOOLEAN HandleFadeInCallback( );
 void FadeInNextFrame( );
 void FadeOutNextFrame( );
 
-#endif
+#endif

Ja2/FeaturesScreen.cpp

@@ -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"

Ja2/GameSettings.cpp

@@ -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"
 
@@ -992,9 +991,17 @@ void LoadGameExternalOptions()
 	//Madd: set number of pItem files to be used
 	gGameExternalOptions.ubNumPItems					= iniReader.ReadInteger("Data File Settings","NUM_P_ITEMS", 3, 3, MAX_PITEMS);
 
+	//################# Backgrounds #################
+
 	// Flugente: backgrounds
-	gGameExternalOptions.fBackGround					= iniReader.ReadBoolean("Data File Settings", "BACKGROUNDS", TRUE );
+	gGameExternalOptions.fBackGround					= iniReader.ReadBoolean("Backgrounds", "ENABLE_BACKGROUNDS", TRUE );
-	
+
+	// Kitty: show additional IMP backgrounds and determine which IMP backgrounds are available at selection based on choices for skills, chararcter traits and disabilities
+    gGameExternalOptions.fAltIMPCreation                = iniReader.ReadBoolean("Backgrounds", "ALTERNATIVE_IMP_CREATION", FALSE);
+
+	// Kitty: only show additional IMP backgrounds enabled by AlternativeImpCreation (same rules which are shown as with AlternativeImpCreation)
+	gGameExternalOptions.fReducedIMPCreation            = iniReader.ReadBoolean("Backgrounds", "REDUCED_IMP_CREATION", FALSE);
+
 	//################# Merc Recruitment Settings #################
 	
 	// silversurfer: read early recruitment options 1=immediately (control Omerta), 2=early (control 1, 2, 3 towns including Omerta)
@@ -3786,7 +3793,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);

Ja2/GameSettings.h

@@ -337,6 +337,7 @@ BOOLEAN UsingBackGroundSystem();
 BOOLEAN UsingImprovedInterruptSystem();
 BOOLEAN UsingInventoryCostsAPSystem();
 
+
 BOOLEAN IsNIVModeValid(bool checkRes = true);
 
 // Snap: Options read from an INI file in the default of custom Data directory
@@ -1558,6 +1559,12 @@ typedef struct
 	
 	// Flugente: backgrounds
 	BOOLEAN fBackGround;
+
+	// Kitty: Alternative IMP Creation (choices in skills/char-traits/disabilities determine available backgrounds, plus additional available backgrounds)
+    BOOLEAN fAltIMPCreation;
+
+	// Kitty: Reduced IMP Backgrounds (same as fAltIMPCreation, but for this only the additional backgrounds)
+	BOOLEAN fReducedIMPCreation;
 	
 	// Sandro: Alternative weapon holding (rifles fired from hip / pistols fired one-handed)
 	UINT8 ubAllowAlternativeWeaponHolding;

Ja2/HelpScreen.h

@@ -72,4 +72,4 @@ void NewScreenSoResetHelpScreen( );
 INT8 HelpScreenDetermineWhichMapScreenHelpToShow();
 
 
-#endif
+#endif

Ja2/Init.cpp

@@ -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);
+			CHAR8 errorBuf[512]{"Failed loading LogicalBodyTypes external data!"};
-			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(Layers::Instance().LoadFromFile(directoryName, LBT_LAYERSFILENAME, errorBuf), errorBuf);
-			SGP_THROW_IFFALSE(FilterDB::Instance().LoadFromFile(directoryName, LBT_FILTERSFILENAME), LBT_FILTERSFILENAME);
+			SGP_THROW_IFFALSE(PaletteDB::Instance().LoadFromFile(directoryName, LBT_PALETTESFILENAME, errorBuf), errorBuf);
-			SGP_THROW_IFFALSE(BodyTypeDB::Instance().LoadFromFile(directoryName, LBT_BODYTYPESFILENAME), LBT_BODYTYPESFILENAME);
+			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( ) )
 	{

Ja2/Intro.cpp

@@ -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;

Ja2/Intro.h

@@ -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

Ja2/JA2 Splash.cpp

@@ -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 );

Ja2/JA2 Splash.h

@@ -6,4 +6,4 @@ void InitJA2SplashScreen();
 extern UINT32 guiSplashFrameFade;
 extern UINT32 guiSplashStartTime;
 
-#endif
+#endif

Ja2/Language Defines.cpp

@@ -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

Ja2/Language Defines.h

@@ -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

Ja2/MPChatScreen.h

@@ -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

Ja2/MPConnectScreen.h

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

Ja2/MPHostScreen.h

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

Ja2/MPScoreScreen.h

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

Ja2/MessageBoxScreen.h

@@ -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

Ja2/Options Screen.cpp

@@ -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"

Ja2/SaveLoadGame.cpp

@@ -138,7 +138,6 @@
 #include "Map Screen Interface Map Inventory.h"//dnl ch51 081009
 #include "Sys Globals.h"//dnl ch74 201013
 #include "Ambient Control.h"		// added by Flugente for HandleNewSectorAmbience(...)
-
 /////////////////////////////////////////////////////
 //
 // Local Defines
@@ -153,6 +152,7 @@
 #endif
 
 #include "LuaInitNPCs.h"
+#include <language.hpp>
 
 
 #ifdef JA2UB
@@ -177,7 +177,11 @@ extern void initMapViewAndBorderCoordinates(void);
 UINT32		guiNumberOfMapTempFiles;		//Test purposes
 UINT32		guiSizeOfTempFiles;
 CHAR			gzNameOfMapTempFile[128];
+#endif
+
 //#define LOADSAVEGAME_LOGTIME 1
+#ifdef LOADSAVEGAME_LOGTIME
+#include "TimeLogging.h"
 #endif
 
 extern		SOLDIERTYPE		*gpSMCurrentMerc;
@@ -3588,14 +3592,8 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 	alreadySaving = true;
 
 #ifdef LOADSAVEGAME_LOGTIME
-	// Flugente: log how long this takes
+	TimingLogInitialize("TimeLog_LoadSavedGame.txt");
-	clock_t starttime = clock();
-	clock_t t0;
-	clock_t t1 = starttime;
-
-	FILE* fp_timelog = fopen("LoadSavedGame_TimeLog.txt", "a");
 #endif
-
 	//clear out the save game header
 	memset( &SaveGameHeader, 0, sizeof( SAVED_GAME_HEADER ) );
 
@@ -3775,14 +3773,9 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 	//Create the name of the file
 	CreateSavedGameFileNameFromNumber( ubSaveGameID, zSaveGameName );
 #if LOADSAVEGAME_LOGTIME
-	if (fp_timelog)
+	TimingLogWrite("Save ");
-	{
+	TimingLogWrite(zSaveGameName);
-		fprintf(fp_timelog, "Save savegame: %s\n", zSaveGameName);
+	TimingLog("\nShutdown stuff", 10);
-
-		t0 = t1;
-		t1 = clock();
-		fprintf(fp_timelog, "Shutdown stuff\t\t\t\t\t\t\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-	}
 #endif
 
 	//if the file already exists, delete it
@@ -3919,12 +3912,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Tactical Status" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
+	TimingLog("SaveTacticalStatusToSavedGame", 6);
-		{
-			t0 = t1;
-			t1 = clock();
-			fprintf(fp_timelog, "SaveTacticalStatusFromSavedGame done\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-		}
 #endif
 
 
@@ -3966,12 +3954,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Laptop Info" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
+	TimingLog("SaveLaptopInfoToSavedGame", 7);
-		{
-			t0 = t1;
-			t1 = clock();
-			fprintf(fp_timelog, "SaveLaptopInfoFromSavedGame done\t\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-		}
 #endif
 
 	//
@@ -4003,12 +3986,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Soldier Structure" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
+	TimingLog("SaveSoldierStructure", 8);
-		{
-			t0 = t1;
-			t1 = clock();
-			fprintf(fp_timelog, "SaveSoldierStructure done\t\t\t\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-		}
 #endif
 
 
@@ -4071,12 +4049,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Strategic Information" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
+	TimingLog("SaveStrategicInfoToSavedFile", 6);
-		{
-			t0 = t1;
-			t1 = clock();
-			fprintf(fp_timelog, "SaveStrategicInfoFromSavedFile done\t\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-		}
 #endif
 
 	/*// Flugente: Save the strategic supply
@@ -4126,12 +4099,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Strategic Movement Groups" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
+	TimingLog("SaveStrategicMovementGroupsToSaveGameFile", 3);
-		{
-			t0 = t1;
-			t1 = clock();
-			fprintf(fp_timelog, "SaveStrategicMovementGroupsFromSavedGameFile done\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-		}
 #endif
 
 
@@ -4148,12 +4116,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "All the Map Temp files" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
+	TimingLog("SaveMapTempFilesToSavedGameFile", 6);
-		{
-			t0 = t1;
-			t1 = clock();
-			fprintf(fp_timelog, "SaveMapTempFilesFromSavedGameFile done\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-		}
 #endif
 
 	if( !SaveQuestInfoToSavedGameFile( hFile ) )
@@ -4319,12 +4282,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 	SaveGameFilePosition( FileGetPos( hFile ), "Militia Movement" );
 #endif
 #if LOADSAVEGAME_LOGTIME
-	if (fp_timelog)
+	TimingLog("SaveMilitiaMovementInformationToSaveGameFile", 2);
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf(fp_timelog, "SaveMilitiaMovementInformationFromSavedGameFile done\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-	}
 #endif
 
 	if( !SaveBulletStructureToSaveGameFile( hFile ) )
@@ -4564,12 +4522,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Lua global" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
+	TimingLog("SaveLuaGlobalToSaveGameFile", 7);
-		{
-			t0 = t1;
-			t1 = clock();
-			fprintf(fp_timelog, "SaveLuaGlobalFromLoadGameFile done\t\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-		}
 #endif
 
 	if( !SaveDataSaveToSaveGameFile( hFile ) )
@@ -4669,12 +4622,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		goto FAILED_TO_SAVE;
 	}
 #if LOADSAVEGAME_LOGTIME
-	if (fp_timelog)
+	TimingLog("File read done", 10);
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf(fp_timelog, "File read done\t\t\t\t\t\t\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-	}
 #endif
 
 	//Close the saved game file
@@ -4755,22 +4703,9 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 	alreadySaving = false;
 
 #if LOADSAVEGAME_LOGTIME
-	if (fp_timelog)
+	TimingLog("Update functions", 9);
-	{
+	TimingLogTotalTime("SaveSavedGame total", 9);
-		t0 = t1;
+	TimingLogStop();
-		t1 = clock();
-		fprintf(fp_timelog, "Update functions\t\t\t\t\t\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-	}
-
-	if (fp_timelog)
-	{
-		t0 = starttime;
-		t1 = clock();
-		fprintf(fp_timelog, "SaveSavedGame total\t\t\t\t\t\t\t\t\t\t\t\t: %fs\n\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-	}
-
-	if (fp_timelog)
-		fclose(fp_timelog);
 #endif
 	return( TRUE );
 
@@ -4780,6 +4715,9 @@ FAILED_TO_SAVE:
 #ifdef JA2BETAVERSION
 	SaveGameFilePosition( FileGetPos( hFile ), "Failed to Save!!!" );
 #endif
+#if LOADSAVEGAME_LOGTIME
+	TimingLogStop();
+#endif
 
 	FileClose( hFile );
 
@@ -4825,8 +4763,6 @@ extern int gEnemyPreservedTempFileVersion[256];
 extern int gCivPreservedTempFileVersion[256];
 
 
-#include "time.h"
-
 BOOLEAN LoadSavedGame( int ubSavedGameID )
 {
 	HWFILE	hFile;
@@ -4845,12 +4781,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 #endif
 
 #ifdef LOADSAVEGAME_LOGTIME
-	// Flugente: log how long this takes
+	TimingLogInitialize("TimeLog_LoadSavedGame.txt");
-	clock_t starttime = clock();
-	clock_t t0;
-	clock_t t1 = starttime;
-	
-	FILE *fp_timelog = fopen( "LoadSavedGame_TimeLog.txt", "a" );
 #endif
 	
 	uiRelStartPerc = uiRelEndPerc =0;
@@ -4933,14 +4864,9 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	CreateSavedGameFileNameFromNumber( ubSavedGameID, zSaveGameName );
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
+	TimingLogWrite("Load ");
-	{
+	TimingLogWrite(zSaveGameName);
-		fprintf( fp_timelog, "Load savegame: %s\n", zSaveGameName );
+	TimingLog("\nShutdown stuff", 10);
-
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "Shutdown stuff\t\t\t\t\t\t\t\t\t\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
 #endif
 
 	// open the save game file
@@ -5061,19 +4987,14 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	#ifdef JA2BETAVERSION
 		LoadGameFilePosition( FileGetPos( hFile ), "Tactical Status" );
 	#endif
+#if LOADSAVEGAME_LOGTIME
+		TimingLog("LoadTacticalStatusFromSavedGame", 6);
+#endif
 
 
 	//This gets reset by the above function
 	gTacticalStatus.uiFlags |= LOADING_SAVED_GAME;
 
-#if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadTacticalStatusFromSavedGame done\t\t\t\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
-#endif
 
 	//Load the game clock ingo
 	if( !LoadGameClock( hFile ) )
@@ -5194,12 +5115,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	#endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
+	TimingLog("LoadLaptopInfoFromSavedGame", 7);
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadLaptopInfoFromSavedGame done\t\t\t\t\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
 #endif
 
 	uiRelEndPerc += 0;
@@ -5242,12 +5158,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	#endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
+	TimingLog("LoadSoldierStructure", 8);
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadSoldierStructure done\t\t\t\t\t\t\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
 #endif
 
 	uiRelEndPerc += 1;
@@ -5376,12 +5287,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 #endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
+	TimingLog("LoadStrategicInfoFromSavedFile", 6);
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadStrategicInfoFromSavedFile done\t\t\t\t\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
 #endif
 
 	uiRelEndPerc += 1;
@@ -5442,12 +5348,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	ValidateStrategicGroups();
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
+	TimingLog("LoadStrategicMovementGroupsFromSavedGameFile", 2);
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadStrategicMovementGroupsFromSavedGameFile done\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
 #endif
 
 	uiRelEndPerc += 30;
@@ -5467,12 +5368,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	#endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
+	TimingLog("LoadMapTempFilesFromSavedGameFile", 5);
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadMapTempFilesFromSavedGameFile done\t\t\t\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
 #endif
 
 	uiRelEndPerc += 1;
@@ -5771,12 +5667,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 #endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
+	TimingLog("LoadMilitiaMovementInformationFromSavedGameFile", 2);
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadMilitiaMovementInformationFromSavedGameFile done\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
 #endif
 
 	uiRelEndPerc += 1;
@@ -6336,12 +6227,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	#endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
+	TimingLog("LoadLuaGlobalFromLoadGameFile", 6);
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadLuaGlobalFromLoadGameFile done\t\t\t\t\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
 #endif
 	
 	if( guiCurrentSaveGameVersion >= VEHICLES_DATATYPE_CHANGE && guiCurrentSaveGameVersion < NO_VEHICLE_SAVE)
@@ -6573,12 +6459,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	}
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
+	TimingLog("File read done", 10);
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "File read done\t\t\t\t\t\t\t\t\t\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
 #endif
 
 	//
@@ -7023,22 +6904,9 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	gGameExternalOptions.gfAllowReinforcements = zDiffSetting[gGameOptions.ubDifficultyLevel].bAllowReinforcements;
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
+	TimingLog("Update functions", 9);
-	{
+	TimingLogTotalTime("LoadSavedGame total", 9);
-		t0 = t1;
+	TimingLogStop();
-		t1 = clock();
-		fprintf( fp_timelog, "Update functions\t\t\t\t\t\t\t\t\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
-
-	if ( fp_timelog )
-	{
-		t0 = starttime;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadSavedGame total\t\t\t\t\t\t\t\t\t\t\t\t: %fs\n\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
-
-	if ( fp_timelog )
-		fclose( fp_timelog );
 #endif
 
 	DebugQuestInfo("\n--------- Game loaded ---------");
@@ -7338,7 +7206,7 @@ BOOLEAN LoadSoldierStructure( HWFILE hFile )
 					}
 				}
 
-#ifdef GERMAN
+if( g_lang == i18n::Lang::de ) {
 				// Fix neutral flags
 				if ( guiCurrentSaveGameVersion < 94 )
 				{
@@ -7348,7 +7216,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 ] );
@@ -10029,9 +9897,9 @@ UINT32 CalcJA2EncryptionSet( SAVED_GAME_HEADER * pSaveGameHeader )
 		}
 	}
 
-	#ifdef GERMAN
+	if( g_lang == i18n::Lang::de ) {
 		uiEncryptionSet *= 11;
-	#endif
+	}
 
 	uiEncryptionSet = uiEncryptionSet % 10;
 

Ja2/Screens.h

@@ -34,4 +34,4 @@ extern Screens GameScreens[MAX_SCREENS];
 
 #include "jascreens.h"
 
-#endif
+#endif

Ja2/TimeLogging.cpp

@@ -0,0 +1,72 @@
+#include "TimeLogging.h"
+#include "time.h"
+#include <stdio.h>
+
+
+clock_t starttime;
+clock_t t0;
+clock_t t1;
+FILE* fp_timelog = nullptr;
+
+
+static void indent(int n)
+{
+	for (int i = 0; i < n; i++)
+		fputc('\t', fp_timelog);
+}
+
+void TimingLogInitialize(const CHAR8* filename)
+{
+	starttime = clock();
+	t1 = starttime;
+
+	if (!fp_timelog)
+	{
+		fp_timelog = fopen(filename, "a");
+	}
+}
+
+
+void TimingLog(const CHAR8* logEvent, int n)
+{
+	if (fp_timelog)
+	{
+		t0 = t1;
+		t1 = clock();
+		fprintf(fp_timelog, "%s", logEvent);
+		indent(n);
+		fprintf(fp_timelog, ": %f s\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
+	}
+}
+
+
+void TimingLogTotalTime(const CHAR8* logEvent, int n)
+{
+	if (fp_timelog)
+	{
+		t1 = clock();
+		fprintf(fp_timelog, "%s", logEvent);
+		indent(n);
+		fprintf(fp_timelog, ": %f s\n", ((float)(t1 - starttime) / CLOCKS_PER_SEC));
+	}
+}
+
+
+void TimingLogWrite(const CHAR8* text)
+{
+	if (fp_timelog)
+	{
+		fprintf(fp_timelog, text);
+	}
+}
+
+
+void TimingLogStop()
+{
+	if (fp_timelog)
+	{
+		fprintf(fp_timelog, "\n");
+		fclose(fp_timelog);
+		fp_timelog = nullptr;
+	}
+}

Ja2/TimeLogging.h

@@ -0,0 +1,8 @@
+#pragma once
+#include "Types.h"
+
+void TimingLogInitialize(const CHAR8* filename);
+void TimingLog(const CHAR8* logEvent, int n);
+void TimingLogTotalTime(const CHAR8* logEvent, int n);
+void TimingLogWrite(const CHAR8* text);
+void TimingLogStop();

Ja2/builddefines.h

@@ -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

Ja2/gamescreen.h

@@ -41,4 +41,4 @@ void InitHelicopterEntranceByMercs( void );
 
 void InternalLeaveTacticalScreen( UINT32 uiNewScreen );
 
-#endif
+#endif

Ja2/jascreens.cpp

@@ -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;
 			}
@@ -959,7 +959,6 @@ void DoneFadeOutForDemoExitScreen( void )
 // unused
 //extern INT8 gbFadeSpeed;
 
-#ifdef GERMAN
 void DisplayTopwareGermanyAddress()
 {
 	VOBJECT_DESC		vo_desc;
@@ -994,7 +993,6 @@ void DisplayTopwareGermanyAddress()
 	ExecuteBaseDirtyRectQueue();
 	EndFrameBufferRender();
 }
-#endif
 
 UINT32 DemoExitScreenHandle(void)
 {

Ja2/jascreens.h

@@ -184,4 +184,4 @@ extern std::list<SExceptionData> g_ExceptionList;
 void PrintExceptionList();
 
 
-#endif
+#endif

Ja2/legion cfg.h

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

Ja2/mainmenuscreen.h

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

Ja2/screenids.h

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

Ja2/ub_config.h

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

Laptop/AimMembers.cpp

@@ -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);
@@ -2528,6 +2553,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 ] )
 	{
@@ -2577,6 +2617,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
@@ -2630,6 +2673,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
 }
 
 
@@ -2653,7 +2698,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;
@@ -2675,6 +2723,7 @@ UINT32 DisplayMercChargeAmount()
 		{
 			giContractAmount += gMercProfiles[gbCurrentSoldier].usOptionalGearCost;
 		}
+#endif
 	}
 
 
@@ -2685,10 +2734,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);
 	}
@@ -3887,14 +3941,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 )
+		if( gubVideoConferencingPreviousMode == AIM_VIDEO_HIRE_MERC_MODE )
-			{
+		{
-				// Enable the current video conference buttons
+			// Enable the current video conference buttons
-				EnableDisableCurrentVideoConferenceButtons(FALSE);
+			EnableDisableCurrentVideoConferenceButtons(FALSE);
-			}
+		}
 
 
 		fVideoConferenceCreated = FALSE;
@@ -4085,6 +4139,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
 	}
 
 
@@ -5297,11 +5367,17 @@ BOOLEAN DisplayShadedStretchedMercFace( UINT8 ubMercID, UINT16 usPosX, UINT16 us
 void DemoHiringOfMercs( )
 {
 	INT16	i;
-	#ifdef GERMAN
+	UINT8 MercID[5];
-		UINT8	MercID[]={ 7, 10, 4, 14, 50 };
+	MercID[0] = 7;
-	#else
+	MercID[1] = 10;
-		UINT8	MercID[]={ 7, 10, 4, 42, 33 };
+	MercID[2] = 4;
-	#endif
+	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;
 
@@ -5392,20 +5468,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
+}
 
 
 
@@ -5633,28 +5709,15 @@ void EnableWeaponKitSelectionButtons()
 	{
 		if ( !(gMercProfiles[gbCurrentSoldier].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS) || gGameExternalOptions.fGearKitsAlwaysAvailable )
 		{
-			bool bShow;
-			INT16 usItem;
 			for(int i=0; i<NUM_MERCSTARTINGGEAR_KITS; ++i)
 			{
-				bShow = false;
 				for(int j=INV_START_POS; j<NUM_INV_SLOTS; ++j)
 				{
-					usItem = gMercProfileGear[gbCurrentSoldier][i].inv[j];
+					if(gMercProfileGear[gbCurrentSoldier][i].inv[j] != NONE)
-					if(usItem != NONE)
 					{
-						bShow = true;
+						ShowButton( giWeaponboxSelectionButton[i] );
-						//shadooow: if any of the item in kit is limited to specific system and this system isn't enabled then disable the whole kit from selection
+						break;
-						if (((Item[usItem].usLimitedToSystem & FOOD_SYSTEM_FLAG) && !UsingFoodSystem()) || ((Item[usItem].usLimitedToSystem & DISEASE_SYSTEM_FLAG) && !gGameExternalOptions.fDisease))
+					}
-						{
-							bShow = false;
-							break;
-						}
-					}					
-				}
-				if (bShow)
-				{
-					ShowButton(giWeaponboxSelectionButton[i]);
 				}
 			}
 		}

Laptop/BaseTable.cpp

@@ -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] );
 

Laptop/BobbyRGuns.cpp

@@ -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//BOBBYR_ITEM_QTY_NUM_X
-	#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		BOBBY_RAY_NOT_PURCHASED						255
 #define		BOBBY_RAY_MAX_AMOUNT_OF_ITEMS_TO_PURCHASE		200
@@ -1765,11 +1762,11 @@ BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter, INT32 iSubFilter)
 					{
 						if ( iSubFilter > -1 ) // Madd: new BR filters
 						{
-							if (Item[usItemIndex].attachment && Item[usItemIndex].attachmentclass & iSubFilter )
+							if (ItemIsAttachment(usItemIndex) && Item[usItemIndex].attachmentclass & iSubFilter )
 								bAddItem = TRUE;
-							else if (iSubFilter == BR_MISC_FILTER_OTHER_ATTACHMENTS && !(Item[usItemIndex].attachmentclass & BR_MISC_FILTER_STD_ATTACHMENTS) && Item[usItemIndex].attachment)
+							else if (iSubFilter == BR_MISC_FILTER_OTHER_ATTACHMENTS && !(Item[usItemIndex].attachmentclass & BR_MISC_FILTER_STD_ATTACHMENTS) && ItemIsAttachment(usItemIndex))
 								bAddItem = TRUE;
-							else if (iSubFilter == BR_MISC_FILTER_NO_ATTACHMENTS && !Item[usItemIndex].attachment)
+							else if (iSubFilter == BR_MISC_FILTER_NO_ATTACHMENTS && !ItemIsAttachment(usItemIndex))
 								bAddItem = TRUE;
 						}
 						else
@@ -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);
 	}
@@ -2653,11 +2654,11 @@ void SetFirstLastPagesForNew( UINT32 uiClassMask, INT32 iFilter, INT32 iSubFilte
 							{
 								if (iSubFilter > -1 )
 								{
-									if (Item[usItemIndex].attachment && Item[usItemIndex].attachmentclass & iSubFilter)
+									if (ItemIsAttachment(usItemIndex) && Item[usItemIndex].attachmentclass & iSubFilter)
 										bCntNumItems = TRUE;
-									else if (iSubFilter == BR_MISC_FILTER_OTHER_ATTACHMENTS && !(Item[usItemIndex].attachmentclass & BR_MISC_FILTER_STD_ATTACHMENTS) && Item[usItemIndex].attachment)
+									else if (iSubFilter == BR_MISC_FILTER_OTHER_ATTACHMENTS && !(Item[usItemIndex].attachmentclass & BR_MISC_FILTER_STD_ATTACHMENTS) && ItemIsAttachment(usItemIndex))
 										bCntNumItems = TRUE;
-									else if (iSubFilter == BR_MISC_FILTER_NO_ATTACHMENTS && !Item[usItemIndex].attachment )
+									else if (iSubFilter == BR_MISC_FILTER_NO_ATTACHMENTS && !ItemIsAttachment(usItemIndex))
 										bCntNumItems = TRUE;
 								}
 								else
@@ -3641,11 +3642,11 @@ void CalcFirstIndexForPage( STORE_INVENTORY *pInv, UINT32	uiItemClass )
 						{
 							if (guiCurrentMiscSubFilterMode > -1) // Madd: new BR filter options
 							{
-								if (Item[usItemIndex].attachment && Item[usItemIndex].attachmentclass & guiCurrentMiscSubFilterMode)
+								if (ItemIsAttachment(usItemIndex) && Item[usItemIndex].attachmentclass & guiCurrentMiscSubFilterMode)
 									bCntItem = TRUE;
-								else if (guiCurrentMiscSubFilterMode == BR_MISC_FILTER_OTHER_ATTACHMENTS && !(Item[usItemIndex].attachmentclass & BR_MISC_FILTER_STD_ATTACHMENTS) && Item[usItemIndex].attachment)
+								else if (guiCurrentMiscSubFilterMode == BR_MISC_FILTER_OTHER_ATTACHMENTS && !(Item[usItemIndex].attachmentclass & BR_MISC_FILTER_STD_ATTACHMENTS) && ItemIsAttachment(usItemIndex))
 									bCntItem = TRUE;
-								else if (guiCurrentMiscSubFilterMode == BR_MISC_FILTER_NO_ATTACHMENTS && !Item[usItemIndex].attachment)
+								else if (guiCurrentMiscSubFilterMode == BR_MISC_FILTER_NO_ATTACHMENTS && !ItemIsAttachment(usItemIndex))
 									bCntItem = TRUE;
 							}
 							else 
@@ -4181,7 +4182,7 @@ void GetHelpTextForItemInLaptop( STR16 pzStr, UINT16 usItemNumber )
 					for (it = range.first; it != range.second; it++)
 					{
 						UINT16 attachmentId = it->second.attachmentIndex;
-						if (!Item[attachmentId].hiddenaddon && !Item[attachmentId].hiddenattachment && ItemIsLegal(attachmentId, TRUE))
+						if (!ItemIsHiddenAddon(attachmentId) && !ItemIsHiddenAttachment(attachmentId) && ItemIsLegal(attachmentId, TRUE))
 						{
 							fAttachmentsFound = TRUE;
 							if (DecorateAppendString(attachStr3, ATTACHMENTS_STRBUF_SIZE, Item[attachmentId].szItemName) == FALSE)
@@ -4194,7 +4195,7 @@ void GetHelpTextForItemInLaptop( STR16 pzStr, UINT16 usItemNumber )
 					for (UINT32 itemId = 1; itemId < gMAXITEMS_READ; itemId++)
 					{
 						// If the attachment is not hidden and attachable to the gun (usItemNumber)
-						if (!Item[itemId].hiddenaddon && !Item[itemId].hiddenattachment &&
+						if (!ItemIsHiddenAddon(itemId) && !ItemIsHiddenAttachment(itemId) &&
 							ItemIsLegal(itemId, TRUE) && IsAttachmentPointAvailable(Item[usItemNumber].uiIndex, itemId))
 						{
 							fAttachmentsFound = TRUE;

Laptop/BobbyRMailOrder.cpp

@@ -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 )

Laptop/BriefingRoom.h

@@ -17,4 +17,4 @@ BOOLEAN DrawBriefingRoomDefaults();
 BOOLEAN DisplayBriefingRoomSlogan();
 BOOLEAN DisplayBriefingRoomCopyright();
 
-#endif
+#endif

Laptop/BriefingRoomM.h

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

Laptop/BriefingRoom_Data.h

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

Laptop/CampaignHistoryData.h

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

Laptop/CampaignHistory_Summary.h

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

Laptop/CampaignStats.h

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

Laptop/IMP AboutUs.h

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

Laptop/IMP Attribute Entrance.h

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

Laptop/IMP Attribute Finish.h

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

Laptop/IMP Attribute Selection.h

@@ -22,4 +22,4 @@ extern BOOLEAN fReturnStatus;
 
 INT8 StartingLevelChosen(); // added - SANDRO
 
-#endif
+#endif

Laptop/IMP Background.cpp

@@ -17,6 +17,7 @@
 	#include "IMP Compile Character.h"
 	#include "IMP Disability Trait.h"
     #include "IMP Character Trait.h"
+    #include "IMP Minor Trait.h"
 	#include "GameSettings.h"
 	#include "Interface.h"
 
@@ -602,81 +603,187 @@ void ResetDisplaySkills()
 
 extern INT32 SkillsList[ ATTITUDE_LIST_SIZE ];
 
-BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
+extern BOOLEAN	gfSkillTraitQuestions[20];
+extern BOOLEAN	gfSkillTraitQuestions2[20];
+
+extern BOOLEAN	gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS];
+
+BOOLEAN IsBackGroundAllowed(UINT16 ubNumber)
 {
-	if ( !ubNumber  )
+	if (!ubNumber)
 		return FALSE;
 
 	// some backgrounds are only allowed to specific genders. Set both to forbid a background from ever showing up in IMP creation (for merc-specific backgrounds)
-	if ( fCharacterIsMale && zBackground[ ubNumber ].uiFlags & BACKGROUND_NO_MALE )
+	if (fCharacterIsMale && zBackground[ubNumber].uiFlags & BACKGROUND_NO_MALE)
 		return FALSE;
-	else if ( !fCharacterIsMale && zBackground[ ubNumber ].uiFlags & BACKGROUND_NO_FEMALE )
+	else if (!fCharacterIsMale && zBackground[ubNumber].uiFlags & BACKGROUND_NO_FEMALE)
 		return FALSE;
 
-	if ( SkillsList[0] == HEAVY_WEAPONS_NT || SkillsList[1] == HEAVY_WEAPONS_NT || SkillsList[2] == HEAVY_WEAPONS_NT )
+	// added new ini-options and accompanying background-tag
+	// choices in skills/character-traits/disabilities determine available backgrounds if true in ja2options.ini
+	// new tag <alt_impcreation> has been added to backgrounds.xml
+
+	if (!gGameExternalOptions.fAltIMPCreation)
+
 	{
-		if ( zBackground[ ubNumber ].value[BG_ARTILLERY] > 0 )
+		if (zBackground[ubNumber].uiFlags & BACKGROUND_ALT_IMP_CREATION) // don't show BG with tag <alt_impcreation> if Alt_Imp_Creation isn't true in ja2options.ini
+		{
+			return FALSE;
+		}
+		else
+		{
+			return TRUE;
+		}
+	}
+
+	// show BG with tag <alt_impcreation>, 
+	// but don't show BG whose tags would contradict with a main bonus/penalty gained by skill/char-trait/disability
+
+	if (gGameExternalOptions.fAltIMPCreation)
+
+    // define which tags are considered contradicting for major traits, minor traits, disablities and character traits
+
+	// major traits  (single-trait and dual-trait)
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_HEAVY_WEAPONS])
+        {    
+			if (zBackground[ubNumber].value[BG_ARTILLERY] > 0) //dual trait (expert) 
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_ARTILLERY] > 10) //single trait
+				return FALSE;
+		}
+	}
+
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_PROF_SNIPER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_PROF_SNIPER])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_PROF_SNIPER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_PROF_SNIPER])
+		{
+			if (zBackground[ubNumber].value[BG_PERC_CTH_MAX] < 0 || zBackground[ubNumber].value[BG_MARKSMANSHIP] < 0 )
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_PERC_CTH_MAX] < 0 )  
+				return FALSE;
+		}
+	}
+
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_MARTIAL_ARTS])
+		{
+			
+				if (zBackground[ubNumber].value[BG_RESI_PHYSICAL] < 0 )  
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_RESI_PHYSICAL] < 0 )  
+				return FALSE;
+		}
+	}
+
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_TECHNICIAN] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_TECHNICIAN])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_TECHNICIAN] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_TECHNICIAN])
+		{
+			if (zBackground[ubNumber].value[BG_MECHANICAL] < 0)  
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_MECHANICAL] < 0)  
+				return FALSE;
+		}
+	}
+
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_DOCTOR] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_DOCTOR])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_DOCTOR] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_DOCTOR])
+		{
+			if (zBackground[ubNumber].value[BG_PERC_BANDAGING] < 0 || zBackground[ubNumber].value[BG_MEDICAL] < 0 )
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_PERC_BANDAGING] < 0)  
+				return FALSE;
+		}
+	}
+
+	if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_SQUADLEADER] || gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_SQUADLEADER])
+	{
+
+		if (gfSkillTraitQuestions[IMP_SKILL_TRAITS_NEW_SQUADLEADER] && gfSkillTraitQuestions2[IMP_SKILL_TRAITS_NEW_SQUADLEADER])
+		{
+			if (zBackground[ubNumber].value[BG_RESI_SUPPRESSION] < 0 || zBackground[ubNumber].value[BG_RESI_FEAR] < 0 )
+				return FALSE;
+		}
+		else
+		{
+			if (zBackground[ubNumber].value[BG_RESI_SUPPRESSION] < 0)
+				return FALSE;
+		}
+	}
+
+	// Minor Traits (single trait only) 
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_MELEE])
+	{
+		if (zBackground[ubNumber].value[BG_PERC_CTH_BLADE] < 0 || zBackground[ubNumber].value[BG_PERC_DAMAGE_MELEE] < 0 )
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == SNIPER_NT || SkillsList[1] == SNIPER_NT || SkillsList[2] == SNIPER_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_STEALTHY])
 	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_CTH_MAX] < 0 )
+		if (zBackground[ubNumber].value[BG_PERC_STEALTH] < 0)
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == SURVIVAL_NT || SkillsList[1] == SURVIVAL_NT || SkillsList[2] == SURVIVAL_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_DEMOLITIONS])  
 	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_CAMO] < 0 )
+		if (zBackground[ubNumber].value[BG_BONUS_BREACHINGCHARGE] < 0 || zBackground[ubNumber].value[BG_EXPLOSIVE_ASSIGN] < 0 )
-			return FALSE;
-	}
-	
-	if ( SkillsList[0] == MARTIAL_ARTS_NT || SkillsList[1] == MARTIAL_ARTS_NT || SkillsList[2] == MARTIAL_ARTS_NT )
-	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_DAMAGE_MELEE] < 0 )
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == TECHNICIAN_NT || SkillsList[1] == TECHNICIAN_NT || SkillsList[2] == TECHNICIAN_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_SURVIVAL]) 
 	{
-		if ( zBackground[ ubNumber ].value[BG_MECHANICAL] < 0 )
+		if (zBackground[ubNumber].value[BG_TRAVEL_FOOT] < 0 || zBackground[ubNumber].value[BG_TRAVEL_CAR] <0 || zBackground[ubNumber].value[BG_TRAVEL_AIR] <0 ||
+			zBackground[ubNumber].value[BG_RESI_DISEASE] < 0  || zBackground[ubNumber].value[BG_SNAKEDEFENSE] < 0 )
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == DOCTOR_NT || SkillsList[1] == DOCTOR_NT || SkillsList[2] == DOCTOR_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_BODYBUILDING])
 	{
-		if ( zBackground[ ubNumber ].value[BG_MEDICAL] < 0 )
+		if (zBackground[ubNumber].value[BG_PERC_CARRYSTRENGTH] < 0)
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == MELEE_NT || SkillsList[1] == MELEE_NT || SkillsList[2] == MELEE_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_AMBIDEXTROUS])
 	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_CTH_BLADE] < 0 )
+		if (zBackground[ubNumber].value[BG_INVENTORY] > 0)
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == STEALTHY_NT || SkillsList[1] == STEALTHY_NT || SkillsList[2] == STEALTHY_NT )
+	if (gfMinorTraitQuestions[IMP_SKILL_TRAITS_NEW_NIGHT_OPS])
 	{
-		if ( zBackground[ ubNumber ].value[BG_PERC_STEALTH] < 0 )
+		if (zBackground[ubNumber].value[BG_PERC_SLEEP] > 0 || zBackground[ubNumber].value[BG_PERC_HEARING_NIGHT] < 0 )
 			return FALSE;
 	}
 
-	if ( SkillsList[0] == ATHLETICS_NT || SkillsList[1] == ATHLETICS_NT || SkillsList[2] == ATHLETICS_NT )
+	// Disabiliies
-	{
+	switch (iChosenDisabilityTrait())
-		if ( zBackground[ ubNumber ].value[BG_PERC_SPEED_RUNNING] < 0 )
-			return FALSE;
-	}
-		
-	if ( SkillsList[0] == DEMOLITIONS_NT || SkillsList[1] == DEMOLITIONS_NT || SkillsList[2] == DEMOLITIONS_NT )
-	{
-		if ( zBackground[ ubNumber ].value[BG_EXPLOSIVE_ASSIGN] < 0 )
-			return FALSE;
-	}
-
-	switch ( iChosenDisabilityTrait() )
 	{
 	case HEAT_INTOLERANT:
-		if ( zBackground[ ubNumber ].value[BG_DESERT] > 0 )
+		if (zBackground[ubNumber].value[BG_DESERT] > 0 || zBackground[ubNumber].value[BG_TROPICAL] > 0)  
 			return FALSE;
 		break;
 	case NERVOUS:
@@ -686,7 +793,7 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 			return FALSE;
 		break;
 	case NONSWIMMER:
-		if ( zBackground[ ubNumber ].value[BG_RIVER] > 0 || zBackground[ ubNumber ].value[BG_COASTAL] > 0 || zBackground[ ubNumber ].value[BG_SWIMMING] > 0 )
+		if ( zBackground[ ubNumber ].value[BG_RIVER] > 0 || zBackground[ ubNumber ].value[BG_COASTAL] > 0 )
 			return FALSE;
 		break;
 	case FEAR_OF_INSECTS:
@@ -694,35 +801,109 @@ BOOLEAN IsBackGroundAllowed( UINT16 ubNumber )
 			return FALSE;
 		break;
 	case FORGETFUL:
-		if ( zBackground[ ubNumber ].value[BG_LEADERSHIP] > 0 )
+		if (zBackground[ubNumber].value[BG_INVENTORY] < 0 || zBackground[ubNumber].value[BG_ASSAULT] < 0 )
 			return FALSE;
 		break;
 	case PSYCHO:
-		if ( zBackground[ ubNumber ].value[BG_LEADERSHIP] > 0 )
+		if (zBackground[ubNumber].value[BG_LEADERSHIP] > 5)
+			return FALSE;
+		break;
+	case DEAF:
+		if (zBackground[ ubNumber ].value[BG_PERC_HEARING_NIGHT] > 0 || zBackground[ ubNumber ].value[BG_PERC_HEARING_DAY] > 0)
+			return FALSE;
+		break;
+	case SHORTSIGHTED:
+		if (zBackground[ ubNumber ].value[BG_PERC_CTH_MAX] > 0 || zBackground[ubNumber].value[BG_PERC_SPOTTER] > 0 )
+			return FALSE;
+		break;
+	case HEMOPHILIAC:
+		if (zBackground[ubNumber].value[BG_RESI_DISEASE] > 0)
 			return FALSE;
 		break;
 	case AFRAID_OF_HEIGHTS:
-		if ( zBackground[ubNumber].value[BG_HEIGHT] > 0 )
+		if ( zBackground[ ubNumber ].value[BG_HEIGHT] > 0 || zBackground[ubNumber].value[BG_AIRDROP] > 0 )
+			return FALSE;
+		break;
+	case SELF_HARM:
+		if (zBackground[ubNumber].value[BG_RESI_DISEASE] > 0)
 			return FALSE;
 		break;
 	default:
 		break;
 	}
 
-	switch ( iChosenCharacterTrait() )
+	// Character Traits
+	switch (iChosenCharacterTrait())
 	{
 	case CHAR_TRAIT_SOCIABLE:
-		if ( zBackground[ ubNumber ].uiFlags & BACKGROUND_XENOPHOBIC )
+		if (zBackground[ubNumber].uiFlags & BACKGROUND_XENOPHOBIC || zBackground[ubNumber].value[BG_PERC_SPOTTER] < 0)
 			return FALSE;
 		break;
 	case CHAR_TRAIT_LONER:
-		if ( zBackground[ ubNumber ].value[BG_LEADERSHIP] > 0 )
+		if (zBackground[ubNumber].value[BG_LEADERSHIP] > 0 || zBackground[ubNumber].value[BG_PERC_SPOTTER] > 0)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_OPTIMIST:
+		if (zBackground[ubNumber].uiFlags & BACKGROUND_TRAPLEVEL)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_ASSERTIVE:
+		if (zBackground[ubNumber].value[BG_PERC_INTERROGATION] < 0 || zBackground[ubNumber].value[BG_PERC_APPROACH_THREATEN] < 0)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_INTELLECTUAL:
+		if (zBackground[ubNumber].value[BG_ADMINISTRATION_ASSIGNMENT] < 0)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_PRIMITIVE:
+		if (zBackground[ubNumber].value[BG_ADMINISTRATION_ASSIGNMENT] > 0)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_AGGRESSIVE:
+		if (zBackground[ubNumber].uiFlags & BACKGROUND_TRAPLEVEL || zBackground[ubNumber].value[BG_PERC_DISARM] > 0 )
+			return FALSE;
+		break;
+	case CHAR_TRAIT_PHLEGMATIC:
+		if (zBackground[ubNumber].value[BG_ASSAULT] > 0 )
+			return FALSE;
+		break;
+	case CHAR_TRAIT_DAUNTLESS:
+		if (zBackground[ubNumber].value[BG_CROUCHEDDEFENSE] < 0 )
+			return FALSE;
+		break;
+	case CHAR_TRAIT_PACIFIST:
+		break;
+	case CHAR_TRAIT_MALICIOUS:
+		if (zBackground[ubNumber].value[BG_PERC_APPROACH_FRIENDLY] > 0)
+			return FALSE;
+		break;
+	case CHAR_TRAIT_SHOWOFF:
+		break;
+	case CHAR_TRAIT_COWARD:
+		if (zBackground[ubNumber].value[BG_PERC_CAPITULATION] > 0)
 			return FALSE;
 		break;
 	default:
 		break;
 	}
 
+	// show exclusivly the BG's with tag <alt_impcreation> if Reduced_Imp_Creation is true in ja2options.ini
+	// requires Alt_Imp_Creation to be true in ja2options.ini (otherwise BG's with tag <alt_impcreation> won't be shown)
+
+	if (gGameExternalOptions.fReducedIMPCreation)
+
+	{
+
+		if (zBackground[ubNumber].uiFlags & BACKGROUND_ALT_IMP_CREATION)   
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+
 	return TRUE;
 }
 

Laptop/IMP Begin Screen.cpp

@@ -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 != '#')
+		if( (g_lang != i18n::Lang::ru &&
-#else
+			uiKey >= 'A' && uiKey <= 'Z' ||
-	#ifndef USE_CODE_PAGE
-		if( 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
+			uiKey != '#')
-		if( charSet::IsFromSet( uiKey, charSet::CS_SPACE|charSet::CS_ALPHA_NUM|charSet::CS_SPECIAL_ALPHA ) )
-	#endif
-#endif
 		{
 			// if the current string position is at max or great, do nothing
 			switch( ubTextEnterMode )

Laptop/IMP Begin Screen.h

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

Laptop/IMP Character and Disability Entrance.h

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

Laptop/IMP Compile Character.h

@@ -20,4 +20,4 @@ void ClearAllSkillsList( void );
 
 extern STR8 pPlayerSelectedFaceFileNames[ NUMBER_OF_PLAYER_PORTRAITS ];
 extern STR8 pPlayerSelectedBigFaceFileNames[ NUMBER_OF_PLAYER_PORTRAITS ];
-#endif
+#endif

Laptop/IMP Confirm.cpp

@@ -526,7 +526,7 @@ void DistributeInitialGear(MERCPROFILESTRUCT *pProfile)
 		if(iOrder[i]!=-1)
 		{
 			// skip if this item is an attachment
-			if(Item[tInv[iOrder[i]].inv].attachment)
+			if(ItemIsAttachment(tInv[iOrder[i]].inv))
 				continue;
 			iSet = FALSE;
 			number = tInv[iOrder[i]].iNumber;
@@ -1103,7 +1103,7 @@ INT32 SpecificFreePocket(MERCPROFILESTRUCT *pProfile, UINT16 usItem, UINT8 ubHow
 					return HELMETPOS;
 				if ( pProfile->inv[VESTPOS] == NONE && Armour[Item[usItem].ubClassIndex].ubArmourClass == ARMOURCLASS_VEST )
 					return VESTPOS;
-				if ( pProfile->inv[LEGPOS] == NONE && Armour[Item[usItem].ubClassIndex].ubArmourClass == ARMOURCLASS_LEGGINGS && !(Item[usItem].attachment))
+				if ( pProfile->inv[LEGPOS] == NONE && Armour[Item[usItem].ubClassIndex].ubArmourClass == ARMOURCLASS_LEGGINGS && !ItemIsAttachment(usItem) )
 					return LEGPOS;
 				break;
 			case IC_BLADE:
@@ -1132,7 +1132,7 @@ INT32 SpecificFreePocket(MERCPROFILESTRUCT *pProfile, UINT16 usItem, UINT8 ubHow
 			case IC_GUN:
 				if ( pProfile->inv[HANDPOS] == NONE )
 					return HANDPOS;
-				if ( pProfile->inv[SECONDHANDPOS] == NONE && !(Item[pProfile->inv[HANDPOS]].twohanded))
+				if ( pProfile->inv[SECONDHANDPOS] == NONE && !(ItemIsTwoHanded(pProfile->inv[HANDPOS])))
 					return SECONDHANDPOS;
 				if((UsingNewInventorySystem() == true))
 					if ( pProfile->inv[GUNSLINGPOCKPOS] == NONE && pProfile->inv[BPACKPOCKPOS] == NONE && LBEPocketType[1].ItemCapacityPerSize[Item[usItem].ItemSize]!=0)
@@ -1681,7 +1681,7 @@ void GiveIMPRandomItems( MERCPROFILESTRUCT *pProfile, UINT8 typeIndex )
 
 		// give ammo for guns
 		Assert( usItem < gMAXITEMS_READ );
-		if ( Item[usItem].usItemClass == IC_GUN && !Item[usItem].rocketlauncher )
+		if ( Item[usItem].usItemClass == IC_GUN && !ItemIsRocketLauncher(usItem) )
 		{
 			usItem = DefaultMagazine(usItem);
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("GiveIMPRandomItems: give ammo typeIndex = %d, usItem = %d ",typeIndex, usItem ));
@@ -1726,7 +1726,7 @@ void GiveIMPItems( MERCPROFILESTRUCT *pProfile, INT8 abilityValue, UINT8 typeInd
 			MakeProfileInvItemAnySlot(pProfile,usItem,100,1);
 			
 			// give ammo for guns
-			if ( Item[usItem].usItemClass == IC_GUN && !Item[usItem].rocketlauncher )
+			if ( Item[usItem].usItemClass == IC_GUN && !ItemIsRocketLauncher(usItem) )
 			{
 				usItem = DefaultMagazine(usItem);
 				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("GiveIMPItems: give ammo typeIndex = %d, usItem = %d",typeIndex, usItem ));

Laptop/IMP Disability Trait.h

@@ -8,7 +8,7 @@ void RenderIMPDisabilityTrait( void );
 void ExitIMPDisabilityTrait( void );
 void HandleIMPDisabilityTrait( void );
 
-INT8 iChosenDisabilityTrait();
+INT8 iChosenDisabilityTrait(); 
 INT8 iPlayersAttributePointsBonusForDisabilitySelected();
 
 #endif

Laptop/IMP Finish.h

@@ -10,4 +10,4 @@ void HandleIMPFinish( void );
 extern BOOLEAN fFinishedCharGeneration; 
 
 
-#endif
+#endif

Laptop/IMP Gear.cpp

@@ -1285,7 +1285,7 @@ void DistributePossibleItemsToVectors(void)
 		{
 			gIMPPossibleItems[HANDPOS].push_back(std::make_pair(usItem, Item[usItem].szItemName));
 
-			if (Item[usItem].twohanded) {
+			if (ItemIsTwoHanded(usItem)) {
 				gIMPPossibleItems[GUNSLINGPOCKPOS].push_back(std::make_pair(usItem, Item[usItem].szItemName)); 
 			}
 			else { 

Laptop/IMP HomePage.h

@@ -15,4 +15,4 @@ void HandleImpHomePage( void );
 #define IMP_MERC_FILENAME "IMP"
 
 extern INT32 GlowColorsList[][3];
-#endif
+#endif

Laptop/IMP MainPage.h

@@ -29,4 +29,4 @@ enum
 	IMP__FINISH,
 };
 
-#endif
+#endif

Laptop/IMP Minor Trait.cpp

@@ -80,7 +80,7 @@ UINT8 gusNewMinorTraitRemap[IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS] =
 
 BOOLEAN gfIMT_Redraw=FALSE;
 
-BOOLEAN	gfMinorTraitQuestions[ IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS ];
+BOOLEAN	gfMinorTraitQuestions[ IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS ]; 
 
 // these are the buttons for the questions
 INT32 giIMPMinorTraitAnswerButton[ IMP_SKILL_TRAITS_NEW_NUMBER_MINOR_SKILLS ];

Laptop/IMP Personality Entrance.h

@@ -9,4 +9,4 @@ void HandleIMPPersonalityEntrance( void );
 
 STR16 pSkillTraitBeginIMPStrings[];
 
-#endif
+#endif

Laptop/IMP Personality Finish.h

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

Laptop/IMP Personality Quiz.h

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

Laptop/IMP Portraits.h

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

Laptop/IMP Skill Trait.cpp

@@ -98,8 +98,8 @@ UINT8 gusOldMajorTraitRemap[IMP_SKILL_TRAITS__NUMBER_SKILLS] =
 // Global Variables
 //
 //*******************************************************************
-BOOLEAN	gfSkillTraitQuestions[ 20 ];
+BOOLEAN	gfSkillTraitQuestions[ 20 ]; 
-BOOLEAN	gfSkillTraitQuestions2[ 20 ];
+BOOLEAN	gfSkillTraitQuestions2[ 20 ]; 
 
 
 BOOLEAN gfIST_Redraw=FALSE;

Laptop/IMP Text System.cpp

@@ -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 ):

Laptop/IMP Text System.h

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

Laptop/IMP Voices.h

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

Laptop/MilitiaWebsite.cpp

@@ -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 );
-}
+}

Laptop/PMC.cpp

@@ -851,4 +851,4 @@ BOOLEAN LoadPMC( HWFILE hwFile )
 	}
 
 	return TRUE;
-}
+}

Laptop/PostalService.h

@@ -254,4 +254,4 @@ private:
 protected:
 };
 
-#endif
+#endif

Laptop/Speck Quotes.h

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

Laptop/XML_AIMAvailability.cpp

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

Laptop/XML_ConditionsForMercAvailability.cpp

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

Laptop/XML_DeliveryMethods.cpp

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

Laptop/XML_ShippingDestinations.cpp

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

Laptop/florist Cards.h

@@ -16,4 +16,4 @@ void RenderFloristCards();
 
 extern INT8			gbCurrentlySelectedCard;
 
-#endif
+#endif

Laptop/florist Gallery.h

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

Laptop/florist Order Form.h

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

Laptop/insurance Comments.h

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

Laptop/insurance Contract.h

@@ -28,4 +28,4 @@ void InsuranceContractEndGameShutDown();
 
 void PurchaseOrExtendInsuranceForSoldier( SOLDIERTYPE *pSoldier, UINT32 uiInsuranceLength );
 
-#endif
+#endif