From b4e3e712593e0541772c17761356208f94cb4c3c Mon Sep 17 00:00:00 2001
From: wolfy852 <wolfy852@hotmail.com>
Date: Sun, 22 Jan 2017 19:03:52 -0600
Subject: [PATCH] Tweaks to title screen, SSZ unlock, and Tails flight fix
---
src/f_finale.c | 4 ++--
src/m_cond.c | 5 +----
src/p_mobj.c | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/f_finale.c b/src/f_finale.c
index f302a485f4..a952a35db3 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -494,7 +494,7 @@ static const char *credits[] = {
"Spiral Knights - SEGA", // Sky Islands and some scrapped maps
"Chain Algorithm", // Weather Factory
"Super Mario 3D World - Nintendo",
- "Ape Escape - Sony", // Hub music
+ "Zinger & Bacter - SoundShock", // Hub and title screen music
"LaTale - Actoz Soft", // Mainframe Metropolis
"Sonic Team Junior", // So we're crediting STJr, even though they have a whole section of credits directly below? lol
"Karl Breuggemann", // Scrapped hub
@@ -1071,7 +1071,7 @@ void F_TitleScreenDrawer(void)
V_DrawScaledPatch(100,3, 0,ttswave2);
}
- V_DrawScaledPatch(48, 142, 0,ttbanner);
+ V_DrawFixedPatch((34)<<FRACBITS, (13)<<FRACBITS, (FRACUNIT*7)/10, 0,ttbanner, NULL);
}
// (no longer) De-Demo'd Title Screen
diff --git a/src/m_cond.c b/src/m_cond.c
index 9f36541e5d..ae4600a9b6 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -104,7 +104,7 @@ unlockable_t unlockables[MAXUNLOCKABLES] =
/* 04 */ {"EXTRA LEVELS", "", 70, 0, SECRET_HEADER, 0, true, true, 0},
- /* 05 */ {"Stormy Streets", "Collect 5 Chaos Coins", 80, 40, SECRET_WARP, 23, false, false, 0},
+ /* 05 */ {"Stormy Streets", "Collect 10 Chaos Coins", 80, 43, SECRET_WARP, 23, false, false, 0},
/* 06 */ {"Sky Islands", "Collect 20 Chaos Coins", 90, 47, SECRET_WARP, 25, false, false, 0},
/* 07 */ {"BONUS LEVELS", "", 110, 0, SECRET_HEADER, 0, true, true, 0},
@@ -154,9 +154,6 @@ void M_SetupDefaultConditionSets(void)
M_AddRawCondition(30, 5, UC_MAPPERFECT, 23, 0, 0);
M_AddRawCondition(30, 6, UC_MAPPERFECT, 25, 0, 0);
- // -- 40: Find 5 emblems
- M_AddRawCondition(40, 1, UC_TOTALEMBLEMS, 5, 0, 0);
-
// -- 41: Find 7 emblems
M_AddRawCondition(41, 1, UC_TOTALEMBLEMS, 7, 0, 0);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 906dbd1542..558f46083f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1317,7 +1317,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
if (mo->player)
{
if ((mo->player->pflags & PF_GLIDING)
- || (mo->player->charability == CA_FLY && (mo->player->powers[pw_tailsfly]
+ || (mo->player->charability == CA_FLY && ((mo->player->powers[pw_tailsfly] && !(mo->player->pflags & PF_JUMPED))
|| (mo->state >= &states[S_PLAY_SPC1] && mo->state <= &states[S_PLAY_SPC4]))))
gravityadd = gravityadd/3; // less gravity while flying/gliding
if (mo->player->climbing || (mo->player->pflags & PF_NIGHTSMODE))
--
GitLab