Merge branch 'luciusDXL:master' into linux

luciusDXL · Dec 30, 2022 · d7b7417 · d7b7417
2 parents 7ebcdda + 7fc3986
commit d7b7417
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/TheForceEngine/TFE_DarkForces/GameUI/pda.cpp b/TheForceEngine/TFE_DarkForces/GameUI/pda.cpp
@@ -411,13 +411,15 @@ namespace TFE_DarkForces
 						if (s_buttonPressed == s_simulatePressed)
 						{
 							automap_updateMapData(MAP_LAYER_UP);
+							s_simulatePressed = 0;
 						}
 					} break;
 					case PDA_BTN_LAYERDOWN:
 					{
 						if (s_buttonPressed == s_simulatePressed)
 						{
 							automap_updateMapData(MAP_LAYER_DOWN);
+							s_simulatePressed = 0;
 						}
 					} break;
 				}
@@ -629,11 +631,11 @@ namespace TFE_DarkForces
 
 			if (TFE_Input::keyPressed(KEY_LEFTBRACKET))
 			{
-				s_simulatePressed = PDA_BTN_LAYERUP;
+				s_simulatePressed = PDA_BTN_LAYERDOWN;
 			}
 			else if (TFE_Input::keyPressed(KEY_RIGHTBRACKET))
 			{
-				s_simulatePressed = PDA_BTN_LAYERDOWN;
+				s_simulatePressed = PDA_BTN_LAYERUP;
 			}
 		}
 		else if (s_pdaMode == PDA_MODE_BRIEF)

diff --git a/TheForceEngine/TFE_DarkForces/hud.cpp b/TheForceEngine/TFE_DarkForces/hud.cpp
@@ -344,8 +344,8 @@ namespace TFE_DarkForces
 		if (!fromSave)
 		{
 			s_secretsFound = 0;
+			s_secretsPercent = 0;
 		}
-		s_secretsPercent = 0;
 
 		hud_initAnimation();
 		if (s_config.showUI)

diff --git a/TheForceEngine/TFE_DarkForces/player.cpp b/TheForceEngine/TFE_DarkForces/player.cpp
@@ -1732,17 +1732,7 @@ namespace TFE_DarkForces
 				// Remove the flag so the secret isn't counted twice.
 				newSector->flags1 &= ~SEC_FLAGS1_SECRET;
 				s_secretsFound++;
-				if (s_levelState.secretCount)
-				{
-					// 100.0 * found / count
-					fixed16_16 percentage = mul16(FIXED(100), div16(intToFixed16(s_secretsFound), intToFixed16(s_levelState.secretCount)));
-					s_secretsPercent = floor16(percentage);
-				}
-				else
-				{
-					s_secretsPercent = 100;
-				}
-				s_secretsPercent = max(0, min(100, s_secretsPercent));
+				level_updateSecretPercent();
 			}
 		}
 

diff --git a/TheForceEngine/TFE_Jedi/Level/level.h b/TheForceEngine/TFE_Jedi/Level/level.h
@@ -53,5 +53,7 @@ namespace TFE_Jedi
 	void level_addSound(const char* name, u32 freq, s32 priority);
 	void level_loadPalette();
 
+	void level_updateSecretPercent();
+
 	void ambientSoundTaskFunc(MessageType msg);
 }
diff --git a/TheForceEngine/TFE_Jedi/Level/levelData.cpp b/TheForceEngine/TFE_Jedi/Level/levelData.cpp
@@ -17,6 +17,7 @@ using namespace TFE_DarkForces;
 namespace TFE_DarkForces
 {
 	extern s32 s_secretsFound;
+	extern s32 s_secretsPercent;
 }
 
 namespace TFE_Jedi
@@ -88,6 +89,21 @@ namespace TFE_Jedi
 			level_loadPalette();
 		}
 	}
+
+	void level_updateSecretPercent()
+	{
+		if (s_levelState.secretCount)
+		{
+			// 100.0 * found / count
+			fixed16_16 percentage = mul16(FIXED(100), div16(intToFixed16(s_secretsFound), intToFixed16(s_levelState.secretCount)));
+			s_secretsPercent = floor16(percentage);
+		}
+		else
+		{
+			s_secretsPercent = 100;
+		}
+		s_secretsPercent = max(0, min(100, s_secretsPercent));
+	}
 
 	void level_serialize(Stream* stream)
 	{
@@ -126,6 +142,8 @@ namespace TFE_Jedi
 			s_levelState.sectors = (RSector*)level_alloc(sizeof(RSector) * s_levelState.sectorCount);
 			s_levelState.controlSector->id = s_levelState.sectorCount;
 			s_levelState.controlSector->index = s_levelState.controlSector->id;
+
+			level_updateSecretPercent();
 		}
 		RSector* sector = s_levelState.sectors;
 		for (u32 s = 0; s < s_levelState.sectorCount; s++, sector++)

diff --git a/TheForceEngine/gitVersion.h b/TheForceEngine/gitVersion.h
@@ -1,3 +1,3 @@
 const char c_gitVersion[] = R"(
-v1.01.000-1-gb414d166
+v1.01.000-3-gbbf0792e
 )";