Fixes to npc-actions Pacos

Fixes to npc-actions Pacos

.github/workflows/build.yml

@@ -154,7 +154,7 @@ jobs:
           cat dist/versions.env
 
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: versions.env
           path: dist/
@@ -179,77 +179,40 @@ jobs:
 
     steps:
     - name: Download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-        path: artifacts
+        path: dist
+        pattern: '*_release'
+        merge-multiple: true
 
-    - name: Move release archives to dist/
-      shell: bash
-      run: |
-        set -eux
-        mkdir dist/
-        mv artifacts/*_release/* dist/
-
-    - name: Delete Latest Release and Tag
-      if: github.ref == 'refs/heads/master'
-      uses: dev-drprasad/delete-tag-and-release@v1.0
-      with:
-        delete_release: true
-        tag_name: "latest"
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Checkout Repo
-      if: github.ref == 'refs/heads/master'
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: source
         fetch-depth: 1
         sparse-checkout: 'README.md'
-    - name: Create Latest Tag
+    - name: Create latest pre-release
       if: github.ref == 'refs/heads/master'
       working-directory: source
       run: |
+        gh release delete latest --cleanup-tag || true
         git tag -d latest || true
+        git push --delete origin refs/tags/latest || true
         git tag latest
-        git push origin latest
-    - id: release_latest
-      name: Release Latest
-      if: github.ref == 'refs/heads/master'
-      uses: ncipollo/release-action@v1
-      with:
-        artifactErrorsFailBuild: true
-        artifacts: dist/*
-        generateReleaseNotes: true
-        makeLatest: true
-        name: "Latest (unstable)"
-        prerelease: true
-        tag: "latest"
+        git push --force origin refs/tags/latest
+        sleep 15 # make sure github can find the tag for gh release
+        gh release create latest ../dist/* \
+          --generate-notes \
+          --title "Latest (unstable)" \
+          --verify-tag \
+          --prerelease
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - id: release_tag
-      name: Release Tag
-      uses: ncipollo/release-action@v1
+    - name: Upload to tagged release
       if: startsWith(github.ref, 'refs/tags/v')
-      with:
-        allowUpdates: true
-        artifactErrorsFailBuild: true
-        artifacts: dist/*
-        draft: false
-        generateReleaseNotes: true
-        makeLatest: true
-        omitBodyDuringUpdate: true
-        omitDraftDuringUpdate: true
-        omitNameDuringUpdate: true
-        omitPrereleaseDuringUpdate: true
-
-    - name: Show release outputs
-      shell: bash
+      working-directory: source
       run: |
-        echo 'id: '
-        echo -n '${{ steps.release_tag.outputs.id }}'
-        echo -n '${{ steps.release_latest.outputs.id }}'
-        echo ''
-        echo ''
-        echo 'url:'
-        echo -n '${{ steps.release_tag.outputs.html_url }}'
-        echo -n '${{ steps.release_latest.outputs.html_url }}'
-        echo ''
+        gh release upload "$GITHUB_REF_NAME" ../dist/* --clobber
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build_language.yml

@@ -30,10 +30,10 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download versions.env
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: versions.env
           path: artifacts
@@ -41,6 +41,7 @@ jobs:
         shell: bash
         run: cat artifacts/versions.env >> $GITHUB_ENV
 
+      # TODO: Move this into CMake, just taking the GitHub Actions parameters as -D variables
       - name: Update GameVersion.cpp
         shell: bash
         run: |
@@ -49,16 +50,26 @@ jobs:
           GAME_VERSION=$(echo "$GAME_VERSION" | tr -cd '[:print:]' | tr -d '"\\')
           GAME_BUILD="${INPUTS_LANGUAGE:0:2} $GAME_BUILD_INFORMATION"
           GAME_BUILD=$(echo "$GAME_BUILD" | tr -cd '[:print:]' | tr -d '"\\')
-          sed -i "s|@Version@|${GAME_VERSION:0:15}|" GameVersion.cpp
-          sed -i "s|@Build@|${GAME_BUILD:0:255}|" GameVersion.cpp
-          cat GameVersion.cpp
+          sed -i "s|@Version@|${GAME_VERSION:0:15}|" Ja2/GameVersion.cpp
+          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:]')
@@ -68,7 +79,7 @@ jobs:
           JA2Application=$JA2Application
           " >> $GITHUB_ENV
 
-      - uses: microsoft/setup-msbuild@v1.1
+      - uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x86
       - uses: ilammy/msvc-dev-cmd@v1
@@ -76,7 +87,7 @@ jobs:
           arch: x86
       - name: Prepare build
         run: |
-          cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DLanguages="$Env:JA2Language" -DApplications="$Env:JA2Application"
+          cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DLanguages="$Env:JA2Language" -DApplications="$Env:JA2Application" -DLTO_OPTION="$Env:LTO"
       - name: Build
         run: |
           cmake --build build/ -- -v
@@ -86,7 +97,7 @@ jobs:
           find build/
 
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.language }}_${{ matrix.application }}
           path: build/*.exe
@@ -99,7 +110,7 @@ jobs:
 
     steps:
       - name: Download versions.env
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: versions.env
           path: artifacts
@@ -108,7 +119,7 @@ jobs:
         run: cat artifacts/versions.env >> $GITHUB_ENV
 
       - name: Checkout gamedir
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ env.GAMEDIR_REPOSITORY }}
           ref: ${{ env.GAMEDIR_COMMIT_SHA }}
@@ -116,7 +127,7 @@ jobs:
 
       - name: Checkout gamedir-languages
         if: inputs.language != 'English'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ env.GAMEDIR_LANGUAGES_REPOSITORY }}
           ref: ${{ env.GAMEDIR_LANGUAGES_COMMIT_SHA }}
@@ -130,25 +141,25 @@ jobs:
           cp -a gamedir-languages/${{ inputs.language }}_Version/* gamedir/
 
       - name: Download ja2
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.language }}_ja2
           path: artifacts/ja2
 
       - name: Download ja2mapeditor
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.language }}_ja2mapeditor
           path: artifacts/ja2mapeditor
 
       - name: Download ja2ub
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.language }}_ja2ub
           path: artifacts/ja2ub
 
       - name: Download ja2ubmapeditor
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.language }}_ja2ubmapeditor
           path: artifacts/ja2ubmapeditor
@@ -198,7 +209,8 @@ jobs:
           7z a -bb -xr'!.*' "../dist/${DIST_NAME}.7z" .
 
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.language }}_release
           path: dist/
+          compression-level: 0

.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")
-	add_compile_options($<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>,-fsanitize=address,>)
+  message(STATUS "AddressSanitizer ENABLED for non-Release builds")
+  add_compile_options($<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>,-fsanitize=address,>)
+endif()
+
+if(MSVC)
+  add_compile_options("/wd4838")
 endif()
 
 # whether we are using MSBuild as a generator
@@ -22,8 +37,25 @@ set(usingMsBuild $<STREQUAL:${CMAKE_VS_PLATFORM_NAME},Win32>)
 # TODO: build our own Lua 5.1.2 from source so we can use whichever
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
-add_compile_definitions(CINTERFACE XML_STATIC VFS_STATIC VFS_WITH_SLF VFS_WITH_7ZIP USE_VFS _CRT_SECURE_NO_DEPRECATE)
-include_directories(${CMAKE_SOURCE_DIR} "ext/VFS/include" Utils TileEngine TacticalAI ModularizedTacticalAI Tactical Strategic "Standard Gaming Platform" Res Lua Laptop Multiplayer "Multiplayer/raknet" Editor Console)
+add_compile_definitions(CINTERFACE XML_STATIC VFS_STATIC VFS_WITH_SLF VFS_WITH_7ZIP _CRT_SECURE_NO_DEPRECATE)
+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,95 +66,47 @@ target_link_libraries(bfVFS PRIVATE 7z)
 # ja2export utility
 add_subdirectory("ext/export/src")
 
-# static libraries whose source files, header files or header files included
-# by header files do not rely on Applications or Languages preprocessor definitions,
-# and therefore only need to be compiled once. Good.
-add_subdirectory(Lua)
-
-# static libraries whose source files, header files or header files included
-# by header files rely on Application and Language preprocessor definitions, and
-# therefore need to be compiled multiple times. Very Bad.
-add_subdirectory(TileEngine)
-add_subdirectory(TacticalAI)
-add_subdirectory(Utils)
-add_subdirectory(Strategic)
-add_subdirectory("Standard Gaming Platform")
-add_subdirectory(Laptop)
-add_subdirectory(Editor)
-add_subdirectory(Console)
-add_subdirectory(Tactical)
-add_subdirectory(ModularizedTacticalAI)
-# TODO: Rename 'Standard Gaming Platform' directory to 'SGP' so this can be refactored away
-set(Ja2_Libs
-TileEngine
-TacticalAI
-Utils
-Strategic
-SGP
-Laptop
-Editor
-Console
-Tactical
-ModularizedTacticalAI
-)
-
-# TODO: Move these units into their own directory to declutter the root dir and CMakeLists.txt file
-set(Ja2Src
-"aniviewscreen.cpp"
-"Credits.cpp"
-"Fade Screen.cpp"
-"FeaturesScreen.cpp"
-"GameInitOptionsScreen.cpp"
-"gameloop.cpp"
-"gamescreen.cpp"
-"GameSettings.cpp"
-"GameVersion.cpp"
-"HelpScreen.cpp"
-"Init.cpp"
-"Intro.cpp"
-"JA2 Splash.cpp"
-"Ja25Update.cpp"
-"jascreens.cpp"
-"Language Defines.cpp"
-"Loading Screen.cpp"
-"MainMenuScreen.cpp"
-"MessageBoxScreen.cpp"
-"MPChatScreen.cpp"
-"MPConnectScreen.cpp"
-"MPHostScreen.cpp"
-"MPJoinScreen.cpp"
-"MPScoreScreen.cpp"
-"MPXmlTeams.cpp"
-"Multiplayer/client.cpp"
-"Multiplayer/server.cpp"
-"Multiplayer/transfer_rules.cpp"
-"Options Screen.cpp"
-"profiler.cpp"
-"SaveLoadGame.cpp"
-"SaveLoadScreen.cpp"
-"SCREENS.cpp"
-"Sys Globals.cpp"
-"ub_config.cpp"
-"XML_DifficultySettings.cpp"
-"XML_IntroFiles.cpp"
-"XML_Layout_MainMenu.cpp"
-Res/ja2.rc
-)
+# static libraries whose translation units don't rely on Application preprocessor definitions.
+add_subdirectory(lua)
+add_subdirectory(Multiplayer)
+add_subdirectory(wine)
 
 set(Ja2_Libraries
-"${PROJECT_SOURCE_DIR}/libexpatMT.lib"
+"${CMAKE_SOURCE_DIR}/binkw32.lib"
+"${CMAKE_SOURCE_DIR}/libexpatMT.lib"
+"${CMAKE_SOURCE_DIR}/lua51.lib"
+"${CMAKE_SOURCE_DIR}/lua51.vc9.lib"
+"${CMAKE_SOURCE_DIR}/SMACKW32.LIB"
 "Dbghelp.lib"
-Lua
-"${PROJECT_SOURCE_DIR}/lua51.lib"
-"${PROJECT_SOURCE_DIR}/lua51.vc9.lib"
 "Winmm.lib"
-"${PROJECT_SOURCE_DIR}/SMACKW32.LIB"
-"${PROJECT_SOURCE_DIR}/binkw32.lib"
-bfVFS
-"${PROJECT_SOURCE_DIR}/Multiplayer/raknet/RakNetLibStatic.lib"
 "ws2_32.lib"
+bfVFS
+Lua
+Multiplayer
+wine
 )
 
+# static libraries whose translation units rely on Application preprocessor definitions.
+set(Ja2_Libs
+  Console
+  Editor
+  Ja2
+  Laptop
+  ModularizedTacticalAI
+  sgp
+  Strategic
+  Tactical
+  TacticalAI
+  TileEngine
+  Utils
+)
+foreach(lib IN LISTS Ja2_Libs)
+  add_subdirectory(${lib})
+endforeach()
+
+# 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)
 
@@ -136,47 +120,50 @@ ValidateOptions("${ValidApplications}" "Applications" "${Applications}" "Applica
 # preprocessor definitions for Debug build, per the legacy MSBuild
 set(debugFlags $<IF:$<CONFIG:Debug>,JA2BETAVERSION;JA2TESTVERSION;DEBUG_ATTACKBUSY,>)
 
-# Due to widespread preprocessor definition abuse in the codebase, practically
-# every library-language-executable combination is its own compilation target
-# TODO: refactor preprocessor usage onto, ideally, a single translation unit
-foreach(lang IN LISTS LangTargets)
-	foreach(exe IN LISTS ApplicationTargets)
-		set(Executable ${exe}_${lang})
+foreach(app IN LISTS ApplicationTargets)
+  set(isEditor $<STREQUAL:${app},JA2MAPEDITOR>)
+  set(isUb $<STREQUAL:${app},JA2UB>)
+  set(isUbEditor $<STREQUAL:${app},JA2UBMAPEDITOR>)
+  set(compilationFlags
+    $<IF:${isEditor},JA2EDITOR;JA2BETAVERSION,>
+    $<IF:${isUb},JA2UB;JA2UBMAPS,>
+    $<IF:${isUbEditor},JA2UB;JA2UBMAPS;JA2EDITOR;JA2BETAVERSION,>
+  )
 
-		# executable for an application/language combination, e.g. JA2_ENGLISH.exe
-		add_executable(${Executable} WIN32)
-		target_sources(${Executable} PRIVATE ${Ja2Src})
+  foreach(lib IN LISTS Ja2_Libs)
+    # library for an application, e.g. JA2UB_sgp
+    set(game_library ${app}_${lib})
+    add_library(${game_library})
+    target_sources(${game_library} PRIVATE ${${lib}Src})
+    target_compile_definitions(${game_library} PRIVATE ${compilationFlags} ${debugFlags})
+  endforeach()
 
-		# Good libraries have already been built, can be simply linked here
-		target_link_libraries(${Executable} PRIVATE ${Ja2_Libraries} $<IF:${usingMsBuild},legacy_stdio_definitions.lib,>)
-		target_link_options(${Executable} PRIVATE $<IF:${usingMsBuild},/SAFESEH:NO,>)
+  foreach(lang IN LISTS LangTargets)
+    # executable for an application/language combination, e.g. JA2_ENGLISH.exe
+    set(exe ${app}_${lang})
+    add_executable(${exe} WIN32
+      sgp/sgp.cpp
+      Ja2/Res/ja2.rc
+    )
+    target_link_libraries(${exe} PRIVATE ${Ja2_Libraries} $<IF:${usingMsBuild},legacy_stdio_definitions.lib,>)
+    target_link_options(${exe} PRIVATE $<IF:${usingMsBuild},/SAFESEH:NO,>)
+    target_compile_definitions(${exe} PRIVATE ${compilationFlags} ${debugFlags})
 
-		# for each app/lang combination, the Very Bad libraries need to be built,
-		# with the appropriate preprocessor definitions
-		foreach(lib IN LISTS Ja2_Libs)
-			# syntactic sugar to hopefully make this more readable
-			set(VeryBadLib ${Executable}_${lib})
-			set(isEditor $<STREQUAL:${exe},JA2MAPEDITOR>)
-			set(isUb $<STREQUAL:${exe},JA2UB>)
-			set(isUbEditor $<STREQUAL:${exe},JA2UBMAPEDITOR>)
+    # language library for an application, e.g. JA2MAPEDITOR_ENGLISH_i18n
+    set(language_library ${exe}_i18n)
+    add_library(${language_library})
+    target_sources(${language_library} PRIVATE ${i18nSrc})
+    target_compile_definitions(${language_library} PRIVATE ${compilationFlags} ${debugFlags} ${lang})
+    target_link_libraries(${exe} PRIVATE ${language_library})
 
-			# static library for an app/lang combination, e.g. JA2_ENGLISH_SGP.lib
-			add_library(${VeryBadLib})
-			target_sources(${VeryBadLib} PRIVATE ${${lib}Src})
+    # go through all game libraries again and link them to the app/language executable
+    foreach(lib IN LISTS Ja2_Libs)
+      target_link_libraries(${exe} PRIVATE ${app}_${lib})
+    endforeach()
+  endforeach()
 
-			target_compile_definitions(${VeryBadLib} PUBLIC
-				$<IF:${isEditor},JA2EDITOR;JA2BETAVERSION,>
-				$<IF:${isUb},JA2UB;JA2UBMAPS,>
-				$<IF:${isUbEditor},JA2UB;JA2UBMAPS;JA2EDITOR;JA2BETAVERSION,>
-				${debugFlags}
-				${lang}
-			)
-			target_link_libraries(${Executable} PUBLIC ${VeryBadLib})
-		endforeach()
-
-		# for SGP only
-		target_link_libraries(${Executable}_SGP PRIVATE "ddraw.lib" "${PROJECT_SOURCE_DIR}/fmodvc.lib")
-		target_link_libraries(${Executable}_SGP PUBLIC libpng)
-		target_compile_definitions(${Executable}_SGP PRIVATE NO_ZLIB_COMPRESSION)
-	endforeach()
+  # for SGP only
+  target_link_libraries(${app}_sgp PRIVATE "ddraw.lib" "${PROJECT_SOURCE_DIR}/fmodvc.lib")
+  target_link_libraries(${app}_sgp PRIVATE libpng)
+  target_compile_definitions(${app}_sgp PRIVATE NO_ZLIB_COMPRESSION)
 endforeach()

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

@@ -83,9 +83,7 @@ INT32 iCurrFileShown;
 INT32	iLastFileClicked;
 INT32 iLastClickTime;
 
-#ifdef USE_VFS
 CHAR8 gzProfileName[FILENAME_BUFLEN];//dnl ch81 021213
-#endif
 CHAR16 gzFilename[FILENAME_BUFLEN];//dnl ch39 190909
 extern INT16 gsSelSectorX;
 extern INT16 gsSelSectorY;
@@ -165,7 +163,6 @@ void LoadSaveScreenEntry()
 	}
 
 	iTopFileShown = iTotalFiles = 0;
-#ifdef USE_VFS//dnl ch37 300909
 	gzProfileName[0] = 0;//dnl ch81 021213
 	FDLG_LIST* TempFileList = NULL;
 	vfs::CProfileStack* st = getVFS()->getProfileStack();
@@ -176,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;
@@ -220,25 +225,6 @@ void LoadSaveScreenEntry()
 	}
 	while(FileList->pPrev)
 		FileList = FileList->pPrev;
-#else
-	if(GetFileFirst("MAPS\\*.dat", &FileInfo))
-	{
-		if(strlen(FileInfo.zFileName) < FILENAME_BUFLEN)
-		{
-			FileList = AddToFDlgList(FileList, &FileInfo);
-			iTotalFiles++;
-		}
-		while(GetFileNext(&FileInfo))
-		{
-			if(strlen(FileInfo.zFileName) < FILENAME_BUFLEN)
-			{
-				FileList = AddToFDlgList(FileList, &FileInfo);
-				iTotalFiles++;
-			}
-		}
-		GetFileClose(&FileInfo);
-	}
-#endif
 	swprintf( zOrigName, L"%s Map (*.dat)", iCurrentAction == ACTION_SAVE_MAP ? L"Save" : L"Load" );
 
 	swprintf( gzFilename, L"%S", gubFilename );
@@ -283,7 +269,8 @@ UINT32 ProcessLoadSaveScreenMessageBoxResult()
 			{
 				if( gfReadOnly )
 				{
-					FileClearAttributes( gszCurrFilename );
+					// Other call sites have replaced this with FileDelete(); for VFS, should we do the same here?
+					//FileClearAttributes( gszCurrFilename );
 					gfReadOnly = FALSE;
 				}
 				FileDelete( gszCurrFilename );
@@ -468,19 +455,6 @@ UINT32 LoadSaveScreenHandle(void)
 			}
 			sprintf(gszCurrFilename, "MAPS\\%S", gzFilename);
 			gfFileExists = FALSE;
-#ifndef USE_VFS
-			gfReadOnly = FALSE;
-			if(FileExists(gszCurrFilename))
-			{
-				gfFileExists = TRUE;
-				if(GetFileFirst(gszCurrFilename, &FileInfo))
-				{
-					if(FileInfo.uiFileAttribs & (FILE_IS_READONLY|FILE_IS_DIRECTORY|FILE_IS_HIDDEN|FILE_IS_SYSTEM|FILE_IS_OFFLINE|FILE_IS_TEMPORARY))
-						gfReadOnly = TRUE;
-					GetFileClose(&FileInfo);
-				}
-			}
-#else
 			gfReadOnly = TRUE;
 			vfs::CProfileStack* st = getVFS()->getProfileStack();
 			vfs::CProfileStack::Iterator it = st->begin();
@@ -502,7 +476,6 @@ UINT32 LoadSaveScreenHandle(void)
 				}
 				it.next();
 			}
-#endif
 			if(gfReadOnly)
 			{
 				CreateMessageBox(L" File is read only!  Choose a different name? ");
@@ -726,7 +699,6 @@ void SelectFileDialogYPos( UINT16 usRelativeYPos )
 			iLastClickTime = iCurrClickTime;
 			iLastFileClicked = x;
 			//dnl ch81 021213
-#ifdef USE_VFS
 			gzProfileName[0] = 0;
 			while(FListNode = FListNode->pPrev)
 			{
@@ -737,7 +709,6 @@ void SelectFileDialogYPos( UINT16 usRelativeYPos )
 					break;
 				}
 			}
-#endif
 			break;
 		}
 		FListNode = FListNode->pNext;
@@ -950,7 +921,6 @@ void HandleMainKeyEvents( InputAtom *pEvent )
 				SetInputFieldStringWith16BitString(0, L"");
 				wcscpy(gzFilename, L"");
 			}
-#ifdef USE_VFS
 			gzProfileName[0] = 0;
 			while(curr = curr->pPrev)
 			{
@@ -961,7 +931,6 @@ void HandleMainKeyEvents( InputAtom *pEvent )
 					break;
 				}
 			}
-#endif
 		}
 	}
 }

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
 
@@ -51,9 +51,7 @@ extern CHAR16 gzErrorCatchString[ 256 ];
 
 //dnl ch81 031213
 extern CHAR16 gzFilename[FILENAME_BUFLEN];
-#ifdef USE_VFS
 extern CHAR8 gzProfileName[FILENAME_BUFLEN];
-#endif
 
 #endif
 #endif

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 sOffset = sdY*WORLD_COLS + sdX;
+		INT32 sdY = gRoadMacros[ i ].sOffset / (OLD_WORLD_COLS);
+		INT32 sdX = gRoadMacros[ i ].sOffset -  (sdY*OLD_WORLD_COLS);
+
+		// Take into account the dfference between old and new row size for tiles that are shifted
+		// by one row due to X offset
+		// For example:
+		// {RBR, 159},
+		//{ RBR, -159 },
+		// 
+		// Offsets for 160x160 map
+		// []		[]		[-159]
+		// []		[0]		[]
+		// [159]	[]		[]
 		//
-		AddToUndoList( iMapIndex + sOffset );
-		RemoveAllObjectsOfTypeRange( iMapIndex + sOffset, ROADPIECES, ROADPIECES );//dnl this was but is very wrong and leading to stacking tilesets, RemoveAllObjectsOfTypeRange( i, ROADPIECES, ROADPIECES );
+		// Converted to 200x200 map
+		// []		[]		[-199]
+		// []		[0]		[]
+		// [199]	[]		[]
+		// 
+		// Without this the original conversion would output 159 and -159 for X coordinate
+		if (sdX < -OLD_WORLD_COLS/2)
+		{
+			sdX -= WORLD_COLS - OLD_WORLD_COLS;
+		}
+		else if (sdX > OLD_WORLD_COLS / 2)
+		{
+			sdX += WORLD_COLS - OLD_WORLD_COLS;
+		}
+
+		INT32 sOffset = sdY*WORLD_COLS + sdX;
+		INT32 newGridNo = iMapIndex + sOffset;
+
+		AddToUndoList( newGridNo );
+		RemoveAllObjectsOfTypeRange( newGridNo, ROADPIECES, ROADPIECES );//dnl this was but is very wrong and leading to stacking tilesets, RemoveAllObjectsOfTypeRange( i, ROADPIECES, ROADPIECES );
 		GetTileIndexFromTypeSubIndex( ROADPIECES, (UINT16)(i+1) , &usTileIndex );
-		AddObjectToHead( iMapIndex + sOffset, usTileIndex );
+		AddObjectToHead( newGridNo, usTileIndex );
 		i++;
 	}
 }

Editor/Road Smoothing.h

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

Editor/Sector Summary.cpp

@@ -1923,40 +1923,14 @@ BOOLEAN HandleSummaryInput( InputAtom *pEvent )
 
 void CreateGlobalSummary()
 {
-#ifndef USE_VFS
-	FILE *fp;
-	STRING512			Dir;
-	STRING512			ExecDir;
-#endif
 	OutputDebugString( "Generating GlobalSummary Information...\n" );
 
 	gfGlobalSummaryExists = FALSE;
 	//Set current directory to JA2\DevInfo which contains all of the summary data
-#ifndef USE_VFS
-	GetExecutableDirectory( ExecDir );
-	sprintf( Dir, "%s\\DevInfo", ExecDir );
-
-	// Snap: save current directory
-	//GetFileManCurrentDirectory( DataDir );
-
-	//Directory doesn't exist, so create it, and continue.
-	if( !MakeFileManDirectory( Dir ) )
-		AssertMsg( 0, "Can't create new directory, JA2\\DevInfo for summary information." );
-	if( !SetFileManCurrentDirectory( Dir ) )
-		AssertMsg( 0, "Can't set to new directory, JA2\\DevInfo for summary information." );
-
-	//Generate a simple readme file.
-	fp = fopen( "readme.txt", "w" );
-	Assert( fp );
-	fprintf( fp, "%s\n%s\n", "This information is used in conjunction with the editor.",
-		"This directory or it's contents shouldn't be included with final release." );
-	fclose( fp );
-#else
 	vfs::COpenWriteFile wfile(L"DevInfo\\readme.txt",true,true);
 	std::string str = "This information is used in conjunction with the editor.\n";
 	str += "This directory or it's contents shouldn't be included with final release.\n";
 	SGP_TRYCATCH_RETHROW( wfile->write(str.c_str(), str.length()), L"" );
-#endif
 
 	// Snap: Restore the data directory once we are finished.
 	//SetFileManCurrentDirectory( DataDir );
@@ -2203,7 +2177,8 @@ void SummarySaveMapCallback( GUI_BUTTON *btn, INT32 reason )
 			{
 				CHAR8 filename[40];
 				sprintf( filename, "MAPS\\%S", gszDisplayName );
-				FileClearAttributes( filename );
+				// Other call sites have replaced this with FileDelete(); for VFS, should we do the same here?
+				//FileClearAttributes( filename );
 			}	
 			if(	ExternalSaveMap( gszDisplayName ) )
 			{
@@ -2281,12 +2256,6 @@ void CalculateOverrideStatus()
 void LoadGlobalSummary()
 {
 	HWFILE	hfile;
-#ifndef USE_VFS
-	STRING512			DataDir;
-	STRING512			ExecDir;
-	STRING512			DevInfoDir;
-	STRING512			MapsDir;
-#endif
 	UINT32 uiNumBytesRead;
 	FLOAT	dMajorVersion;
 	INT32 x,y;
@@ -2295,34 +2264,16 @@ void LoadGlobalSummary()
 
 	OutputDebugString( "Executing LoadGlobalSummary()...\n" );
 	// Snap: save current directory
-#ifndef USE_VFS
-	GetFileManCurrentDirectory( DataDir );
-#endif
 	gfMustForceUpdateAllMaps = FALSE;
 	gusNumberOfMapsToBeForceUpdated = 0;
 	gfGlobalSummaryExists = FALSE;
 
 	//Set current directory to JA2\DevInfo which contains all of the summary data
-#ifndef USE_VFS
-	GetExecutableDirectory( ExecDir );
-	sprintf( DevInfoDir, "%s\\DevInfo", ExecDir );
-	sprintf( MapsDir, "%s\\Maps", DataDir );
-	//Check to make sure we have a DevInfo directory.  If we don't create one!
-	if( !SetFileManCurrentDirectory( DevInfoDir ) )
-	{
-		OutputDebugString( "LoadGlobalSummary() aborted -- doesn't exist on this local computer.\n");
-		return;
-	}
-#endif
 	//TEMP
-#ifndef USE_VFS
-	FileDelete( "_global.sum" );
-#else
 	if(FileExists("DevInfo\\_global.sum"))
 	{
 		FileDelete( "DevInfo\\_global.sum" );
 	}
-#endif
 	gfGlobalSummaryExists = TRUE;
 	
 	//Analyse all sectors to see if matching maps exist.  For any maps found, the information
@@ -2337,19 +2288,12 @@ void LoadGlobalSummary()
 			sprintf( szSector, "%c%d", 'A' + y, x + 1 );
 
 			//main ground level
-#ifndef USE_VFS
-			sprintf( szFilename, "%c%d.dat", 'A' + y, x + 1 );
-			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
-			SetFileManCurrentDirectory( DevInfoDir );
-#else
 			sprintf( szFilename, "Maps\\%c%d.dat", 'A' + y, x + 1 );
 			hfile = NULL;
 			if(FileExists(szFilename))
 			{
 				hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			}
-#endif
 			if( hfile )
 			{
 				gbSectorLevels[x][y] |= GROUND_LEVEL_MASK;
@@ -2359,27 +2303,16 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-#ifndef USE_VFS
-				sprintf( szFilename, "%s.sum", szSector );
-#else
 				sprintf( szFilename, "DevInfo\\%s.sum", szSector );
-#endif
 				FileDelete( szFilename );
 			}
 			//main B1 level
-#ifndef USE_VFS
-			sprintf( szFilename, "%c%d_b1.dat", 'A' + y, x + 1 );
-			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
-			SetFileManCurrentDirectory( DevInfoDir );
-#else
 			sprintf( szFilename, "Maps\\%c%d_b1.dat", 'A' + y, x + 1 );
 			hfile = NULL;
 			if(FileExists(szFilename))
 			{
 				hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			}
-#endif
 			if( hfile )
 			{
 				gbSectorLevels[x][y] |= BASEMENT1_LEVEL_MASK;
@@ -2389,27 +2322,16 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-#ifndef USE_VFS
-				sprintf( szFilename, "%s_b1.sum", szSector );
-#else
 				sprintf( szFilename, "DevInfo\\%s_b1.sum", szSector );
-#endif
 				FileDelete( szFilename );
 			}
 			//main B2 level
-#ifndef USE_VFS
-			sprintf( szFilename, "%c%d_b2.dat", 'A' + y, x + 1 );
-			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
-			SetFileManCurrentDirectory( DevInfoDir );
-#else
 			sprintf( szFilename, "Maps\\%c%d_b2.dat", 'A' + y, x + 1 );
 			hfile = NULL;
 			if(FileExists(szFilename))
 			{
 				hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			}
-#endif
 			if( hfile )
 			{
 				gbSectorLevels[x][y] |= BASEMENT2_LEVEL_MASK;
@@ -2419,27 +2341,16 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-#ifndef USE_VFS
-				sprintf( szFilename, "%s_b2.sum", szSector );
-#else
 				sprintf( szFilename, "DevInfo\\%s_b2.sum", szSector );
-#endif
 				FileDelete( szFilename );
 			}
 			//main B3 level
-#ifndef USE_VFS
-			sprintf( szFilename, "%c%d_b3.dat", 'A' + y, x + 1 );
-			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
-			SetFileManCurrentDirectory( DevInfoDir );
-#else
 			sprintf( szFilename, "Maps\\%c%d_b3.dat", 'A' + y, x + 1 );
 			hfile = NULL;
 			if(FileExists(szFilename))
 			{
 				hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			}
-#endif
 			if( hfile )
 			{
 				gbSectorLevels[x][y] |= BASEMENT3_LEVEL_MASK;
@@ -2449,27 +2360,16 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-#ifndef USE_VFS
-				sprintf( szFilename, "%s_b3.sum", szSector );
-#else
 				sprintf( szFilename, "DevInfo\\%s_b3.sum", szSector );
-#endif
 				FileDelete( szFilename );
 			}
 			//alternate ground level
-#ifndef USE_VFS
-			sprintf( szFilename, "%c%d_a.dat", 'A' + y, x + 1 );
-			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
-			SetFileManCurrentDirectory( DevInfoDir );
-#else
 			sprintf( szFilename, "Maps\\%c%d_a.dat", 'A' + y, x + 1 );
 			hfile = NULL;
 			if(FileExists(szFilename))
 			{
 				hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			}
-#endif
 			if( hfile )
 			{
 				gbSectorLevels[x][y] |= ALTERNATE_GROUND_MASK;
@@ -2479,27 +2379,16 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-#ifndef USE_VFS
-				sprintf( szFilename, "%s_a.sum", szSector );
-#else
 				sprintf( szFilename, "DevInfo\\%s_a.sum", szSector );
-#endif
 				FileDelete( szFilename );
 			}
 			//alternate B1 level
-#ifndef USE_VFS
-			sprintf( szFilename, "%c%d_b1_a.dat", 'A' + y, x + 1 );
-			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
-			SetFileManCurrentDirectory( DevInfoDir );
-#else
 			sprintf( szFilename, "Maps\\%c%d_b1_a.dat", 'A' + y, x + 1 );
 			hfile = NULL;
 			if(FileExists(szFilename))
 			{
 				hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			}
-#endif
 			if( hfile )
 			{
 				gbSectorLevels[x][y] |= ALTERNATE_B1_MASK;
@@ -2509,27 +2398,16 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-#ifndef USE_VFS
-				sprintf( szFilename, "%s_b1_a.sum", szSector );
-#else
 				sprintf( szFilename, "DevInfo\\%s_b1_a.sum", szSector );
-#endif
 				FileDelete( szFilename );
 			}
 			//alternate B2 level
-#ifndef USE_VFS
-			sprintf( szFilename, "%c%d_b2_a.dat", 'A' + y, x + 1 );
-			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
-			SetFileManCurrentDirectory( DevInfoDir );
-#else
 			sprintf( szFilename, "Maps\\%c%d_b2_a.dat", 'A' + y, x + 1 );
 			hfile = NULL;
 			if(FileExists(szFilename))
 			{
 				hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			}
-#endif
 			if( hfile )
 			{
 				gbSectorLevels[x][y] |= ALTERNATE_B2_MASK;
@@ -2539,27 +2417,16 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-#ifndef USE_VFS
-				sprintf( szFilename, "%s_b2_a.sum", szSector );
-#else
 				sprintf( szFilename, "DevInfo\\%s_b2_a.sum", szSector );
-#endif
 				FileDelete( szFilename );
 			}
 			//alternate B3 level
-#ifndef USE_VFS
-			sprintf( szFilename, "%c%d_b3_a.dat", 'A' + y, x + 1 );
-			SetFileManCurrentDirectory( MapsDir );
-			hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
-			SetFileManCurrentDirectory( DevInfoDir );
-#else
 			sprintf( szFilename, "Maps\\%c%d_b3_a.dat", 'A' + y, x + 1 );
 			hfile = NULL;
 			if(FileExists(szFilename))
 			{
 				hfile = FileOpen( szFilename, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
 			}
-#endif
 			if( hfile )
 			{
 				gbSectorLevels[x][y] |= ALTERNATE_B1_MASK;;
@@ -2569,20 +2436,12 @@ void LoadGlobalSummary()
 			}
 			else
 			{
-#ifndef USE_VFS
-				sprintf( szFilename, "%s_b3_a.sum", szSector );
-#else
 				sprintf( szFilename, "DevInfo\\%s_b3_a.sum", szSector );
-#endif
 				FileDelete( szFilename );
 			}
 		}
 		OutputDebugString( (LPCSTR)String("Sector Row %c complete... \n", y + 'A') );
 	}
-#ifndef USE_VFS
-	// Snap: Restore the data directory once we are finished.
-	SetFileManCurrentDirectory( DataDir );
-#endif
 	//sprintf( MapsDir, "%s\\Data", ExecDir );
 	//SetFileManCurrentDirectory( MapsDir );
 
@@ -2599,39 +2458,6 @@ void LoadGlobalSummary()
 
 void GenerateSummaryList()
 {
-#ifndef USE_VFS
-	FILE *fp;
-	STRING512			DataDir;
-	STRING512			ExecDir;
-	STRING512			Dir;
-
-	// Snap: save current directory
-	GetFileManCurrentDirectory( DataDir );
-
-	//Set current directory to JA2\DevInfo which contains all of the summary data
-	GetExecutableDirectory( ExecDir );
-	sprintf( Dir, "%s\\DevInfo", ExecDir );
-	if( !SetFileManCurrentDirectory( Dir ) )
-	{
-		//Directory doesn't exist, so create it, and continue.
-		if( !MakeFileManDirectory( Dir ) )
-			AssertMsg( 0, "Can't create new directory, JA2\\DevInfo for summary information." );
-		if( !SetFileManCurrentDirectory( Dir ) )
-			AssertMsg( 0, "Can't set to new directory, JA2\\DevInfo for summary information." );
-		//Generate a simple readme file.
-		fp = fopen( "readme.txt", "w" );
-		Assert( fp );
-		fprintf( fp, "%s\n%s\n", "This information is used in conjunction with the editor.",
-			"This directory or it's contents shouldn't be included with final release." );
-		fclose( fp );
-	}
-
-	// Snap: Restore the data directory once we are finished.
-	SetFileManCurrentDirectory( DataDir );
-	//Set current directory back to data directory!
-	//sprintf( Dir, "%s\\Data", ExecDir );
-	//SetFileManCurrentDirectory( Dir );
-#else
 	try
 	{
 		vfs::COpenWriteFile wfile(L"DevInfo/readme.txt",true,true);
@@ -2643,7 +2469,6 @@ void GenerateSummaryList()
 	{
 		SGP_RETHROW(L"Could not create readme.txt", ex);
 	}
-#endif
 }
 
 //dnl ch28 260909

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
 
@@ -79,8 +79,6 @@
 class OBJECTTYPE;
 class SOLDIERTYPE;
 
-extern CHAR8 *szMusicList[NUM_MUSIC];
-
 BOOLEAN gfCorruptMap = FALSE;
 BOOLEAN gfCorruptSchedules = FALSE;
 BOOLEAN gfProfileDataLoaded = FALSE;
@@ -169,6 +167,7 @@ LEVELNODE *gCursorNode = NULL;
 INT32			gsCursorGridNo;
 
 INT32 giMusicID = 0;
+NewMusicList gMusicMode = MUSICLIST_MAIN_MENU;
 
 void EraseWorldData(	);
 
@@ -1070,10 +1069,7 @@ void ShowCurrentDrawingMode( void )
 	// Set the color for the window's border. Blueish color = Normal, Red = Fake lighting is turned on
 	usFillColor = GenericButtonFillColors[0];
 	pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES );
-	if(gbPixelDepth==16)
-		RectangleDraw( FALSE, iScreenWidthOffset + 0, 2 * iScreenHeightOffset + 400, iScreenWidthOffset + 99, 2 * iScreenHeightOffset + 458, usFillColor, pDestBuf );
-	else if(gbPixelDepth==8)
-		RectangleDraw8( FALSE, iScreenWidthOffset + 0, 2 * iScreenHeightOffset + 400, iScreenWidthOffset + 99, 2 * iScreenHeightOffset + 458, usFillColor, pDestBuf );
+	RectangleDraw( FALSE, iScreenWidthOffset + 0, 2 * iScreenHeightOffset + 400, iScreenWidthOffset + 99, 2 * iScreenHeightOffset + 458, usFillColor, pDestBuf );
 
 	UnLockVideoSurface( FRAME_BUFFER );
 
@@ -1616,16 +1612,27 @@ void HandleKeyboardShortcuts( )
 					break;
 
 				case F4:
-#ifdef NEWMUSIC
-					MusicPlay( giMusicID, MUSIC_OLD_TYPE, FALSE );
-#else
-					MusicPlay( giMusicID );
-#endif
+					MusicPlay(gMusicMode, giMusicID);
+					ScreenMsg( FONT_YELLOW, MSG_INTERFACE, L"%S", MusicLists[gMusicMode][giMusicID] );
 
-					ScreenMsg( FONT_YELLOW, MSG_DEBUG, L"%S", szMusicList[giMusicID] );
+					// Select next track 
 					giMusicID++;
-					if( giMusicID >= NUM_MUSIC )
+					if (giMusicID >= MusicLists[gMusicMode].size())
+					{
 						giMusicID = 0;
+						for (size_t i = 0; i < MAX_MUSIC; i++)
+						{
+							if (gMusicMode == i)
+							{
+								gMusicMode = static_cast<NewMusicList>(i + 1);
+								if (gMusicMode == MAX_MUSIC)
+								{
+									gMusicMode = MUSICLIST_MAIN_MENU;
+								}
+								break;
+							}
+						}
+					}
 					break;
 
 				case F5:
@@ -2944,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,
-										&SelWinSpacing, CLEAR_BACKGROUND);
+	BuildDisplayWindow( pDSpec, usNSpecs, &pDispList, &gSelection.displayAreaStart , &gSelection.displayAreaEnd,
+										&gSelection.spacing, CLEAR_BACKGROUND);
 }
 
 
@@ -849,12 +871,14 @@ void RenderSelectionWindow( void )
 		return;
 
 	ColorFillVideoSurfaceArea(FRAME_BUFFER,
-													0, 0, 600, 400,
-													GenericButtonFillColors[0]);
+		gSelection.window.iLeft, gSelection.window.iTop, gSelection.window.iRight, gSelection.window.iBottom,
+		GenericButtonFillColors[0]
+	);
 	DrawSelections( );
 	MarkButtonsDirty();
 	RenderButtons( );
 
+	// Draw selection rectangle
 	if ( gfRenderSquareArea )
 	{
 		button = ButtonList[iSelectWin];
@@ -862,7 +886,7 @@ void RenderSelectionWindow( void )
 			return;
 
 		if ( (abs( iStartClickX - button->Area.MouseXPos ) > 9) ||
-			(abs( iStartClickY - (button->Area.MouseYPos + iTopWinCutOff - (INT16)SelWinStartPoint.iY)) > 9) )
+			(abs( iStartClickY - (button->Area.MouseYPos + iTopWinCutOff - (INT16)gSelection.displayAreaStart.iY)) > 9) )
 		{
 //			iSX = (INT32)iStartClickX;
 //			iEX = (INT32)button->Area.MouseXPos;
@@ -870,7 +894,7 @@ void RenderSelectionWindow( void )
 //			iEY = (INT32)(button->Area.MouseYPos + iTopWinCutOff - (INT16)SelWinStartPoint.iY);
 
 			iSX = iStartClickX;
-			iSY = iStartClickY - iTopWinCutOff + SelWinStartPoint.iY;
+			iSY = iStartClickY - iTopWinCutOff + gSelection.displayAreaStart.iY;
 			iEX = gusMouseXPos;
 			iEY = gusMouseYPos;
 
@@ -889,10 +913,10 @@ void RenderSelectionWindow( void )
 				iEY ^= iSY;
 			}
 
-			iEX = min( iEX, 600 );
-			iSY = max( SelWinStartPoint.iY, iSY );
-			iEY = min( 359, iEY );
-			iEY = max( SelWinStartPoint.iY, iEY );
+			iEX = min( gSelection.displayAreaEnd.iX, iEX);
+			iSY = max( gSelection.displayAreaStart.iY, iSY );
+			iEY = min( gSelection.displayAreaEnd.iY, iEY );
+			iEY = max( gSelection.displayAreaStart.iY, iEY );
 
 			usFillColor = Get16BPPColor(FROMRGB(255, usFillGreen, 0));
 			usFillGreen += usDir;
@@ -928,7 +952,7 @@ void SelWinClkCallback( GUI_BUTTON *button, INT32 reason )
 		return;
 
 	iClickX = button->Area.MouseXPos;
-	iClickY = button->Area.MouseYPos + iTopWinCutOff - (INT16)SelWinStartPoint.iY;
+	iClickY = button->Area.MouseYPos + iTopWinCutOff - (INT16)gSelection.displayAreaStart.iY;
 
 	if (reason & MSYS_CALLBACK_REASON_LBUTTON_DWN)
 	{
@@ -1035,9 +1059,9 @@ void DisplaySelectionWindowGraphicalInformation()
 	UINT16 y;
 	//Determine if there is a valid picture at cursor position.
 	//iRelX = gusMouseXPos;
-	//iRelY = gusMouseYPos + iTopWinCutOff - (INT16)SelWinStartPoint.iY;
+	//iRelY = gusMouseYPos + iTopWinCutOff - (INT16)gSelection.displayAreaStart.iY;
 
-	y = gusMouseYPos + iTopWinCutOff - (UINT16)SelWinStartPoint.iY;
+	y = gusMouseYPos + iTopWinCutOff - (UINT16)gSelection.displayAreaStart.iY;
 	pNode = pDispList;
 	fDone = FALSE;
 	while( (pNode != NULL) && !fDone )
@@ -1470,10 +1494,10 @@ void DrawSelections( void )
 {
 	SGPRect					ClipRect, NewRect;
 
-	NewRect.iLeft = SelWinStartPoint.iX;
-	NewRect.iTop = SelWinStartPoint.iY;
-	NewRect.iRight = SelWinEndPoint.iX;
-	NewRect.iBottom = SelWinEndPoint.iY;
+	NewRect.iLeft = gSelection.displayAreaStart.iX;
+	NewRect.iTop = gSelection.displayAreaStart.iY;
+	NewRect.iRight = gSelection.displayAreaEnd.iX;
+	NewRect.iBottom = gSelection.displayAreaEnd.iY;
 
 	GetClippingRect(&ClipRect);
 	SetClippingRect(&NewRect);
@@ -1483,7 +1507,7 @@ void DrawSelections( void )
 	SetObjectShade( gvoLargeFontType1, 0 );
 //	SetObjectShade( gvoLargeFont, 0 );
 
-	DisplayWindowFunc( pDispList, iTopWinCutOff, iBotWinCutOff, &SelWinStartPoint, CLEAR_BACKGROUND );
+	DisplayWindowFunc( pDispList, iTopWinCutOff, iBotWinCutOff, &gSelection.displayAreaStart, CLEAR_BACKGROUND );
 
 	SetObjectShade( gvoLargeFontType1, 4 );
 

JA2 Demo Ads.h

@@ -1,6 +0,0 @@
-#ifndef _JA2_DEMO_ADS_H
-#define _JA2_DEMO_ADS_H
-
-#include "types.h"
-
-#endif

JA2Prototypes.h

@@ -1,13 +0,0 @@
-#ifndef _JA2PROTOTYPES_H
-#define _JA2PROTOTYPES_H
-
-/*
- *  This header does not define any structures.  It simply provides a way for all code that only needs a pointer
- *  reference to structures, to have it without getting locked into mutual includes and other
- *  hard-to-trace-and-fix behavior.  More class and struct defs can be added as necessary.
- */
-
-class SOLDIERTYPE;
-struct AnimationSurfaceType;
-
-#endif

