Merge with upstream

.github/workflows/cmake-multi-platform.yml

@@ -20,7 +20,7 @@ jobs:
       # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
       matrix:
         os: [ubuntu-latest, windows-2025]
-        build_type: [Release]
+        build_type: [Release, Debug]
         c_compiler: [gcc, clang, cl]
         include:
           - os: windows-2025
@@ -32,19 +32,30 @@ jobs:
           - os: ubuntu-latest
             c_compiler: clang
             cpp_compiler: clang++
+          #- os: macos-latest
+          #  c_compiler: clang
+          #  cpp_compiler: clang++
         exclude:
           - os: windows-2025
             c_compiler: gcc
           - os: windows-2025
             c_compiler: clang
           - os: ubuntu-latest
             c_compiler: cl
+          - os: macos-latest
+            c_compiler: gcc
+          - os: macos-latest
+            c_compiler: cl
 
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
 
+    - name: Update linux apt
+      if: ${{ matrix.os == 'ubuntu-latest' }}
+      run: sudo apt update
+
     - name: Install linux dependencies
       if: ${{ matrix.os == 'ubuntu-latest' }}
       run: sudo apt install libx11-dev libopengl-dev libglx-dev mesa-common-dev build-essential git make

.gitignore

@@ -1,4 +1,4 @@
 /build/vs2019
 /FitdLib/shaders/generated
-build/vs2022
+build
 data

CMakeLists.txt

@@ -1,6 +1,14 @@
 project(FITD)
 cmake_minimum_required(VERSION 3.9)
 
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBX_CONFIG_DEBUG=0")
+#set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /DBX_CONFIG_DEBUG=1")
+
+IF(MSVC)
+    #set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /D_MSVC_STL_HARDENING=1")
+    #set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_MSVC_STL_HARDENING=1")
+ENDIF(MSVC)
+
 set(THIRD_PARTY "${CMAKE_SOURCE_DIR}/ThirdParty")
 
 set(BGFX_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
@@ -19,5 +27,22 @@ set(ZLIB_LIBRARY zlibstatic)
 set(ZLIB_TESTS OFF CACHE BOOL "Build zlib tests")
 add_subdirectory(${THIRD_PARTY}/zlib ${CMAKE_BINARY_DIR}/zlib/zlib-build)
 
+
 add_subdirectory( FitdLib )
-add_subdirectory( Fitd )
+add_subdirectory( Fitd )
+
+#set(USE_SANITIZER ON)
+if(USE_SANITIZER)
+    IF(MSVC)
+        set(SANITIZER_TYPE "address")
+    ELSE()
+        set(SANITIZER_TYPE "address,undefined,leak")
+    ENDIF()
+
+	target_link_options(Fitd PRIVATE "-fsanitize=${SANITIZER_TYPE}")
+	target_compile_options(Fitd PRIVATE "-fsanitize=${SANITIZER_TYPE}")
+	target_compile_options(FitdLib PRIVATE "-fsanitize=${SANITIZER_TYPE}")
+	target_compile_options(bimg PRIVATE "-fsanitize=${SANITIZER_TYPE}")
+	target_compile_options(bgfx PRIVATE "-fsanitize=${SANITIZER_TYPE}")
+	target_compile_options(soloud PRIVATE "-fsanitize=${SANITIZER_TYPE}")
+endif()

Fitd/fitd.cpp

@@ -1,12 +1,12 @@
 extern "C" {
     int FitdMain(int argc, char* argv[]);
-}
-
+}
+
 int FitdInit(int argc, char* argv[]);
 
 int main(int argc, char* argv[])
-{
+{
     FitdInit(argc, argv);
     FitdMain(argc, argv);
     return 0;
-}
+}

FitdLib/AITD1.cpp

@@ -179,6 +179,7 @@ int ChoosePerso(void)
     int firsttime = 1;
     int choiceMade = 0;
 
+    uiLayer.fill(0);
     InitCopyBox(aux, logicalScreen);
 
     while (choiceMade == 0)
