mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-09-12 20:16:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

pal-final: Get game segment fully matching

Browse Source
This commit is contained in:
Ryan Dwyer
2021-03-12 22:59:47 +10:00
parent 7b96f14c14
commit f1d924deb2
69 changed files with 27080 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/activemenu/activemenu.c
+2 -2
View File
@@ -735,8 +735,8 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label)
if (invGetWeaponNumByIndex(g_AmMenus[g_AmIndex].invindexes[slot]) == WEAPON_CLOAKINGDEVICE) {
// Special case: "Cloak %d"
qty = currentPlayerGetAmmoCountWithCheck(AMMOTYPE_CLOAK);
secs = qty / 60;
modulo = (qty - (secs * 60)) * 100 / 60;
secs = qty / PALDOWN(60);
modulo = (qty - (secs * PALDOWN(60))) * 100 / PALDOWN(60);
sprintf(label, langGet(L_OPTIONS_491), secs + (modulo > 0 ? 1 : 0)); // "cloak %d"
} else {
strcpy(label, invGetShortNameByIndex(g_AmMenus[g_AmIndex].invindexes[slot]));
src/game/activemenu/tick.c
+8
View File
@@ -384,7 +384,11 @@ void amTick(void)
// Update alpha of slots so they fade in
if (g_AmMenus[g_AmIndex].alphafrac < 1) {
#if VERSION >= VERSION_PAL_FINAL
g_AmMenus[g_AmIndex].alphafrac += g_Vars.lvupdate240freal / 30.0f;
#else
g_AmMenus[g_AmIndex].alphafrac += g_Vars.lvupdate240f / 30.0f;
#endif
}
if (g_AmMenus[g_AmIndex].alphafrac > 1) {
@@ -392,7 +396,11 @@ void amTick(void)
}
// Make selection border pulsate
#if VERSION >= VERSION_PAL_FINAL
g_AmMenus[g_AmIndex].selpulse += g_Vars.lvupdate240freal / 5.0f;
#else
g_AmMenus[g_AmIndex].selpulse += g_Vars.lvupdate240f / 5.0f;
#endif
if (g_AmMenus[g_AmIndex].selpulse > 18.849555969238f) {
g_AmMenus[g_AmIndex].selpulse -= 18.849555969238f;