Ja2/CMakeLists.txt

@@ -0,0 +1,37 @@
+set(Ja2Src
+"${CMAKE_CURRENT_SOURCE_DIR}/aniviewscreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Credits.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Fade Screen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/FeaturesScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/GameInitOptionsScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/gameloop.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/gamescreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/GameSettings.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/GameVersion.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/HelpScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Init.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Intro.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/JA2 Splash.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Ja25Update.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/jascreens.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Loading Screen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MainMenuScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MessageBoxScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPChatScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPConnectScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPHostScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPJoinScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPScoreScreen.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/MPXmlTeams.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/Options Screen.cpp"
+"${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}/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"
+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)
-	{
-		// BLIT HERE
-		Blt16BPPTo16BPP((UINT16 *)pDestBuf, uiDestPitchBYTES,
-					(UINT16 *)pSrcBuf, uiSrcPitchBYTES,
-					0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
-	}
+	Blt16BPPTo16BPP((UINT16 *)pDestBuf, uiDestPitchBYTES,
+				(UINT16 *)pSrcBuf, uiSrcPitchBYTES,
+				0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT );
 
 	UnLockVideoSurface(FRAME_BUFFER);
 	UnLockVideoSurface(guiSAVEBUFFER);

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/GameInitOptionsScreen.cpp

@@ -1830,7 +1830,7 @@ void BtnGIOSquadSizeSelectionRightCallback( GUI_BUTTON *btn,INT32 reason )
 	if( reason & MSYS_CALLBACK_REASON_LBUTTON_REPEAT )
 	{
 		UINT8 maxSquadSize = GIO_SQUAD_SIZE_10;
-		if (iResolution >= _800x600 && iResolution < _1024x768)
+		if (iResolution >= _800x600 && iResolution < _1280x720)
 			maxSquadSize = GIO_SQUAD_SIZE_8;
 
 		if ( iCurrentSquadSize < maxSquadSize )
@@ -1850,7 +1850,7 @@ void BtnGIOSquadSizeSelectionRightCallback( GUI_BUTTON *btn,INT32 reason )
 		btn->uiFlags|=(BUTTON_CLICKED_ON);
 
 		UINT8 maxSquadSize = GIO_SQUAD_SIZE_10;
-		if (iResolution >= _800x600 && iResolution < _1024x768)
+		if (iResolution >= _800x600 && iResolution < _1280x720 )
 			maxSquadSize = GIO_SQUAD_SIZE_8;
 
 		if ( iCurrentSquadSize < maxSquadSize )

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)
@@ -1185,6 +1192,12 @@ void LoadGameExternalOptions()
 	// Flugente: additional decals on objects (cracked walls, blood spatters etc.)
 	gGameExternalOptions.fAdditionalDecals					= iniReader.ReadBoolean( "Graphics Settings", "ADDITIONAL_DECALS", FALSE );
 
+	// anv: map color variants
+	gGameExternalOptions.ubRadarMapModeDay					= iniReader.ReadInteger("Graphics Settings", "RADAR_MAP_MODE_DAY", 0, 0, 2);
+	gGameExternalOptions.ubRadarMapModeNight				= iniReader.ReadInteger("Graphics Settings", "RADAR_MAP_MODE_NIGHT", 3, 0, 3);
+	gGameExternalOptions.ubOverheadMapModeDay				= iniReader.ReadInteger("Graphics Settings", "OVERHEAD_MAP_MODE_DAY", 0, 0, 2);
+	gGameExternalOptions.ubOverheadMapModeNight				= iniReader.ReadInteger("Graphics Settings", "OVERHEAD_MAP_MODE_NIGHT", 0, 0, 3);
+
 	//################# Sound Settings #################
 	
 	gGameExternalOptions.guiWeaponSoundEffectsVolume		= iniReader.ReadInteger("Sound Settings","WEAPON_SOUND_EFFECTS_VOLUME", 0, 0, 1000 /*1000 = 10x?*/);
@@ -1985,6 +1998,7 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.fFoodDecayInSectors							= iniReader.ReadBoolean("Tactical Food Settings", "FOOD_DECAY_IN_SECTORS", TRUE);
 	gGameExternalOptions.sFoodDecayModificator							= iniReader.ReadFloat("Tactical Food Settings", "FOOD_DECAY_MODIFICATOR",			1.0f, 0.1f, 10.0f);
 	gGameExternalOptions.fFoodEatingSounds								= iniReader.ReadBoolean("Tactical Food Settings", "FOOD_EATING_SOUNDS", TRUE);
+	gGameExternalOptions.fAlwaysFood                                    = iniReader.ReadBoolean("Tactical Food Settings", "ALWAYS_FOOD", FALSE);
 	
 	//################# Disease Settings ##################
 	gGameExternalOptions.fDisease										= iniReader.ReadBoolean( "Disease Settings", "DISEASE", FALSE );
@@ -3780,7 +3794,7 @@ void LoadCTHConstants()
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_WIS						= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_WIS",1.0, 0.0, 100.0);
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_AGI						= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_AGI",1.0, 0.0, 100.0);
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_EXP_LEVEL					= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_EXP_LEVEL",2.0, 0.0, 100.0);
-	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_AUTO_WEAPONS_DIVISOR		= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_AUTO_WEAPONS_DIVISOR",2.0, 1.0, 100.0);
+	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_AUTO_WEAPONS_DIVISOR		= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_AUTO_WEAPONS_DIVISOR",2.0, 1.0, 100.0);
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_TRACER_BONUS				= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_TRACER_BONUS",10.0, -1000.0, 1000.0);
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_ANTICIPATION				= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_ANTICIPATION",25.0, -1000.0, 1000.0);
 	gGameCTHConstants.RECOIL_COUNTER_ACCURACY_COMPENSATION				= iniReader.ReadFloat("Shooting Mechanism","RECOIL_COUNTER_ACCURACY_COMPENSATION",2.0, 0.0, 5.0);

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
@@ -505,6 +506,7 @@ typedef struct
 	FLOAT	sFoodDecayModificator;
 	
 	BOOLEAN fFoodEatingSounds;
+	BOOLEAN fAlwaysFood;
 
 	// Flugente: disease settings
 	BOOLEAN fDisease;
@@ -952,6 +954,12 @@ typedef struct
 
 	BOOLEAN fAdditionalDecals;						// Flugente: show additional decals on objects (cracked walls, blood spatters etc.)
 
+	// anv: map color variants
+	UINT8 ubRadarMapModeDay;
+	UINT8 ubRadarMapModeNight;
+	UINT8 ubOverheadMapModeDay;
+	UINT8 ubOverheadMapModeNight;
+
 	//enable ext mouse key
 	BOOLEAN bAltAimEnabled;	
 	BOOLEAN bAimedBurstEnabled;
@@ -1552,6 +1560,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/GameVersion.h

@@ -22,7 +22,7 @@ extern	CHAR16		zBuildInformation[256];
 //
 //		Keeps track of the saved game version.	Increment the saved game version whenever 
 //	you will invalidate the saved game file
-
+#define			MERC_PROFILE_INSERTION_DATA					185 // Bigmap support for AddProfileToMap function
 #define			GROWTH_MODIFIERS								184
 #define			REBELCOMMAND									183
 #define			DRAGSTRUCTURE									182 // Flugente: we can drag structures behind us
@@ -105,7 +105,7 @@ extern	CHAR16		zBuildInformation[256];
 #define			AP100_SAVEGAME_DATATYPE_CHANGE					105	// Before this, we didn't have the 100AP structure changes
 #define			NIV_SAVEGAME_DATATYPE_CHANGE					102	// Before this, we used the old structure system
 
-#define			SAVE_GAME_VERSION								GROWTH_MODIFIERS
+#define			SAVE_GAME_VERSION								MERC_PROFILE_INSERTION_DATA
 
 //#define RUSSIANGOLD
 #ifdef __cplusplus

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);
-			SGP_THROW_IFFALSE(PaletteDB::Instance().LoadFromFile(directoryName, LBT_PALETTESFILENAME), LBT_PALETTESFILENAME);
-			SGP_THROW_IFFALSE(SurfaceDB::Instance().LoadFromFile(directoryName, LBT_ANIMSURFACESFILENAME), LBT_ANIMSURFACESFILENAME);
-			SGP_THROW_IFFALSE(FilterDB::Instance().LoadFromFile(directoryName, LBT_FILTERSFILENAME), LBT_FILTERSFILENAME);
-			SGP_THROW_IFFALSE(BodyTypeDB::Instance().LoadFromFile(directoryName, LBT_BODYTYPESFILENAME), LBT_BODYTYPESFILENAME);
+			CHAR8 errorBuf[512]{"Failed loading LogicalBodyTypes external data!"};
+
+			SGP_THROW_IFFALSE(Layers::Instance().LoadFromFile(directoryName, LBT_LAYERSFILENAME, errorBuf), errorBuf);
+			SGP_THROW_IFFALSE(PaletteDB::Instance().LoadFromFile(directoryName, LBT_PALETTESFILENAME, errorBuf), errorBuf);
+			SGP_THROW_IFFALSE(SurfaceDB::Instance().LoadFromFile(directoryName, LBT_ANIMSURFACESFILENAME, errorBuf), errorBuf);
+			SGP_THROW_IFFALSE(FilterDB::Instance().LoadFromFile(directoryName, LBT_FILTERSFILENAME, errorBuf), errorBuf);
+			SGP_THROW_IFFALSE(BodyTypeDB::Instance().LoadFromFile(directoryName, LBT_BODYTYPESFILENAME, errorBuf), errorBuf);
 		}
 	}
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInLBEPocketStats(fileName,TRUE), fileName);
 	}
