Merge pull request #122 from Trxyebeep/dev_troye

Dev troye
Trxyebeep · Nov 29, 2021 · 81d1122 · 81d1122
2 parents 51c96ff + 6d711ba
commit 81d1122
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # tomb5 changelog
 
-## [2.0.0](https://github.com/Trxyebeep/TOMB5/tree/V2.0.0) (24/11/2021)
+## [2.0.0](https://github.com/Trxyebeep/TOMB5/tree/V2.0.0) (29/11/2021)
 
 ### tomb5 bug fixes
 
@@ -17,6 +17,7 @@
 - Enemy health bars
 - Ammo counter
 - Hair respects interpolated frames (smooth hair)
+- Fix floating hair in Joby levels
 
 ## [1.1.0](https://github.com/Trxyebeep/TOMB5/tree/V1.1.0) (15/11/2021)
 

diff --git a/TOMB5/game/control.cpp b/TOMB5/game/control.cpp
@@ -103,7 +103,7 @@ long ControlPhase(long _nframes, int demo_mode)
 #ifdef CUTSCENE_SKIPPER
 			if (tomb5.cutseq_skipper)
 			{
-				if (keymap[DIK_ESCAPE] && !ScreenFading)//skip them with esc
+				if (keymap[DIK_ESCAPE] && !ScreenFading && !bDoCredits)//skip them with esc
 					do_cutseq_skipper_shit();
 			}
 #endif

diff --git a/TOMB5/game/laramisc.cpp b/TOMB5/game/laramisc.cpp
@@ -85,7 +85,11 @@ void LaraCheat(ITEM_INFO* item, COLL_INFO* coll)
 		lara.gun_status = 0;
 		LaraInitialiseMeshes();
 		lara.mesh_effects = 0;
+#ifdef GENERAL_FIXES
+		lara_item->hit_points = 1000;
+#else
 		lara_item->hit_points = cheat_hit_points;
+#endif
 	}
 }