@@ -316,7 +317,7 @@ void startAITD1()
     while (1)
     {
 #ifndef AITD_UE4
-        int startupMenuResult = processStartupMenu();
+        int startupMenuResult = MainMenu();
 #else
         int startupMenuResult = 0;
 #endif
@@ -372,11 +373,11 @@ void startAITD1()
 
                 //          updateShaking();
 
-                flagInitView = 2;
+                FlagInitView = 2;
 
-                setupCamera();
+                InitView();
 
-                mainLoop(1, 1);
+                PlayWorld(1, 1);
 
                 //          freeScene();
 

FitdLib/AITD1_Tatou.cpp

@@ -4,36 +4,36 @@
 
 void clearScreenTatou(void)
 {
-	int i;
-
-	for(i=0;i<45120;i++)
+	for(int i=0;i<45120;i++)
 	{
 		frontBuffer[i] = 0;
 	}
 }
 
 int make3dTatou(void)
 {
-    char* tatou2d;
-    char* tatou3d;
-    unsigned char* tatouPal;
-    int time;
+    int zoom;
     int deltaTime;
-    int rotation;
-    int unk1;
-    unsigned char paletteBackup[768];
+    int beta;
+    int alpha;
     unsigned int localChrono;
+    palette_t tatouPal;
+    palette_t paletteBackup;
+
+    char* tatou2d = CheckLoadMallocPak("ITD_RESS",AITD1_TATOU_MCG);
+
+    char* tatou3dRaw = CheckLoadMallocPak("ITD_RESS", AITD1_TATOU_3DO);
+    sBody* tatou3d = createBodyFromPtr(tatou3dRaw);
 
-    tatou2d = CheckLoadMallocPak("ITD_RESS",AITD1_TATOU_MCG);
-    tatou3d = CheckLoadMallocPak("ITD_RESS",AITD1_TATOU_3DO);
-    tatouPal = (unsigned char*)CheckLoadMallocPak("ITD_RESS",AITD1_TATOU_PAL);
+    char* tatouPalRaw = CheckLoadMallocPak("ITD_RESS",AITD1_TATOU_PAL);
+    copyPalette(tatouPalRaw, tatouPal);
 
-    time = 8920;
+    zoom = 8920;
     deltaTime = 50;
-    rotation = 256;
-    unk1 = 8;
+    beta = 256;
+    alpha = 8;
 
-    setupCameraProjection(160,100,128,500,490);
+    SetProjection(160,100,128,500,490);
 
     copyPalette(currentGamePalette,paletteBackup);
 
@@ -58,15 +58,18 @@ int make3dTatou(void)
 		//timeGlobal++;
 		timer = timeGlobal;
 
-        if(evalChrono(&localChrono)<=180) // avant eclair
+        if(evalChrono(&localChrono)<=180) 
         {
+            // before lightning strike
             if(key || Click)
             {
                 break;
             }
         }
-        else // eclair
+        else
         {
+            // lightning strike
+
             /*  LastSample = -1;
             LastPriority = -1; */
 
@@ -81,7 +84,7 @@ int make3dTatou(void)
 
             clearScreenTatou();
 
-            setCameraTarget(0,0,0,unk1,rotation,0,time);
+            setCameraTarget(0,0,0,alpha,beta,0,zoom);
 
             AffObjet(0,0,0,0,0,0,tatou3d);
 
@@ -95,20 +98,22 @@ int make3dTatou(void)
 			osystem_CopyBlockPhys((unsigned char*)frontBuffer,0,0,320,200);
 
 
-            while(key==0 && Click == 0 && JoyD == 0) // boucle de rotation du tatou
+            while(key==0 && Click == 0 && JoyD == 0)
             {
+                // Armadillo rotation loop
+
                 process_events();
 
-                time+=deltaTime-25;
+                zoom += deltaTime;
 
-                if(time>16000)
+                if(zoom>16000)
                     break;
 
-                rotation -=8;
+                beta -=8;
 
                 clearScreenTatou();
 
-                setCameraTarget(0,0,0,unk1,rotation,0,time);
+                setCameraTarget(0,0,0,alpha,beta,0,zoom);
 
                 AffObjet(0,0,0,0,0,0,tatou3d);
 
@@ -121,8 +126,9 @@ int make3dTatou(void)
         }
     }while(1);
 
-    free(tatouPal);
-    free(tatou3d);
+    delete[] tatou3dRaw;
+    delete tatou3d;
+
     free(tatou2d);
 
     if(key || Click || JoyD)
@@ -133,13 +139,13 @@ int make3dTatou(void)
         }
 
         FadeOutPhys(32,0);
-        copyPalette((unsigned char*)paletteBackup,currentGamePalette);
+        copyPalette(paletteBackup,currentGamePalette);
         return(1);
     }
     else
     {
         FadeOutPhys(16,0);
-        copyPalette((unsigned char*)paletteBackup,currentGamePalette);
+        copyPalette(paletteBackup,currentGamePalette);
         return(0);
     }
 