-#endif
+}
 
 	// THE_BOB : added for pocket popup definitions
 	LBEPocketPopup.clear();
@@ -461,7 +436,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat(fileName, LBEPOCKETPOPUPFILENAME);
 	SGP_THROW_IFFALSE(ReadInLBEPocketPopups(fileName),LBEPOCKETPOPUPFILENAME);
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 
 	if (FileExists(fileName))
@@ -476,10 +451,10 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		strcat(fileName, LBEPOCKETPOPUPFILENAME);
 		SGP_THROW_IFFALSE(ReadInLBEPocketPopups(fileName),LBEPOCKETPOPUPFILENAME);
 	}
-#else
+} else {
 	// WANNE: Load english file
 	SGP_THROW_IFFALSE(ReadInLBEPocketPopups(fileName),LBEPOCKETPOPUPFILENAME);
-#endif
+}
 
 
 #ifdef JA2UB
@@ -495,14 +470,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat(fileName, MERCSTARTINGGEARFILENAME);
 	SGP_THROW_IFFALSE(ReadInMercStartingGearStats(fileName, FALSE), MERCSTARTINGGEARFILENAME);
 
-	#ifndef ENGLISH
+	if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInMercStartingGearStats(fileName,TRUE), fileName);
 		}
-	#endif
+	}
 
 #endif
 
