Merge pull request #58 from Trxyebeep/dev

Dev

CHANGELOG.md

@@ -1,5 +1,51 @@
 # tomb4 changelog
 
+## [2.0.0](https://github.com/Trxyebeep/TOMB4/tree/V2.0.0) (date)
+
+### Original bug fixes
+
+- Fix window border.
+- Fix pickups freezing in the corner during flybies.
+- Fix a divide by 0 in FX fog code.
+- Fix a rare crash when shattering objects due to an unintialized variable.
+- Fix Lara saying "No" when interacting with the Plinths in Temple of Horus.
+- Fix water sfx playing when Lara is shot.
+- Fix enemies aiming higher than Lara during duck turn animations.
+- Fix grenadegun unequip frame.
+- Fix backdrop color in train level.
+- Fix launching multiple instances hanging the game.
+- Fix dynamic lights in the last level.
+
+### tomb4 bug fixes
+
+- Fix failing to use the sand in the element puzzle.
+- Fix red color when looking up from water.
+- Fix jeep smoke appearing at wrong times.
+- Fix lara flying when dying on water surface.
+- Fix enemy jeep sometimes disappearing when triggered.
+- Fix bug where shotgun sometimes wouldn't down the skeletons.
+- Fix deadlock when opening the pause menu while in binoculars.
+- Fix multiple FMVs playback at the end of KV5.
+- Fix issues with joint lighting.
+- Fix savegames crashing.
+
+### new tomb4 features
+
+- Increase dynamic lights limit.
+- Remove outdated mmx code.
+- Decrease font size in the new options menu to fit more options.
+- Upgrade input to DirectInput8.
+- Raise internal memory limit from 5 to 15MBs.
+- Make DOZY remove fire from Lara.
+- Improve crouch tilting.
+- Reposition the enemy health bar in lasersight.
+- Add flyby skipper.
+- Finish decompiling 100% of game code, make a new exe with the new icon.
+- Remove the software renderer.
+- Implement a new float matrix for smoother/more accurate animations and drawing.
+- Implement reverb.
+
+
 ## [1.2.1](https://github.com/Trxyebeep/TOMB4/tree/V1.2.1) (May 28 2022)
 
 ### tomb4 bug fixes

TOMB4/game/laramisc.cpp

@@ -595,7 +595,10 @@ void LaraControl(short item_number)
 		}
 	}
 
-	S_SetReverbType(room[l->room_number].ReverbType);
+	if (tomb4.reverb == 2)
+		S_SetReverbType(room[l->room_number].ReverbType);
+	else
+		S_SetReverbType(room[camera.pos.room_number].ReverbType);
 
 	if (l->hit_points <= 0)
 	{

TOMB4/global/types.h

@@ -2308,6 +2308,6 @@ struct tomb4_options	//keep this at the bottom of the file, please
 	bool combat_cam_tilt;
 	bool hpbar_inv;
 	bool static_lighting;
-	bool reverb;
+	ulong reverb;				//1-> off, 2-> Lara room, 3->camera room
 };
 #pragma pack(pop)

TOMB4/specific/dxsound.cpp

@@ -40,7 +40,7 @@ static XAUDIO2FX_REVERB_I3DL2_PARAMETERS reverb_preset[4] =
 };
 static XAUDIO2FX_REVERB_PARAMETERS reverb_type[4];
 
-static long current_reverb;
+static long current_reverb = -1;
 
 bool DXChangeOutputFormat(long nSamplesPerSec, bool force)
 {
@@ -394,7 +394,7 @@ void S_SoundSetPitch(long num, long pitch)
 
 void S_SetReverbType(long reverb)
 {
-	if (!tomb4.reverb)
+	if (tomb4.reverb == 1)
 		reverb = 0;
 
 	if (current_reverb != reverb)

TOMB4/tomb4/tomb4.cpp

@@ -98,8 +98,8 @@ void init_tomb4_stuff()
 		REG_WriteBool(buf, tomb4.static_lighting);
 
 		sprintf(buf, "reverb");
-		tomb4.reverb = 1;								//on
-		REG_WriteBool(buf, tomb4.reverb);
+		tomb4.reverb = 2;								//Lara room
+		REG_WriteLong(buf, tomb4.reverb);
 	}
 	else	//Key already exists, settings already written, read them. also falls back to default if any of them missing
 	{
@@ -164,7 +164,7 @@ void init_tomb4_stuff()
 		REG_ReadBool(buf, tomb4.static_lighting, 1);
 
 		sprintf(buf, "reverb");
-		REG_ReadBool(buf, tomb4.reverb, 1);
+		REG_ReadLong(buf, tomb4.reverb, 1);
 	}
 
 	CloseRegistry();
@@ -237,7 +237,7 @@ void save_new_tomb4_settings()
 	REG_WriteBool(buf, tomb4.static_lighting);
 
 	sprintf(buf, "reverb");
-	REG_WriteBool(buf, tomb4.reverb);
+	REG_WriteLong(buf, tomb4.reverb);
 
 	CloseRegistry();
 }

TOMB4/tomb4/troyestuff.cpp

@@ -425,7 +425,7 @@ bool Page1(long& num, long textY, ulong selection)
 	strcpy(buffer, tomb4.static_lighting ? "on" : "off");
 	PrintString(phd_centerx + (phd_centerx >> 1), YPOS, CHECK_SEL(6), buffer, 0);
 
-	strcpy(buffer, tomb4.reverb ? "on" : "off");
+	strcpy(buffer, tomb4.reverb == 1 ? "off" : tomb4.reverb == 2 ? "Lara room" : "Camera room");
 	PrintString(phd_centerx + (phd_centerx >> 1), YPOS, CHECK_SEL(6), buffer, 0);
 
 	switch (selection)
@@ -498,10 +498,25 @@ bool Page1(long& num, long textY, ulong selection)
 
 	case 1 << 6:
 
-		if (dbinput & IN_LEFT || dbinput & IN_RIGHT)
+		if (dbinput & IN_LEFT)
+		{
+			SoundEffect(SFX_MENU_SELECT, 0, SFX_ALWAYS);
+			tomb4.reverb--;
+
+			if (tomb4.reverb < 1)
+				tomb4.reverb = 3;
+
+			changed = 1;
+		}
+
+		if (dbinput & IN_RIGHT)
 		{
 			SoundEffect(SFX_MENU_SELECT, 0, SFX_ALWAYS);
-			tomb4.reverb = !tomb4.reverb;
+			tomb4.reverb++;
+
+			if (tomb4.reverb > 3)
+				tomb4.reverb = 1;
+
 			changed = 1;
 		}