Merge pull request #23 from Trxyebeep/dev

Dev

CHANGELOG.md

@@ -1,9 +1,26 @@
 # tomb3 changelog
 
-## [2.0.1](https://github.com/Trxyebeep/tomb3/tree/V2.0.1) (Apr. 20 2023)
+## [2.0.2](https://github.com/Trxyebeep/tomb3/tree/V2.0.1) (May. 8 2023)
 
 ### Original bug fixes
 
+- Fix wade snapping.
+- Fix floordata issues with triangular geometry, no collision tiles, and more generic situations.
+- Fix some effects clipping.
+
+### tomb3 additions
+
+- Improve hair interaction with water surfaces.
+
+### tomb3 bug fixes
+
+- Fix title starting with the passport selected.
+- Fix audio looping.
+- Fix savegame fail if the saves/savesg folder doesn't exist, and create it instead.
+
+
+## [2.0.1](https://github.com/Trxyebeep/tomb3/tree/V2.0.1) (Apr. 20 2023)
+
 ### tomb3 additions
 
 - Increase air gradually instead of snapping to full when leaving water rooms.

tomb3.rc

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,1,0
- PRODUCTVERSION 2,0,1,0
+ FILEVERSION 2,0,2,0
+ PRODUCTVERSION 2,0,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "Tomb Raider III Community Edition"
-            VALUE "FileVersion", "2.0.1.0"
+            VALUE "FileVersion", "2.0.2.0"
             VALUE "InternalName", "tomb3.exe"
             VALUE "LegalCopyright", "Copyright (C) 2023"
             VALUE "OriginalFilename", "tomb3.exe"
             VALUE "ProductName", "Tomb Raider III Community Edition"
-            VALUE "ProductVersion", "2.0.1.0"
+            VALUE "ProductVersion", "2.0.2.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -121,7 +121,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     PUSHBUTTON      "Save",IDOK,191,220,50,14,0,WS_EX_CLIENTEDGE
     PUSHBUTTON      "Cancel",IDCANCEL,273,220,50,14,0,WS_EX_CLIENTEDGE
-    CTEXT           "tomb3 V2.0",IDC_VERSION,6,225,105,8,NOT WS_GROUP
+    CTEXT           "tomb3 V2.0.2",IDC_VERSION,6,225,105,8,NOT WS_GROUP
     GROUPBOX        "Output Settings",IDC_STATIC,124,5,286,134,WS_GROUP
     COMBOBOX        IDC_RESOLUTION,142,95,181,59,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "ZBuffer",IDC_ZBUFFER,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,133,127,50,10

tomb3.vcxproj

@@ -102,7 +102,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <AdditionalOptions>/SECTION:.text,RWE /pdbaltpath:%_PDB% /ignore:4099 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>dxguid.lib;ddraw.lib;Winmm.lib;dinput8.lib;Msacm32.lib;dsound.lib;discord-rpcd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dxguid.lib;ddraw.lib;Winmm.lib;dinput8.lib;Msacm32.lib;dsound.lib;D3d9.lib;discord-rpcd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(ProjectDir)tomb3\newstuff\libs\discord\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -125,7 +125,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
       <AdditionalOptions>/SECTION:.text,RWE /pdbaltpath:%_PDB% /ignore:4099 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>dxguid.lib;ddraw.lib;Winmm.lib;dinput8.lib;Msacm32.lib;dsound.lib;discord-rpc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dxguid.lib;ddraw.lib;Winmm.lib;dinput8.lib;Msacm32.lib;dsound.lib;D3d9.lib;discord-rpc.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(ProjectDir)tomb3\newstuff\libs\discord\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -272,6 +272,7 @@
     <ClInclude Include="tomb3\newstuff\LaraDraw.h" />
     <ClInclude Include="tomb3\newstuff\map.h" />
     <ClInclude Include="tomb3\newstuff\pausemenu.h" />
+    <ClInclude Include="tomb3\newstuff\Picture2.h" />
     <ClInclude Include="tomb3\newstuff\psxsaves.h" />
     <ClInclude Include="tomb3\newstuff\setupdlg.h" />
     <ClInclude Include="tomb3\script\interpreter.h" />
@@ -411,6 +412,7 @@
     <ClCompile Include="tomb3\newstuff\LaraDraw.cpp" />
     <ClCompile Include="tomb3\newstuff\map.cpp" />
     <ClCompile Include="tomb3\newstuff\pausemenu.cpp" />
+    <ClCompile Include="tomb3\newstuff\Picture2.cpp" />
     <ClCompile Include="tomb3\newstuff\psxsaves.cpp" />
     <ClCompile Include="tomb3\newstuff\setupdlg.cpp" />
     <ClCompile Include="tomb3\script\interpreter.cpp" />

tomb3.vcxproj.filters

@@ -429,6 +429,7 @@
     <ClInclude Include="tomb3\newstuff\setupdlg.h" />
     <ClInclude Include="tomb3\script\scripter.h" />
     <ClInclude Include="tomb3\script\interpreter.h" />
+    <ClInclude Include="tomb3\newstuff\Picture2.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="tomb3\game\51baton.cpp">
@@ -830,6 +831,7 @@
     <ClCompile Include="tomb3\newstuff\setupdlg.cpp" />
     <ClCompile Include="tomb3\script\scripter.cpp" />
     <ClCompile Include="tomb3\script\interpreter.cpp" />
+    <ClCompile Include="tomb3\newstuff\Picture2.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="tomb3.rc" />