@@ -519,14 +494,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat(fileName, ATTACHMENTSLOTSFILENAME);
 	SGP_THROW_IFFALSE(ReadInAttachmentSlotsStats(fileName, FALSE),ATTACHMENTSLOTSFILENAME);
 
-	#ifndef ENGLISH
+	if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInAttachmentSlotsStats(fileName,TRUE), fileName);
 		}
-	#endif
+	}
 
 	// Flugente: created separate gun and item choices for different soldier classes - read in different xmls
 	strcpy(fileName, directoryName);
@@ -700,14 +675,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	strcat(fileName, CITYTABLEFILENAME);
 	SGP_THROW_IFFALSE(ReadInMapStructure(fileName, FALSE),CITYTABLEFILENAME);
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInStrategicMapSectorTownNames(fileName,TRUE), fileName);
 	}
-#endif
+}
 
 	// Lesh: Strategic movement costs will be read in Strategic\Strategic Movement Costs.cpp,
 	//		function BOOLEAN InitStrategicMovementCosts();
@@ -758,14 +733,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInShippingDestinations(fileName, FALSE),SHIPPINGDESTINATIONSFILENAME);
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInShippingDestinations(fileName, TRUE),fileName);
 	}
-#endif
+}
 	
 	strcpy(fileName, directoryName);
 	strcat(fileName, DELIVERYMETHODSFILENAME);