FitdLib/AITD2.cpp

@@ -205,7 +205,7 @@ void startAITD2()
 
 	while(1)
 	{
-		int startupMenuResult = processStartupMenu();
+		int startupMenuResult = MainMenu();
 
 		switch(startupMenuResult)
 		{
@@ -225,11 +225,11 @@ void startAITD2()
 				{
 					//          updateShaking();
 
-					flagInitView = 2;
+					FlagInitView = 2;
 
-					setupCamera();
+					InitView();
 
-					mainLoop(1, 1);
+					PlayWorld(1, 1);
 
 					//          freeScene();
 
@@ -271,7 +271,7 @@ void drawInventoryAITD2()
 	statusRight = 159;
 	statusBottom = 174;
 
-	setupCameraProjection(((statusRight-statusLeft)/2)+statusLeft,((statusBottom-statusTop)/2) + statusTop,128,400,390);
+	SetProjection(((statusRight-statusLeft)/2)+statusLeft,((statusBottom-statusTop)/2) + statusTop,128,400,390);
 }
 
 int	TabXSprite [3] = {127,118,124};
@@ -291,8 +291,8 @@ void AITD2_ReadBook(int index, int type)
 	case 0: // READ_MESSAGE
 		{
 			LoadPak("ITD_RESS", AITD2_LETTRE, aux);
-			unsigned char lpalette[0x300];
-			copyPalette((unsigned char*)aux+64000,lpalette);
+			palette_t lpalette;
+			copyPalette(aux+64000,lpalette);
 			convertPaletteIfRequired(lpalette);
 			copyPalette(lpalette,currentGamePalette);
 			setPalette(lpalette);
@@ -304,8 +304,8 @@ void AITD2_ReadBook(int index, int type)
 	case 1: // READ_BOOK
 		{
 			LoadPak("ITD_RESS", AITD2_LIVRE, aux);
-			unsigned char lpalette[0x300];
-			copyPalette((unsigned char*)aux+64000,lpalette);
+            palette_t lpalette;
+			copyPalette(aux+64000,lpalette);
 			convertPaletteIfRequired(lpalette);
 			copyPalette(lpalette,currentGamePalette);
 			setPalette(lpalette);
@@ -317,8 +317,8 @@ void AITD2_ReadBook(int index, int type)
 	case 2: // READ_CARNET
 		{
 			LoadPak("ITD_RESS", AITD2_CARNET, aux);
-			unsigned char lpalette[0x300];
-			copyPalette((unsigned char*)aux+64000,lpalette);
+            palette_t lpalette;
+			copyPalette(aux+64000,lpalette);
 			convertPaletteIfRequired(lpalette);
 			copyPalette(lpalette,currentGamePalette);
 			setPalette(lpalette);

FitdLib/AITD3.cpp

@@ -36,11 +36,11 @@
 void startAITD3()
 {
 	g_gameUseCDA = true;
-	//startGame(1,0,0);
+	startGame(1,0,0);
 
 	while(1)
 	{
-		int startupMenuResult = processStartupMenu();
+		int startupMenuResult = MainMenu();
 
 		switch(startupMenuResult)
 		{
@@ -62,11 +62,11 @@ void startAITD3()
 				{
 					//          updateShaking();
 
-					flagInitView = 2;
+					FlagInitView = 2;
 
-					setupCamera();
+					InitView();
 
-					mainLoop(1, 1);
+					PlayWorld(1, 1);
 
 					//          freeScene();
 
@@ -108,5 +108,5 @@ void drawInventoryAITD3()
 	statusRight = 159;
 	statusBottom = 174;
 
-	setupCameraProjection(((statusRight-statusLeft)/2)+statusLeft,((statusBottom-statusTop)/2) + statusTop,128,400,390);
+	SetProjection(((statusRight-statusLeft)/2)+statusLeft,((statusBottom-statusTop)/2) + statusTop,128,400,390);
 }