tomb3/3dsystem/3d_gen.cpp

@@ -20,12 +20,13 @@ short* (*InsertObjectGT4)(short* pFaceInfo, long nFaces, sort_type nSortType);
 short* (*InsertObjectGT3)(short* pFaceInfo, long nFaces, sort_type nSortType);
 short* (*InsertObjectG4)(short* pFaceInfo, long nFaces, sort_type nSortType);
 short* (*InsertObjectG3)(short* pFaceInfo, long nFaces, sort_type nSortType);
-short* (*RoomInsertObjectGT4)(short* pFaceInfo, long nFaces, sort_type nSortType);
-short* (*RoomInsertObjectGT3)(short* pFaceInfo, long nFaces, sort_type nSortType);
 void (*InsertFlatRect)(long x1, long y1, long x2, long y2, long zdepth, long col);
 void (*InsertTrans8)(PHD_VBUF* buf, short shade);
 void (*InsertSprite)(long zdepth, long x1, long y1, long x2, long y2, long nSprite, ulong shade, ulong shade1, long nDrawType, long offset);
 void (*InsertTransQuad)(long x, long y, long w, long h, long z);
+void (*InsertGourQuad)(long x0, long y0, long x1, long y1, long z, ulong c0, ulong c1, ulong c2, ulong c3, bool add);
+bool (*IsVisible)(PHD_VBUF* v0, PHD_VBUF* v1, PHD_VBUF* v2);
+bool (*IsInvisible)(PHD_VBUF* v0, PHD_VBUF* v1, PHD_VBUF* v2);
 
 float outsideBackgroundTop;
 long BlackGouraudIndex = 0;
@@ -521,7 +522,7 @@ void S_InsertBackground(short* objptr)
 	}
 
 	if (CurrentLevel == LV_GYM)
-		S_InsertBackPolygon(0, (long)outsideBackgroundTop, phd_right + phd_winxmin, phd_winymax, 0x800000);
+		S_InsertBackPolygon(0, (long)outsideBackgroundTop, phd_right + phd_winxmin, phd_winymax, 0);
 }
 
 void phd_InitWindow(long x, long y, long w, long h, long znear, long zfar, long fov, long sw, long sh)
@@ -555,26 +556,11 @@ void phd_InitWindow(long x, long y, long w, long h, long znear, long zfar, long
 	phd_WindowRect.top = phd_winymin;
 	phd_WindowRect.right = phd_winxmin + phd_winwidth;
 
-	InsertObjectGT3 = HWI_InsertObjectGT3_Sorted;
-	InsertObjectGT4 = HWI_InsertObjectGT4_Sorted;
-	InsertObjectG3 = HWI_InsertObjectG3_Sorted;
-	InsertObjectG4 = HWI_InsertObjectG4_Sorted;
-	InsertFlatRect = HWI_InsertFlatRect_Sorted;
-	InsertLine = HWI_InsertLine_Sorted;
-	RoomInsertObjectGT3 = HWI_InsertObjectGT3_Sorted;
-	RoomInsertObjectGT4 = HWI_InsertObjectGT4_Sorted;
-	InsertSprite = HWI_InsertSprite_Sorted;
-	InsertTrans8 = HWI_InsertTrans8_Sorted;
-	InsertTransQuad = HWI_InsertTransQuad_Sorted;
+	SetFunctionPointers();
 }
 
 void phd_InitPolyList()
 {
-	/*
-	dword_5D7AE8 = (int)&unk_4E34B0;	//seemingly unused, no problems so far
-	dword_5D7AE4 = 0;
-	dword_5A6AF0 = (int)&unk_4F6D60;
-	*/
 	surfacenumbf = 0;
 	surfacenumfb = 0;
 	info3dptrbf = info3d_bufferbf;

tomb3/3dsystem/3d_gen.h

@@ -33,12 +33,13 @@ extern short* (*InsertObjectGT4)(short* pFaceInfo, long nFaces, sort_type nSortT
 extern short* (*InsertObjectGT3)(short* pFaceInfo, long nFaces, sort_type nSortType);
 extern short* (*InsertObjectG4)(short* pFaceInfo, long nFaces, sort_type nSortType);
 extern short* (*InsertObjectG3)(short* pFaceInfo, long nFaces, sort_type nSortType);
-extern short* (*RoomInsertObjectGT4)(short* pFaceInfo, long nFaces, sort_type nSortType);
-extern short* (*RoomInsertObjectGT3)(short* pFaceInfo, long nFaces, sort_type nSortType);
 extern void (*InsertFlatRect)(long x1, long y1, long x2, long y2, long zdepth, long col);
 extern void (*InsertTrans8)(PHD_VBUF* buf, short shade);
 extern void (*InsertSprite)(long zdepth, long x1, long y1, long x2, long y2, long nSprite, ulong shade, ulong shade1, long nDrawType, long offset);
 extern void (*InsertTransQuad)(long x, long y, long w, long h, long z);
+extern void (*InsertGourQuad)(long x0, long y0, long x1, long y1, long z, ulong c0, ulong c1, ulong c2, ulong c3, bool add);
+extern bool (*IsVisible)(PHD_VBUF* v0, PHD_VBUF* v1, PHD_VBUF* v2);
+extern bool (*IsInvisible)(PHD_VBUF* v0, PHD_VBUF* v1, PHD_VBUF* v2);
 
 extern float outsideBackgroundTop;
 extern long BlackGouraudIndex;