@@ -778,14 +753,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInFacilityTypes(fileName,FALSE), FACILITYTYPESFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInFacilityTypes(fileName,TRUE), fileName);
 	}
-#endif
+}
 
 	// HEADROCK HAM 3.4: Read in facility locations
 	strcpy(fileName, directoryName);
@@ -799,14 +774,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInSectorNames(fileName,FALSE,0), SECTORNAMESFILENAME);
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInSectorNames(fileName,TRUE, 0), fileName);
 	}
-#endif	
+}
 
 	// HEADROCK HAM 5: Read in Coolness by Sector
 	strcpy(fileName, directoryName);
@@ -828,7 +803,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));		
 		SGP_THROW_IFFALSE(ReadInMercProfiles(fileName, FALSE), MERCPROFILESFILENAME25);
 		
-		#ifndef ENGLISH
+		if( g_lang != i18n::Lang::en ) {
 			AddLanguagePrefix(fileName);
 			if ( FileExists(fileName) )
 			{
@@ -836,7 +811,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 				if(!ReadInMercProfiles(fileName,TRUE))
 				return FALSE;
 			}
-		#endif
+		}
 		}
 
 		strcpy(fileName, directoryName);
@@ -854,14 +829,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInMercProfiles(fileName, FALSE), MERCPROFILESFILENAME);
 
-		#ifndef ENGLISH
+		if( g_lang != i18n::Lang::en ) {
 			AddLanguagePrefix(fileName);
 			if ( FileExists(fileName) )
 			{
 				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 				SGP_THROW_IFFALSE(ReadInMercProfiles(fileName,TRUE), fileName);
 			}
-		#endif
+		}
 
 		// HEADROCK PROFEX: Read in Merc Opinion data to replace PROF.DAT data
 		strcpy(fileName, directoryName);
@@ -924,14 +899,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInEnemyNames(fileName,FALSE), ENEMYNAMESFILENAME);		
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInEnemyNames(fileName,TRUE), fileName);
 		}
-#endif
+}
 	}
 	
 	
@@ -943,14 +918,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInCivGroupNamesStats(fileName,FALSE), CIVGROUPNAMESFILENAME);
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInCivGroupNamesStats(fileName,TRUE), fileName);
 		}
-#endif
+}
 	}
 	
 	
@@ -960,14 +935,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInSenderNameList(fileName,FALSE), EMAILSENDERNAMELIST);
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInSenderNameList(fileName,TRUE), fileName);
 		}
-#endif
+}
 	
 	if (gGameExternalOptions.fEnemyRank == TRUE)
     {
@@ -977,14 +952,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInEnemyRank(fileName,FALSE), ENEMYRANKFILENAME);		
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInEnemyRank(fileName,TRUE), fileName);
 		}
-#endif
+}
 	}
 
 	// Flugente: backgrounds
@@ -993,14 +968,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInBackgrounds(fileName,FALSE), BACKGROUNDSFILENAME);
 			
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInBackgrounds(fileName,TRUE), BACKGROUNDSFILENAME);
 	}
-#endif
+}
 
 	// Flugente: individual militia
 	strcpy( fileName, directoryName );
@@ -1014,14 +989,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInCampaignStatsEvents(fileName,FALSE), CAMPAIGNSTATSEVENTSFILENAME);
 			
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInCampaignStatsEvents(fileName,TRUE), CAMPAIGNSTATSEVENTSFILENAME);
 	}
-#endif
+}
 
 	// WANNE: Only in a singleplayer game...
 	// Externalised taunts
@@ -1042,14 +1017,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 			strcat(fileName, FileInfo.zFileName);
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
-	#ifndef ENGLISH
+	if( g_lang != i18n::Lang::en ) {
 			AddLanguagePrefix(fileName);
 			if ( FileExists(fileName) )
 			{
 				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 				SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
 			}
-	#endif
+	}
 			while( GetFileNext(&FileInfo) )
 			{
 				strcpy(fileName, directoryName);
@@ -1057,14 +1032,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 				strcat(fileName, FileInfo.zFileName);
 				DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 				SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
-	#ifndef ENGLISH
+	if( g_lang != i18n::Lang::en ) {
 				AddLanguagePrefix(fileName);
 				if ( FileExists(fileName) )
 				{
 					DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 					SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
 				}
-	#endif
+	}
 			}
 			GetFileClose(&FileInfo);
 		}
@@ -1076,14 +1051,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInHistorys(fileName,FALSE), HISTORYNAMEFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInHistorys(fileName,TRUE), fileName);
 		}
-#endif
+}
 
 	// IMP Portraits List by Jazz
 	strcpy(fileName, directoryName);
@@ -1091,14 +1066,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInIMPPortraits(fileName,FALSE), IMPPORTRAITS);
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInIMPPortraits(fileName,TRUE), fileName);
 		}
-#endif
+}
 
 	LoadIMPPortraitsTEMP( );
 
@@ -1183,14 +1158,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	SGP_THROW_IFFALSE(ReadInFaceGear(zNewFaceGear, fileName), FACEGEARFILENAME);
 	//WriteFaceGear();
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInMercAvailability(fileName,TRUE), fileName);
 		}
-#endif
+}
 	UINT32 i;
 		for(i=0; i<NUM_PROFILES; i++)
 		{
@@ -1204,14 +1179,14 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInAimAvailability(fileName,FALSE), AIMAVAILABILITY);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInAimAvailability(fileName,TRUE), fileName);
 		}
-#endif
+}
 
 	//Main Menu by Jazz	
 	strcpy(fileName, directoryName);
@@ -1224,7 +1199,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInActionItems(fileName,FALSE), ACTIONITEMSFILENAME);	
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1232,7 +1207,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
 			if(!ReadInActionItems(fileName,TRUE))
 				return FALSE;
 		}
-#endif
+}
 
 if ( ReadXMLEmail == TRUE )
 {
@@ -1242,7 +1217,7 @@ if ( ReadXMLEmail == TRUE )
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInEmailMercAvailable(fileName,FALSE), EMAILMERCAVAILABLE);
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1250,7 +1225,7 @@ if ( ReadXMLEmail == TRUE )
 			if(!ReadInEmailMercAvailable(fileName,TRUE))
 				return FALSE;
 		}
-#endif
+}
 
 		// EMAIL MERC LEVEL UP by Jazz
 		strcpy(fileName, directoryName);
@@ -1258,7 +1233,7 @@ if ( ReadXMLEmail == TRUE )
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInEmailMercLevelUp(fileName,FALSE), EMAILMERCLEVELUP);
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1266,7 +1241,7 @@ if ( ReadXMLEmail == TRUE )
 			if(!ReadInEmailMercLevelUp(fileName,TRUE))
 				return FALSE;
 		}
-#endif
+}
 }
 /*
 		// EMAIL OTHER by Jazz
@@ -1275,7 +1250,7 @@ if ( ReadXMLEmail == TRUE )
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInEmailOther(fileName,FALSE), EMAILOTHER);
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1283,7 +1258,7 @@ if ( ReadXMLEmail == TRUE )
 			if(!ReadInEmailOther(fileName,TRUE))
 				return FALSE;
 		}
-#endif
+}
 */
 	//new vehicles by Jazz	
 	
@@ -1294,7 +1269,7 @@ if ( ReadXMLEmail == TRUE )
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInNewVehicles(fileName,FALSE), VEHICLESFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1302,9 +1277,9 @@ if ( ReadXMLEmail == TRUE )
 			if(!ReadInNewVehicles(fileName,TRUE))
 				return FALSE;
 		}
-#endif
+}
 
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
@@ -1312,7 +1287,7 @@ if ( ReadXMLEmail == TRUE )
 			if(!ReadInLanguageLocation(fileName,TRUE,zlanguageText,0))
 				return FALSE;
 		}
-#endif
+}
 
 #ifdef ENABLE_BRIEFINGROOM
 	strcpy(fileName, directoryName);
@@ -1320,14 +1295,14 @@ if ( ReadXMLEmail == TRUE )
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInBriefingRoom(fileName,FALSE,gBriefingRoomData, 4), BRIEFINGROOMFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInBriefingRoom(fileName,TRUE,gBriefingRoomData, 4), fileName);
 		}
-#endif
+}
 
 BackupBRandEncyclopedia ( gBriefingRoomData, gBriefingRoomDataBackup, 0);
 
@@ -1339,14 +1314,14 @@ BackupBRandEncyclopedia ( gBriefingRoomData, gBriefingRoomDataBackup, 0);
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInMinerals(fileName,FALSE), MINERALSFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 	AddLanguagePrefix(fileName);
 	if ( FileExists(fileName) )
 	{
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInMinerals(fileName,TRUE), fileName);
 	}
-#endif
+}
 
 	// Old AIM Archive
 		UINT8 p;
@@ -1360,14 +1335,14 @@ BackupBRandEncyclopedia ( gBriefingRoomData, gBriefingRoomDataBackup, 0);
 	DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 	SGP_THROW_IFFALSE(ReadInAimOldArchive(fileName,FALSE), OLDAIMARCHIVEFILENAME);
 	
-#ifndef ENGLISH
+if( g_lang != i18n::Lang::en ) {
 		AddLanguagePrefix(fileName);
 		if ( FileExists(fileName) )
 		{
 			DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 			SGP_THROW_IFFALSE(ReadInAimOldArchive(fileName,TRUE), fileName);
 		}
-#endif
+}
 		UINT8 emptyslotsinarchives = 0;
 		for (p=0;p<NUM_PROFILES;p++)
 		{
@@ -1417,14 +1392,14 @@ BackupBRandEncyclopedia ( gBriefingRoomData, gBriefingRoomDataBackup, 0);
 		DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 		SGP_THROW_IFFALSE(ReadInDifficultySettings(fileName,FALSE), DIFFICULTYFILENAME);
 
-			#ifndef ENGLISH
+			if( g_lang != i18n::Lang::en ) {
 				AddLanguagePrefix(fileName);
 				if ( FileExists(fileName) )
 				{
 					DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
 					SGP_THROW_IFFALSE(ReadInDifficultySettings(fileName,TRUE), fileName);
 				}
-			#endif
+			}
 
 	LuaState::INIT(lua::LUA_STATE_STRATEGIC_MINES_AND_UNDERGROUND, true);
 	g_luaUnderground.LoadScript(GetLanguagePrefix());
@@ -1498,6 +1473,10 @@ UINT32 InitializeJA2(void)
 		return( ERROR_SCREEN );
 	}
 
+	// InitRadarScreenCoords() depend on Mapscreen Interface Bottom coordinates -> need to initiate them first
+	// before calling InitTacticalEngine()
+	InitMapScreenInterfaceBottomCoords();
+
 	// Init tactical engine
 	if ( !InitTacticalEngine( ) )
 	{
@@ -1514,12 +1493,6 @@ UINT32 InitializeJA2(void)
 	// INit intensity tables
 	BuildIntensityTable( );
 
-	// Init Event Manager
-	if ( !InitializeEventManager( ) )
-	{
-		return( ERROR_SCREEN );
-	}
-
 	// Initailize World
 	if ( !InitializeWorld( ) )
 	{
@@ -1698,8 +1671,6 @@ void ShutdownJA2(void)
 
 	ShutdownJA2Sound( );
 
-	ShutdownEventManager( );
-
 	ShutdownBaseDirtyRectQueue( );
 
 	// Unload any text box images!

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/Ja25Update.cpp

@@ -11,7 +11,6 @@
 #include "Animation Cache.h"
 #include "Animation Data.h"
 #include "Animation Control.h"
-#include "container.h"
 #include <math.h>
 #include "pathai.h"
 #include "Random.h"

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/MainMenuScreen.cpp

@@ -248,7 +248,6 @@ BOOLEAN InitMainMenu( )
 	{	
 		is_networked = FALSE;
 
-#ifdef USE_VFS
 		// remove Multiplayer profile if it exists
 		vfs::CProfileStack *PS = getVFS()->getProfileStack();
 		vfs::CVirtualProfile *pProf = PS->getProfile("_MULTIPLAYER");
@@ -256,7 +255,6 @@ BOOLEAN InitMainMenu( )
 		{
 			SGP_THROW_IFFALSE(PS->popProfile(), "Leaving Multiplayer mode : Could not remove \"_MULTIPLAYER\" profile");
 		}
-#endif
 
 		// Snap: UN-Init MP save game directory
 		if ( !InitSaveDir() )

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;
@@ -1463,7 +1467,17 @@ BOOLEAN MERCPROFILESTRUCT::Load(HWFILE hFile, bool forceLoadOldVersion, bool for
 		numBytesRead = ReadFieldByField( hFile, &this->ubLastDateSpokenTo, sizeof(this->ubLastDateSpokenTo), sizeof(UINT8), numBytesRead);
 		numBytesRead = ReadFieldByField( hFile, &this->bLastQuoteSaidWasSpecial, sizeof(this->bLastQuoteSaidWasSpecial), sizeof(UINT8), numBytesRead);
 		numBytesRead = ReadFieldByField( hFile, &this->bSectorZ, sizeof(this->bSectorZ), sizeof(INT8), numBytesRead);
-		numBytesRead = ReadFieldByField( hFile, &this->usStrategicInsertionData, sizeof(this->usStrategicInsertionData), sizeof(UINT16), numBytesRead);
+
+		if ( guiCurrentSaveGameVersion >= MERC_PROFILE_INSERTION_DATA )
+		{
+			numBytesRead = ReadFieldByField( hFile, &this->usStrategicInsertionData, sizeof( this->usStrategicInsertionData ), sizeof( UINT32 ), numBytesRead );
+		}
+		else
+		{
+			numBytesRead = ReadFieldByField( hFile, &this->usStrategicInsertionData, sizeof(UINT16), sizeof(UINT16), numBytesRead);
+			buffer += 4; // To make numBytesRead check match the struct size. 2 bytes from uint32 - uint16 and 2 bytes due to struct memory layout change when usStrategicInsertionData was increased to uint32
+		}
+
 		numBytesRead = ReadFieldByField( hFile, &this->bFriendlyOrDirectDefaultResponseUsedRecently, sizeof(this->bFriendlyOrDirectDefaultResponseUsedRecently), sizeof(INT8), numBytesRead);
 		numBytesRead = ReadFieldByField( hFile, &this->bRecruitDefaultResponseUsedRecently, sizeof(this->bRecruitDefaultResponseUsedRecently), sizeof(INT8), numBytesRead);
 		numBytesRead = ReadFieldByField( hFile, &this->bThreatenDefaultResponseUsedRecently, sizeof(this->bThreatenDefaultResponseUsedRecently), sizeof(INT8), numBytesRead);
@@ -3553,33 +3567,6 @@ BOOLEAN Inventory::Save( HWFILE hFile, bool fSavingMap )
 // The save directory now resides in the data directory (default or custom)
 BOOLEAN InitSaveDir()
 {
-#ifndef USE_VFS
-	// Look for a custom data dir first
-	std::string dataDir = gCustomDataCat.GetRootDir();
-	if( dataDir.empty() || FileGetAttributes( (STR) dataDir.c_str() ) == 0xFFFFFFFF ) {
-		dataDir = gDefaultDataCat.GetRootDir();
-	}
-
-	// The locale-specific save dir location is of the form L"..\\SavedGames"
-	// This has not changed; instead, we strip the ".." at the beginning
-	if(is_networked)
-	{
-		sprintf(	gSaveDir, "%s%S", dataDir.c_str(), pMessageStrings[ MSG_MPSAVEDIRECTORY	 ] + 2 );
-	}
-	else
-		sprintf(	gSaveDir, "%s%S", dataDir.c_str(), pMessageStrings[ MSG_SAVEDIRECTORY ] + 2 );
-
-	// This was moved here from SaveGame
-	//Check to see if the save directory exists
-	if( FileGetAttributes( (STR) gSaveDir ) ==	0xFFFFFFFF )
-	{
-		//ok the direcotry doesnt exist, create it
-		if( !MakeFileManDirectory( (CHAR8 *)gSaveDir ) )
-		{
-			return FALSE;
-		}
-	}
-#else
 	if(is_networked)
 	{
 		sprintf(	gSaveDir, "%s", vfs::String::as_utf8(pMessageStrings[ MSG_MPSAVEDIRECTORY ] + 3).c_str() );
@@ -3588,7 +3575,6 @@ BOOLEAN InitSaveDir()
 	{
 		sprintf(	gSaveDir, "%s", vfs::String::as_utf8(pMessageStrings[ MSG_SAVEDIRECTORY ] + 3).c_str() );
 	}
-#endif
 	return TRUE;
 }
 
@@ -3616,14 +3602,8 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 	alreadySaving = true;
 
 #ifdef LOADSAVEGAME_LOGTIME
-	// Flugente: log how long this takes
-	clock_t starttime = clock();
-	clock_t t0;
-	clock_t t1 = starttime;
-
-	FILE* fp_timelog = fopen("LoadSavedGame_TimeLog.txt", "a");
+	TimingLogInitialize("TimeLog_LoadSavedGame.txt");
 #endif
-
 	//clear out the save game header
 	memset( &SaveGameHeader, 0, sizeof( SAVED_GAME_HEADER ) );
 
@@ -3803,14 +3783,9 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 	//Create the name of the file
 	CreateSavedGameFileNameFromNumber( ubSaveGameID, zSaveGameName );
 #if LOADSAVEGAME_LOGTIME
-	if (fp_timelog)
-	{
-		fprintf(fp_timelog, "Save savegame: %s\n", zSaveGameName);
-
-		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));
-	}
+	TimingLogWrite("Save ");
+	TimingLogWrite(zSaveGameName);
+	TimingLog("\nShutdown stuff", 10);
 #endif
 
 	//if the file already exists, delete it
@@ -3947,12 +3922,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Tactical Status" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
-		{
-			t0 = t1;
-			t1 = clock();
-			fprintf(fp_timelog, "SaveTacticalStatusFromSavedGame done\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-		}
+	TimingLog("SaveTacticalStatusToSavedGame", 6);
 #endif
 
 
@@ -3994,12 +3964,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Laptop Info" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
-		{
-			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));
-		}
+	TimingLog("SaveLaptopInfoToSavedGame", 7);
 #endif
 
 	//
@@ -4031,12 +3996,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Soldier Structure" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
-		{
-			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));
-		}
+	TimingLog("SaveSoldierStructure", 8);
 #endif
 
 
@@ -4099,12 +4059,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Strategic Information" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
-		{
-			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));
-		}
+	TimingLog("SaveStrategicInfoToSavedFile", 6);
 #endif
 
 	/*// Flugente: Save the strategic supply
@@ -4154,12 +4109,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Strategic Movement Groups" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
-		{
-			t0 = t1;
-			t1 = clock();
-			fprintf(fp_timelog, "SaveStrategicMovementGroupsFromSavedGameFile done\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-		}
+	TimingLog("SaveStrategicMovementGroupsToSaveGameFile", 3);
 #endif
 
 
@@ -4176,12 +4126,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "All the Map Temp files" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
-		{
-			t0 = t1;
-			t1 = clock();
-			fprintf(fp_timelog, "SaveMapTempFilesFromSavedGameFile done\t\t\t\t\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-		}
+	TimingLog("SaveMapTempFilesToSavedGameFile", 6);
 #endif
 
 	if( !SaveQuestInfoToSavedGameFile( hFile ) )
@@ -4347,12 +4292,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 	SaveGameFilePosition( FileGetPos( hFile ), "Militia Movement" );
 #endif
 #if LOADSAVEGAME_LOGTIME
-	if (fp_timelog)
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf(fp_timelog, "SaveMilitiaMovementInformationFromSavedGameFile done\t\t\t: %fs\n", ((float)(t1 - t0) / CLOCKS_PER_SEC));
-	}
+	TimingLog("SaveMilitiaMovementInformationToSaveGameFile", 2);
 #endif
 
 	if( !SaveBulletStructureToSaveGameFile( hFile ) )
@@ -4592,12 +4532,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		SaveGameFilePosition( FileGetPos( hFile ), "Lua global" );
 	#endif
 #if LOADSAVEGAME_LOGTIME
-		if (fp_timelog)
-		{
-			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));
-		}
+	TimingLog("SaveLuaGlobalToSaveGameFile", 7);
 #endif
 
 	if( !SaveDataSaveToSaveGameFile( hFile ) )
@@ -4697,12 +4632,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 		goto FAILED_TO_SAVE;
 	}
 #if LOADSAVEGAME_LOGTIME
-	if (fp_timelog)
-	{
-		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));
-	}
+	TimingLog("File read done", 10);
 #endif
 
 	//Close the saved game file
@@ -4783,22 +4713,9 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 	alreadySaving = false;
 
 #if LOADSAVEGAME_LOGTIME
-	if (fp_timelog)
-	{
-		t0 = t1;
-		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);
+	TimingLog("Update functions", 9);
+	TimingLogTotalTime("SaveSavedGame total", 9);
+	TimingLogStop();
 #endif
 	return( TRUE );
 
@@ -4808,6 +4725,9 @@ FAILED_TO_SAVE:
 #ifdef JA2BETAVERSION
 	SaveGameFilePosition( FileGetPos( hFile ), "Failed to Save!!!" );
 #endif
+#if LOADSAVEGAME_LOGTIME
+	TimingLogStop();
+#endif
 
 	FileClose( hFile );
 
@@ -4853,8 +4773,6 @@ extern int gEnemyPreservedTempFileVersion[256];
 extern int gCivPreservedTempFileVersion[256];
 
 
-#include "time.h"
-
 BOOLEAN LoadSavedGame( int ubSavedGameID )
 {
 	HWFILE	hFile;
@@ -4873,12 +4791,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 #endif
 
 #ifdef LOADSAVEGAME_LOGTIME
-	// Flugente: log how long this takes
-	clock_t starttime = clock();
-	clock_t t0;
-	clock_t t1 = starttime;
-	
-	FILE *fp_timelog = fopen( "LoadSavedGame_TimeLog.txt", "a" );
+	TimingLogInitialize("TimeLog_LoadSavedGame.txt");
 #endif
 	
 	uiRelStartPerc = uiRelEndPerc =0;
@@ -4961,14 +4874,9 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	CreateSavedGameFileNameFromNumber( ubSavedGameID, zSaveGameName );
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		fprintf( fp_timelog, "Load savegame: %s\n", zSaveGameName );
-
-		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 ) );
-	}
+	TimingLogWrite("Load ");
+	TimingLogWrite(zSaveGameName);
+	TimingLog("\nShutdown stuff", 10);
 #endif
 
 	// open the save game file
@@ -5089,19 +4997,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 ) )
@@ -5222,12 +5125,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	#endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		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 ) );
-	}
+	TimingLog("LoadLaptopInfoFromSavedGame", 7);
 #endif
 
 	uiRelEndPerc += 0;
@@ -5270,12 +5168,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	#endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		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 ) );
-	}
+	TimingLog("LoadSoldierStructure", 8);
 #endif
 
 	uiRelEndPerc += 1;
@@ -5404,12 +5297,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 #endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		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 ) );
-	}
+	TimingLog("LoadStrategicInfoFromSavedFile", 6);
 #endif
 
 	uiRelEndPerc += 1;
@@ -5470,12 +5358,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	ValidateStrategicGroups();
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadStrategicMovementGroupsFromSavedGameFile done\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
+	TimingLog("LoadStrategicMovementGroupsFromSavedGameFile", 2);
 #endif
 
 	uiRelEndPerc += 30;
@@ -5495,12 +5378,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	#endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadMapTempFilesFromSavedGameFile done\t\t\t\t\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
+	TimingLog("LoadMapTempFilesFromSavedGameFile", 5);
 #endif
 
 	uiRelEndPerc += 1;
@@ -5799,12 +5677,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 #endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		t0 = t1;
-		t1 = clock();
-		fprintf( fp_timelog, "LoadMilitiaMovementInformationFromSavedGameFile done\t\t\t: %fs\n", ( (float)( t1 - t0 ) / CLOCKS_PER_SEC ) );
-	}
+	TimingLog("LoadMilitiaMovementInformationFromSavedGameFile", 2);
 #endif
 
 	uiRelEndPerc += 1;
@@ -6364,12 +6237,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	#endif
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		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 ) );
-	}
+	TimingLog("LoadLuaGlobalFromLoadGameFile", 6);
 #endif
 	
 	if( guiCurrentSaveGameVersion >= VEHICLES_DATATYPE_CHANGE && guiCurrentSaveGameVersion < NO_VEHICLE_SAVE)
@@ -6601,12 +6469,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	}
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		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 ) );
-	}
+	TimingLog("File read done", 10);
 #endif
 
 	//
@@ -7051,22 +6914,9 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	gGameExternalOptions.gfAllowReinforcements = zDiffSetting[gGameOptions.ubDifficultyLevel].bAllowReinforcements;
 
 #if LOADSAVEGAME_LOGTIME
-	if ( fp_timelog )
-	{
-		t0 = t1;
-		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 );
+	TimingLog("Update functions", 9);
+	TimingLogTotalTime("LoadSavedGame total", 9);
+	TimingLogStop();
 #endif
 
 	DebugQuestInfo("\n--------- Game loaded ---------");
@@ -7366,7 +7216,7 @@ BOOLEAN LoadSoldierStructure( HWFILE hFile )
 					}
 				}
 
-#ifdef GERMAN
+if( g_lang == i18n::Lang::de ) {
 				// Fix neutral flags
 				if ( guiCurrentSaveGameVersion < 94 )
 				{
@@ -7376,7 +7226,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 ] );
@@ -9711,21 +9561,6 @@ BOOLEAN SaveMeanwhileDefsFromSaveGameFile( HWFILE hFile )
 	return( TRUE );
 }
 
-BOOLEAN DoesUserHaveEnoughHardDriveSpace()
-{
-	UINT32			uiBytesFree=0;
-
-	uiBytesFree = GetFreeSpaceOnHardDriveWhereGameIsRunningFrom( );
-
-	//check to see if there is enough hard drive space
-	if( uiBytesFree < REQUIRED_FREE_SPACE )
-	{
-		return( FALSE );
-	}
-
-	return( TRUE );
-}
-
 #ifdef JA2BETAVERSION
 
 void InitShutDownMapTempFileTest( BOOLEAN fInit, STR pNameOfFile, UINT8 ubSaveGameID )
@@ -9989,69 +9824,6 @@ void UpdateMercMercContractInfo()
 	}
 }
 
-INT8 GetNumberForAutoSave( BOOLEAN fLatestAutoSave )
-{
-	CHAR	zFileName1[MAX_PATH];
-	CHAR	zFileName2[MAX_PATH];
-	HWFILE	hFile;
-	BOOLEAN	fFile1Exist, fFile2Exist;
-	SGP_FILETIME	CreationTime1, LastAccessedTime1, LastWriteTime1;
-	SGP_FILETIME	CreationTime2, LastAccessedTime2, LastWriteTime2;
-
-	fFile1Exist = FALSE;
-	fFile2Exist = FALSE;
-
-
-	//The name of the file
-	sprintf( zFileName1, "%s\\Auto%02d.%S", gSaveDir, 0, pMessageStrings[ MSG_SAVEEXTENSION ] );
-	sprintf( zFileName2, "%s\\Auto%02d.%S", gSaveDir, 1, pMessageStrings[ MSG_SAVEEXTENSION ] );
-
-	if( FileExists( zFileName1 ) )
-	{
-		hFile = FileOpen( zFileName1, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
-
-		GetFileManFileTime( hFile, &CreationTime1, &LastAccessedTime1, &LastWriteTime1 );
-
-		FileClose( hFile );
-
-		fFile1Exist = TRUE;
-	}
-
-	if( FileExists( zFileName2 ) )
-	{
-		hFile = FileOpen( zFileName2, FILE_ACCESS_READ | FILE_OPEN_EXISTING, FALSE );
-
-		GetFileManFileTime( hFile, &CreationTime2, &LastAccessedTime2, &LastWriteTime2 );
-
-		FileClose( hFile );
-
-		fFile2Exist = TRUE;
-	}
-
-	if( !fFile1Exist && !fFile2Exist )
-		return( -1 );
-	else if( fFile1Exist && !fFile2Exist )
-	{
-		if( fLatestAutoSave )
-			return( 0 );
-		else
-			return( -1 );
-	}
-	else if( !fFile1Exist && fFile2Exist )
-	{
-		if( fLatestAutoSave )
-			return( 1 );
-		else
-			return( -1 );
-	}
-	else
-	{
-		if( CompareSGPFileTimes( &LastWriteTime1, &LastWriteTime2 ) > 0 )
-			return( 0 );
-		else
-			return( 1 );
-	}
-}
 
 void HandleOldBobbyRMailOrders()
 {
@@ -10135,9 +9907,9 @@ UINT32 CalcJA2EncryptionSet( SAVED_GAME_HEADER * pSaveGameHeader )
 		}
 	}
 
-	#ifdef GERMAN
+	if( g_lang == i18n::Lang::de ) {
 		uiEncryptionSet *= 11;
-	#endif
+	}
 
 	uiEncryptionSet = uiEncryptionSet % 10;
 

Ja2/SaveLoadGame.h

@@ -93,13 +93,10 @@ BOOLEAN CopySavedSoldierInfoToNewSoldier( SOLDIERTYPE *pDestSourceInfo, SOLDIERT
 BOOLEAN		SaveFilesToSavedGame( STR pSrcFileName, HWFILE hFile );
 BOOLEAN		LoadFilesFromSavedGame( STR pSrcFileName, HWFILE hFile );
 
-BOOLEAN DoesUserHaveEnoughHardDriveSpace();
-
 void GetBestPossibleSectorXYZValues( INT16 *psSectorX, INT16 *psSectorY, INT8 *pbSectorZ );
 
 
 extern UINT32	guiLastSaveGameNum;			// The end turn auto save number (0 = Auto00.sav, 1 = Auto01.sav)
-INT8		GetNumberForAutoSave( BOOLEAN fLatestAutoSave );
 
 /*CHRISL: This function is designed to allow reading the save game file one field at a time.  We currently save structures by saving a block of memory,
 but variables are stored in memory so that they fit neatly into a WORD resulting in the program automatically adding some padding.  This padding is saved

Ja2/SaveLoadScreen.cpp

@@ -1350,7 +1350,6 @@ BOOLEAN InitSaveGameArray()
 				gbSaveGameArray[VAL_SLOT_START + cnt] = TRUE;
 
 				// anv: read last modified date property of save file
-#ifdef USE_VFS
 				// get full path to save file
 				vfs::Path vfsPath;
 				vfs::COpenReadFile rfile(zSaveGameName);
@@ -1369,7 +1368,6 @@ BOOLEAN InitSaveGameArray()
 				// close
 				CloseHandle( hFile );
 				rfile->close();
-#endif
 			}
 		}
 		else

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/aniviewscreen.cpp

@@ -11,7 +11,6 @@
 	#include "input.h"
 	#include "font.h"
 	#include "screenids.h"
-	#include "container.h"
 	#include "overhead.h"
 	#include "sysutil.h"
 	#include "Font Control.h"

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.cpp

@@ -628,7 +628,14 @@ UINT32	MainGameScreenHandle(void)
 				InternalLocateGridNo( gGameUBOptions.LOCATEGRIDNO, TRUE );
         }
 #else
+		if (gfFirstHeliRun)
+		{
 			InternalLocateGridNo( gGameExternalOptions.iInitialMercArrivalLocation, TRUE );
+		}
+		else
+		{
+			InternalLocateGridNo(gMapInformation.sCenterGridNo, TRUE);
+		}
 #endif
 		// Flugente: we might have reloaded the game, so we are currently not dropping mercs out of a helicopter
 		gfIngagedInDrop = FALSE;

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 )
@@ -396,44 +396,25 @@ UINT32 InitScreenHandle(void)
 
 		// Handle queued .ini file error messages
  		int y = 40;
-#ifdef USE_VFS
 		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);
-#endif
 		while (! iniErrorMessages.empty()) {
-#ifndef USE_VFS
-			FILE *file_pointer;
-#endif
 			static BOOL iniErrorMessage_create_out_file = TRUE;
 			std::string iniErrorMessage = iniErrorMessages.top();
 			CHAR16 str[256];
 
 			if (iniErrorMessage_create_out_file)
 			{
-#ifndef USE_VFS
-				fopen_s( &file_pointer, "..\\iniErrorReport.txt", "w" );
-#endif
 				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;
 			}
-			else
-			{
-#ifndef USE_VFS
-				fopen_s( &file_pointer, "..\\iniErrorReport.txt", "a+" );
-#endif
-			}
 
 			y += 25;
 			swprintf( str, L"%S", iniErrorMessage.c_str() );
-#ifndef USE_VFS
-			fprintf_s (file_pointer , "%S\n"  , str );
-			fclose( file_pointer );
-#else
 			logger << iniErrorMessage << sgp::endl;
-#endif
 		    DisplayWrappedString( 10, y, 560, 2, FONT12ARIAL, FONT_ORANGE, str, FONT_BLACK, TRUE, LEFT_JUSTIFIED );
 
 			iniErrorMessages.pop();
@@ -978,7 +959,6 @@ void DoneFadeOutForDemoExitScreen( void )
 // unused
 //extern INT8 gbFadeSpeed;
 
-#ifdef GERMAN
 void DisplayTopwareGermanyAddress()
 {
 	VOBJECT_DESC		vo_desc;
@@ -1013,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