diff --git a/src/d_player.h b/src/d_player.h
index 2c4483775f954d8678810f7dd559d409e42a2893..75d6b724594b7bbc91fa820d0485f604d65815db 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -49,7 +49,8 @@ typedef enum
SF_MULTIABILITY = 1<<13, // Revenge of Final Demo.
SF_NONIGHTSROTATION = 1<<14, // Disable sprite rotation for NiGHTS
SF_NONIGHTSSUPER = 1<<15, // Disable super colors for NiGHTS (if you have SF_SUPER)
- SF_NOSUPERJUMPBOOST = 1<<16, // Disable the jump boost given while super (i.e. Knuckles)
+ SF_NOSUPERSPRITES = 1<<16, // Don't use super sprites while super
+ SF_NOSUPERJUMPBOOST = 1<<17, // Disable the jump boost given while super (i.e. Knuckles)
// free up to and including 1<<31
} skinflags_t;
diff --git a/src/dehacked.c b/src/dehacked.c
index de93ce50e1b2453db1eb4b664a31897592e735a8..e489a33913aabaca7abcac72c1120faec6a4b9f2 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -9506,6 +9506,7 @@ struct {
{"FF_GLOBALANIM",FF_GLOBALANIM},
{"FF_FULLBRIGHT",FF_FULLBRIGHT},
{"FF_VERTICALFLIP",FF_VERTICALFLIP},
+ {"FF_HORIZONTALFLIP",FF_HORIZONTALFLIP},
{"FF_PAPERSPRITE",FF_PAPERSPRITE},
{"FF_TRANSMASK",FF_TRANSMASK},
{"FF_TRANSSHIFT",FF_TRANSSHIFT},
@@ -9655,6 +9656,7 @@ struct {
{"SF_MULTIABILITY",SF_MULTIABILITY},
{"SF_NONIGHTSROTATION",SF_NONIGHTSROTATION},
{"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
+ {"SF_NOSUPERSPRITES",SF_NOSUPERSPRITES},
{"SF_NOSUPERJUMPBOOST",SF_NOSUPERJUMPBOOST},
// Dashmode constants
diff --git a/src/g_game.c b/src/g_game.c
index c9b57004479014f852a911f30b09268514e4d7f9..b20157156b8c6b969e09ed028c703ad23a05395c 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -720,14 +720,14 @@ void G_SetNightsRecords(void)
I_Error("Out of memory for replay filepath\n");
sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(gamemap));
- snprintf(lastdemo, 255, "%s-last.lmp", gpath);
+ snprintf(lastdemo, 255, "%s-%s-last.lmp", gpath, skins[cv_chooseskin.value-1].name);
if (FIL_FileExists(lastdemo))
{
UINT8 *buf;
size_t len = FIL_ReadFile(lastdemo, &buf);
- snprintf(bestdemo, 255, "%s-time-best.lmp", gpath);
+ snprintf(bestdemo, 255, "%s-%s-time-best.lmp", gpath, skins[cv_chooseskin.value-1].name);;
if (!FIL_FileExists(bestdemo) || G_CmpDemoTime(bestdemo, lastdemo) & 1)
{ // Better time, save this demo.
if (FIL_FileExists(bestdemo))
@@ -736,7 +736,7 @@ void G_SetNightsRecords(void)
CONS_Printf("\x83%s\x80 %s '%s'\n", M_GetText("NEW RECORD TIME!"), M_GetText("Saved replay as"), bestdemo);
}
- snprintf(bestdemo, 255, "%s-score-best.lmp", gpath);
+ snprintf(bestdemo, 255, "%s-%s-score-best.lmp", gpath, skins[cv_chooseskin.value-1].name);
if (!FIL_FileExists(bestdemo) || (G_CmpDemoTime(bestdemo, lastdemo) & (1<<1)))
{ // Better score, save this demo.
if (FIL_FileExists(bestdemo))
diff --git a/src/hardware/hw_drv.h b/src/hardware/hw_drv.h
index 2e4ea10ccf9a714a32475ca96abd889899548e18..6f039cc3a0d0bad5791f5eeaabe4a79796e3f339 100644
--- a/src/hardware/hw_drv.h
+++ b/src/hardware/hw_drv.h
@@ -50,7 +50,7 @@ EXPORT void HWRAPI(ClearMipMapCache) (void);
EXPORT void HWRAPI(SetSpecialState) (hwdspecialstate_t IdState, INT32 Value);
//Hurdler: added for new development
-EXPORT void HWRAPI(DrawModel) (model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, FSurfaceInfo *Surface);
+EXPORT void HWRAPI(DrawModel) (model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface);
EXPORT void HWRAPI(CreateModelVBOs) (model_t *model);
EXPORT void HWRAPI(SetTransform) (FTransform *ptransform);
EXPORT INT32 HWRAPI(GetTextureUsed) (void);
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 455985ddfba7d92c36118e356a8323a335fce673..f07cb24d87cc5e9ffcdfa3f7d4bebc4b0a894ad5 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -4636,6 +4636,8 @@ static void HWR_ProjectSprite(mobj_t *thing)
unsigned rot;
UINT16 flip;
boolean vflip = (!(thing->eflags & MFE_VERTICALFLIP) != !(thing->frame & FF_VERTICALFLIP));
+ boolean mirrored = thing->mirrored;
+ boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored);
angle_t ang;
INT32 heightsec, phs;
@@ -4724,6 +4726,8 @@ static void HWR_ProjectSprite(mobj_t *thing)
#endif
ang = R_PointToAngle (thing->x, thing->y) - mobjangle;
+ if (mirrored)
+ ang = InvAngle(ang);
if (sprframe->rotate == SRF_SINGLE)
{
@@ -4796,6 +4800,8 @@ static void HWR_ProjectSprite(mobj_t *thing)
rightcos = FIXED_TO_FLOAT(FINECOSINE((viewangle + ANGLE_90)>>ANGLETOFINESHIFT));
}
+ flip = !flip != !hflip;
+
if (flip)
{
x1 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_scale);
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 68b426f0c7fea5e015f758b474c0b24f8384a898..f5df49bcdef2ffa5a76d15f3f6605129de1c9b4c 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -1242,6 +1242,7 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
//mdlframe_t *next = NULL;
const boolean papersprite = (spr->mobj->frame & FF_PAPERSPRITE);
const UINT8 flip = (UINT8)(!(spr->mobj->eflags & MFE_VERTICALFLIP) != !(spr->mobj->frame & FF_VERTICALFLIP));
+ const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !(spr->mobj->frame & FF_HORIZONTALFLIP));
spritedef_t *sprdef;
spriteframe_t *sprframe;
spriteinfo_t *sprinfo;
@@ -1514,7 +1515,7 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
#endif
HWD.pfnSetShader(4); // model shader
- HWD.pfnDrawModel(md2->model, frame, durs, tics, nextFrame, &p, finalscale, flip, &Surf);
+ HWD.pfnDrawModel(md2->model, frame, durs, tics, nextFrame, &p, finalscale, flip, hflip, &Surf);
}
return true;
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index 41ec703bc46c203c0eb77b822442b4c8495a0a38..e5f6ff3cfcc1c65a1266ee08248c8f80d910bb06 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -2615,7 +2615,7 @@ EXPORT void HWRAPI(CreateModelVBOs) (model_t *model)
#define BUFFER_OFFSET(i) ((void*)(i))
-static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, FSurfaceInfo *Surface)
+static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
{
static GLRGBAFloat poly = {0,0,0,0};
static GLRGBAFloat tint = {0,0,0,0};
@@ -2708,12 +2708,13 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
pglEnable(GL_NORMALIZE);
#ifdef USE_FTRANSFORM_MIRROR
- // flipped is if the object is flipped
+ // flipped is if the object is vertically flipped
+ // hflipped is if the object is horizontally flipped
// pos->flip is if the screen is flipped vertically
// pos->mirror is if the screen is flipped horizontally
// XOR all the flips together to figure out what culling to use!
{
- boolean reversecull = (flipped ^ pos->flip ^ pos->mirror);
+ boolean reversecull = (flipped ^ hflipped ^ pos->flip ^ pos->mirror);
if (reversecull)
pglCullFace(GL_FRONT);
else
@@ -2721,7 +2722,7 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
}
#else
// pos->flip is if the screen is flipped too
- if (flipped != pos->flip) // If either are active, but not both, invert the model's culling
+ if (flipped ^ hflipped ^ pos->flip) // If one or three of these are active, but not two, invert the model's culling
{
pglCullFace(GL_FRONT);
}
@@ -2736,6 +2737,8 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
pglTranslatef(pos->x, pos->z, pos->y);
if (flipped)
scaley = -scaley;
+ if (hflipped)
+ scalez = -scalez;
#ifdef USE_FTRANSFORM_ANGLEZ
pglRotatef(pos->anglez, 0.0f, 0.0f, -1.0f); // rotate by slope from Kart
@@ -2882,9 +2885,9 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
// -----------------+
// HWRAPI DrawModel : Draw a model
// -----------------+
-EXPORT void HWRAPI(DrawModel) (model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, FSurfaceInfo *Surface)
+EXPORT void HWRAPI(DrawModel) (model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex, FTransform *pos, float scale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
{
- DrawModelEx(model, frameIndex, duration, tics, nextFrameIndex, pos, scale, flipped, Surface);
+ DrawModelEx(model, frameIndex, duration, tics, nextFrameIndex, pos, scale, flipped, hflipped, Surface);
}
// -----------------+
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 7f84e9875b7c0b1f490b259cf4fe9c68445a9ee0..7b84784e58102c690f37c21e6a79d07d54adfc86 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -2240,7 +2240,7 @@ void HU_Erase(void)
// IN-LEVEL MULTIPLAYER RANKINGS
//======================================================================
-#define supercheckdef ((players[tab[i].num].powers[pw_super] && players[tab[i].num].mo && (players[tab[i].num].mo->state < &states[S_PLAY_SUPER_TRANS1] || players[tab[i].num].mo->state >= &states[S_PLAY_SUPER_TRANS6])) || (players[tab[i].num].powers[pw_carry] == CR_NIGHTSMODE && skins[players[tab[i].num].skin].flags & SF_SUPER))
+#define supercheckdef (!(players[tab[i].num].charflags & SF_NOSUPERSPRITES) && ((players[tab[i].num].powers[pw_super] && players[tab[i].num].mo && (players[tab[i].num].mo->state < &states[S_PLAY_SUPER_TRANS1] || players[tab[i].num].mo->state >= &states[S_PLAY_SUPER_TRANS6])) || (players[tab[i].num].powers[pw_carry] == CR_NIGHTSMODE && skins[players[tab[i].num].skin].flags & SF_SUPER)))
#define greycheckdef (players[tab[i].num].spectator || players[tab[i].num].playerstate == PST_DEAD || (G_IsSpecialStage(gamemap) && players[tab[i].num].exiting))
//
@@ -2798,7 +2798,7 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor
if (tab[i].color == 0)
{
colormap = colormaps;
- if (players[tab[i].num].powers[pw_super])
+ if (players[tab[i].num].powers[pw_super] && !(players[tab[i].num].charflags & SF_NOSUPERSPRITES))
V_DrawFixedPatch(x*FRACUNIT, y*FRACUNIT, FRACUNIT/4, 0, superprefix[players[tab[i].num].skin], 0);
else
{
diff --git a/src/info.c b/src/info.c
index a9619d7c7ade21a532e24b3b9da6e1fa5545cf4f..cfe124fd473a96d0544ba6de9e97c127d57f0e14 100644
--- a/src/info.c
+++ b/src/info.c
@@ -5294,7 +5294,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
100, // mass
0, // damage
sfx_None, // activesound
- MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_BOUNCE|MF_RUNSPAWNFUNC, // flags
+ MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_SLIDEME|MF_RUNSPAWNFUNC, // flags
S_NULL // raisestate
},
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index 4d0efa9e205fe401feed77e9102673d09e5c7ef9..129339b96fde68c6eab8b3878c91aacadfa529f5 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -86,6 +86,7 @@ enum mobj_e {
mobj_cvmem,
mobj_standingslope,
mobj_colorized,
+ mobj_mirrored,
mobj_shadowscale
};
@@ -152,6 +153,7 @@ static const char *const mobj_opt[] = {
"cvmem",
"standingslope",
"colorized",
+ "mirrored",
"shadowscale",
NULL};
@@ -385,6 +387,9 @@ static int mobj_get(lua_State *L)
case mobj_colorized:
lua_pushboolean(L, mo->colorized);
break;
+ case mobj_mirrored:
+ lua_pushboolean(L, mo->mirrored);
+ break;
case mobj_shadowscale:
lua_pushfixed(L, mo->shadowscale);
break;
@@ -713,6 +718,9 @@ static int mobj_set(lua_State *L)
case mobj_colorized:
mo->colorized = luaL_checkboolean(L, 3);
break;
+ case mobj_mirrored:
+ mo->mirrored = luaL_checkboolean(L, 3);
+ break;
case mobj_shadowscale:
mo->shadowscale = luaL_checkfixed(L, 3);
break;
diff --git a/src/m_menu.c b/src/m_menu.c
index f684354a5aec05a8995a5eca275c9d38cf9de63e..98178c15c34f51e0f05e2e5ed003886a36f2aa9d 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -759,17 +759,18 @@ static menuitem_t SR_EmblemHintMenu[] =
// Single Player Main
static menuitem_t SP_MainMenu[] =
{
+ // Note: If changing the positions here, also change them in M_SinglePlayerMenu()
{IT_CALL | IT_STRING, NULL, "Start Game", M_LoadGame, 76},
{IT_SECRET, NULL, "Record Attack", M_TimeAttack, 84},
{IT_SECRET, NULL, "NiGHTS Mode", M_NightsAttack, 92},
- {IT_CALL | IT_STRING | IT_CALL_NOTMODIFIED, NULL, "Marathon Run", M_Marathon, 100},
+ {IT_SECRET, NULL, "Marathon Run", M_Marathon, 100},
{IT_CALL | IT_STRING, NULL, "Tutorial", M_StartTutorial, 108},
{IT_CALL | IT_STRING | IT_CALL_NOTMODIFIED, NULL, "Statistics", M_Statistics, 116}
};
enum
{
- sploadgame,
+ spstartgame,
sprecordattack,
spnightsmode,
spmarathon,
@@ -2276,6 +2277,9 @@ void Nextmap_OnChange(void)
{
char *leveltitle;
char tabase[256];
+#ifdef OLDNREPLAYNAME
+ char tabaseold[256];
+#endif
short i;
boolean active;
@@ -2300,11 +2304,17 @@ void Nextmap_OnChange(void)
SP_NightsAttackMenu[naghost].status = IT_DISABLED;
// Check if file exists, if not, disable REPLAY option
- sprintf(tabase,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s",srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
+ sprintf(tabase,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s",srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), skins[cv_chooseskin.value-1].name);
+
+#ifdef OLDNREPLAYNAME
+ sprintf(tabaseold,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s",srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
+#endif
+
for (i = 0; i < 4; i++) {
SP_NightsReplayMenu[i].status = IT_DISABLED;
SP_NightsGuestReplayMenu[i].status = IT_DISABLED;
}
+
if (FIL_FileExists(va("%s-score-best.lmp", tabase))) {
SP_NightsReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
SP_NightsGuestReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
@@ -2320,16 +2330,37 @@ void Nextmap_OnChange(void)
SP_NightsGuestReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
active = true;
}
- if (FIL_FileExists(va("%s-guest.lmp", tabase))) {
+ if (FIL_FileExists(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value)))) {
SP_NightsReplayMenu[3].status = IT_WHITESTRING|IT_CALL;
SP_NightsGuestReplayMenu[3].status = IT_WHITESTRING|IT_CALL;
active = true;
}
+
+ // Old style name compatibility
+#ifdef OLDNREPLAYNAME
+ if (FIL_FileExists(va("%s-score-best.lmp", tabaseold))) {
+ SP_NightsReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
+ SP_NightsGuestReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
+ active = true;
+ }
+ if (FIL_FileExists(va("%s-time-best.lmp", tabaseold))) {
+ SP_NightsReplayMenu[1].status = IT_WHITESTRING|IT_CALL;
+ SP_NightsGuestReplayMenu[1].status = IT_WHITESTRING|IT_CALL;
+ active = true;
+ }
+ if (FIL_FileExists(va("%s-last.lmp", tabaseold))) {
+ SP_NightsReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
+ SP_NightsGuestReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
+ active = true;
+ }
+#endif
+
if (active) {
SP_NightsAttackMenu[naguest].status = IT_WHITESTRING|IT_SUBMENU;
SP_NightsAttackMenu[nareplay].status = IT_WHITESTRING|IT_SUBMENU;
SP_NightsAttackMenu[naghost].status = IT_WHITESTRING|IT_SUBMENU;
}
+
else if(itemOn == nareplay) // Reset lastOn so replay isn't still selected when not available.
{
currentMenu->lastOn = itemOn;
@@ -4404,7 +4435,7 @@ static void M_DrawGenericMenu(void)
}
}
-const char *PlaystyleNames[4] = {"Legacy", "Standard", "Simple", "Old Analog??"};
+const char *PlaystyleNames[4] = {"Strafe", "Standard", "Simple", "Old Analog??"};
const char *PlaystyleDesc[4] = {
// Legacy
"The play style used for\n"
@@ -8043,29 +8074,67 @@ static void M_SinglePlayerMenu(INT32 choice)
{
(void)choice;
+
+ // Reset the item positions, to avoid them sinking farther down every time the menu is opened if one is unavailable
+ // Note that they're reset, not simply "not moved again", in case mid-game add-ons re-enable an option
+ SP_MainMenu[spstartgame] .alphaKey = 76;
+ SP_MainMenu[sprecordattack].alphaKey = 84;
+ SP_MainMenu[spnightsmode] .alphaKey = 92;
+ SP_MainMenu[spmarathon] .alphaKey = 100;
+ //SP_MainMenu[sptutorial] .alphaKey = 108; // Not needed
+ //SP_MainMenu[spstatistics].alphaKey = 116; // Not needed
+
+
levellistmode = LLM_RECORDATTACK;
if (M_GametypeHasLevels(-1))
SP_MainMenu[sprecordattack].status = (M_SecretUnlocked(SECRET_RECORDATTACK)) ? IT_CALL|IT_STRING : IT_SECRET;
- else
- SP_MainMenu[sprecordattack].status = IT_NOTHING|IT_DISABLED;
+ else // If Record Attack is nonexistent in the current add-on...
+ {
+ SP_MainMenu[sprecordattack].status = IT_NOTHING|IT_DISABLED; // ...hide and disable the Record Attack option...
+ SP_MainMenu[spstartgame].alphaKey += 8; // ...and lower Start Game by 8 pixels to close the gap
+ }
+
levellistmode = LLM_NIGHTSATTACK;
if (M_GametypeHasLevels(-1))
SP_MainMenu[spnightsmode].status = (M_SecretUnlocked(SECRET_NIGHTSMODE)) ? IT_CALL|IT_STRING : IT_SECRET;
- else
- SP_MainMenu[spnightsmode].status = IT_NOTHING|IT_DISABLED;
+ else // If NiGHTS Mode is nonexistent in the current add-on...
+ {
+ SP_MainMenu[spnightsmode].status = IT_NOTHING|IT_DISABLED; // ...hide and disable the NiGHTS Mode option...
+ // ...and lower the above options' display positions by 8 pixels to close the gap
+ SP_MainMenu[spstartgame] .alphaKey += 8;
+ SP_MainMenu[sprecordattack].alphaKey += 8;
+ }
- SP_MainMenu[sptutorial].status = tutorialmap ? IT_CALL|IT_STRING : IT_NOTHING|IT_DISABLED;
// If the FIRST stage immediately leads to the ending, or itself (which gets converted to the title screen in G_DoCompleted for marathonmode only), there's no point in having this option on the menu. You should use Record Attack in that circumstance, although if marathonnext is set this behaviour can be overridden if you make some weird mod that requires multiple playthroughs of the same map in sequence and has some in-level mechanism to break the cycle.
- if (!M_SecretUnlocked(SECRET_RECORDATTACK) // also if record attack is locked
- || (mapheaderinfo[spmarathon_start-1]
+ if (mapheaderinfo[spmarathon_start-1]
&& !mapheaderinfo[spmarathon_start-1]->marathonnext
&& (mapheaderinfo[spmarathon_start-1]->nextlevel == spmarathon_start
- || mapheaderinfo[spmarathon_start-1]->nextlevel >= 1100)))
- SP_MainMenu[spmarathon].status = IT_NOTHING|IT_DISABLED;
- else
- SP_MainMenu[spmarathon].status = IT_CALL|IT_STRING|IT_CALL_NOTMODIFIED;
+ || mapheaderinfo[spmarathon_start-1]->nextlevel >= 1100))
+ {
+ SP_MainMenu[spmarathon].status = IT_NOTHING|IT_DISABLED; // Hide and disable the Marathon Run option...
+ // ...and lower the above options' display positions by 8 pixels to close the gap
+ SP_MainMenu[spstartgame] .alphaKey += 8;
+ SP_MainMenu[sprecordattack].alphaKey += 8;
+ SP_MainMenu[spnightsmode] .alphaKey += 8;
+ }
+ else // Otherwise, if Marathon Run is allowed and Record Attack is unlocked, unlock Marathon Run!
+ SP_MainMenu[spmarathon].status = (M_SecretUnlocked(SECRET_RECORDATTACK)) ? IT_CALL|IT_STRING|IT_CALL_NOTMODIFIED : IT_SECRET;
+
+
+ if (tutorialmap) // If there's a tutorial available in the current add-on...
+ SP_MainMenu[sptutorial].status = IT_CALL | IT_STRING; // ...always unlock Tutorial
+ else // But if there's no tutorial available in the current add-on...
+ {
+ SP_MainMenu[sptutorial].status = IT_NOTHING|IT_DISABLED; // ...hide and disable the Tutorial option...
+ // ...and lower the above options' display positions by 8 pixels to close the gap
+ SP_MainMenu[spstartgame] .alphaKey += 8;
+ SP_MainMenu[sprecordattack].alphaKey += 8;
+ SP_MainMenu[spnightsmode] .alphaKey += 8;
+ SP_MainMenu[spmarathon] .alphaKey += 8;
+ }
+
M_SetupNextMenu(&SP_MainDef);
}
@@ -10126,6 +10195,8 @@ static void M_NightsAttack(INT32 choice)
// Player has selected the "START" from the nights attack screen
static void M_ChooseNightsAttack(INT32 choice)
{
+ char *gpath;
+ const size_t glen = strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1;
char nameofdemo[256];
(void)choice;
emeralds = 0;
@@ -10136,14 +10207,18 @@ static void M_ChooseNightsAttack(INT32 choice)
I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755);
I_mkdir(va("%s"PATHSEP"replay"PATHSEP"%s", srb2home, timeattackfolder), 0755);
- snprintf(nameofdemo, sizeof nameofdemo, "replay"PATHSEP"%s"PATHSEP"%s-last", timeattackfolder, G_BuildMapName(cv_nextmap.value));
+ if ((gpath = malloc(glen)) == NULL)
+ I_Error("Out of memory for replay filepath\n");
+
+ sprintf(gpath,"replay"PATHSEP"%s"PATHSEP"%s", timeattackfolder, G_BuildMapName(cv_nextmap.value));
+ snprintf(nameofdemo, sizeof nameofdemo, "%s-%s-last", gpath, skins[cv_chooseskin.value-1].name);
if (!cv_autorecord.value)
remove(va("%s"PATHSEP"%s.lmp", srb2home, nameofdemo));
else
G_RecordDemo(nameofdemo);
- G_DeferedInitNew(false, G_BuildMapName(cv_nextmap.value), 0, false, false);
+ G_DeferedInitNew(false, G_BuildMapName(cv_nextmap.value), (UINT8)(cv_chooseskin.value-1), false, false);
}
// Player has selected the "START" from the time attack screen
@@ -10179,6 +10254,7 @@ static void M_ChooseTimeAttack(INT32 choice)
static void M_ReplayTimeAttack(INT32 choice)
{
const char *which;
+ char *demoname;
M_ClearMenus(true);
modeattacking = ATTACKING_RECORD; // set modeattacking before G_DoPlayDemo so the map loader knows
@@ -10220,11 +10296,18 @@ static void M_ReplayTimeAttack(INT32 choice)
which = "last";
break;
case 3: // guest
- which = "guest";
- break;
+ G_DoPlayDemo(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value)));
+ return;
}
- // srb2/replay/main/map01-score-best.lmp
- G_DoPlayDemo(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), which));
+
+ demoname = va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), skins[cv_chooseskin.value-1].name, which);
+
+#ifdef OLDNREPLAYNAME // Check for old style named NiGHTS replay if a new style replay doesn't exist.
+ if (!FIL_FileExists(demoname))
+ demoname = va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), which);
+#endif
+
+ G_DoPlayDemo(demoname);
}
}
@@ -10242,15 +10325,13 @@ static void M_EraseGuest(INT32 choice)
M_StartMessage(M_GetText("Guest replay data erased.\n"),NULL,MM_NOTHING);
}
-static void M_OverwriteGuest(const char *which, boolean nights)
+static void M_OverwriteGuest(const char *which)
{
char *rguest = Z_StrDup(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-guest.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value)));
UINT8 *buf;
size_t len;
- if (!nights)
- len = FIL_ReadFile(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), skins[cv_chooseskin.value-1].name, which), &buf);
- else
- len = FIL_ReadFile(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), which), &buf);
+ len = FIL_ReadFile(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), skins[cv_chooseskin.value-1].name, which), &buf);
+
if (!len) {
return;
}
@@ -10271,25 +10352,25 @@ static void M_OverwriteGuest(const char *which, boolean nights)
static void M_OverwriteGuest_Time(INT32 choice)
{
(void)choice;
- M_OverwriteGuest("time-best", currentMenu == &SP_NightsGuestReplayDef);
+ M_OverwriteGuest("time-best");
}
static void M_OverwriteGuest_Score(INT32 choice)
{
(void)choice;
- M_OverwriteGuest("score-best", currentMenu == &SP_NightsGuestReplayDef);
+ M_OverwriteGuest("score-best");
}
static void M_OverwriteGuest_Rings(INT32 choice)
{
(void)choice;
- M_OverwriteGuest("rings-best", false);
+ M_OverwriteGuest("rings-best");
}
static void M_OverwriteGuest_Last(INT32 choice)
{
(void)choice;
- M_OverwriteGuest("last", currentMenu == &SP_NightsGuestReplayDef);
+ M_OverwriteGuest("last");
}
static void M_SetGuestReplay(INT32 choice)
diff --git a/src/m_menu.h b/src/m_menu.h
index 221f1fd3f653a2d18eb9d013be8c5f104ae1e142..52bdb0dead9eafe30b12e1c8b127940f7cd1dc3b 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -21,6 +21,9 @@
#include "r_skins.h" // for SKINNAMESIZE
#include "f_finale.h" // for ttmode_enum
+// Compatibility with old-style named NiGHTS replay files.
+#define OLDNREPLAYNAME
+
//
// MENUS
//
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 101440b79c2fbbda3880659391c32fab40efbfb9..62bcad500c90e8ac48c875e8cdbbb1e16da083ef 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -400,7 +400,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
if (skin)
{
- spr2 = P_GetSkinSprite2(skin, (((player->powers[pw_super]) ? FF_SPR2SUPER : 0)|st->frame) & FF_FRAMEMASK, mobj->player);
+ spr2 = P_GetSkinSprite2(skin, (((player->powers[pw_super] && !(player->charflags & SF_NOSUPERSPRITES)) ? FF_SPR2SUPER : 0)|st->frame) & FF_FRAMEMASK, mobj->player);
numframes = skin->sprites[spr2].numframes;
}
else
@@ -9212,10 +9212,11 @@ static void P_DragonbomberThink(mobj_t *mobj)
mobj->angle += DRAGONTURNSPEED;
else
{
+ boolean flip = mobj->spawnpoint->options & MTF_OBJECTFLIP;
fixed_t vspeed = FixedMul(mobj->info->speed >> 3, mobj->scale);
fixed_t x = mobj->spawnpoint->x << FRACBITS;
fixed_t y = mobj->spawnpoint->y << FRACBITS;
- fixed_t z = mobj->spawnpoint->z << FRACBITS;
+ fixed_t z = (flip ? P_GetSectorCeilingZAt : P_GetSectorFloorZAt)(R_PointInSubsector(x, y)->sector, x, y) + (flip ? -1 : 1)*(mobj->spawnpoint->z << FRACBITS);
angle_t diff = R_PointToAngle2(mobj->x, mobj->y, x, y) - mobj->angle;
if (diff > ANGLE_180)
mobj->angle -= DRAGONTURNSPEED;
diff --git a/src/p_mobj.h b/src/p_mobj.h
index dae8c8a86079726aa17ebf45f4283761960d26d0..c94dbd650310a2393ae3129bf028f8e5757c48c3 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -373,6 +373,7 @@ typedef struct mobj_s
struct pslope_s *standingslope; // The slope that the object is standing on (shouldn't need synced in savegames, right?)
boolean colorized; // Whether the mobj uses the rainbow colormap
+ boolean mirrored; // The object's rotations will be mirrored left to right, e.g., see frame AL from the right and AR from the left
fixed_t shadowscale; // If this object casts a shadow, and the size relative to radius
// WARNING: New fields must be added separately to savegame and Lua.
diff --git a/src/p_pspr.h b/src/p_pspr.h
index 3c10e9be431aae095acc10c8873a6d936520047e..231262beb3aa204b331103a42342369efb624259 100644
--- a/src/p_pspr.h
+++ b/src/p_pspr.h
@@ -64,8 +64,10 @@
#define FF_FULLBRIGHT 0x00100000
/// \brief Frame flags: Flip sprite vertically (relative to what it should be for its gravity)
#define FF_VERTICALFLIP 0x00200000
+/// \brief Frame flags: Flip sprite horizontally
+#define FF_HORIZONTALFLIP 0x00400000
/// \brief Frame flags: Thin, paper-like sprite (for collision equivalent, see MF_PAPERCOLLISION)
-#define FF_PAPERSPRITE 0x00400000
+#define FF_PAPERSPRITE 0x00800000
/// \brief Frame flags - Animate: Simple stateless animation
#define FF_ANIMATE 0x01000000
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 6f54467950d961df3a00f8ecef3454bf66234091..dd4ade115f647e92b52b1e559b91428fa0052370 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -1294,8 +1294,9 @@ typedef enum
MD2_CEILINGROVER = 1<<10,
MD2_SLOPE = 1<<11,
MD2_COLORIZED = 1<<12,
- MD2_ROLLANGLE = 1<<13,
- MD2_SHADOWSCALE = 1<<14,
+ MD2_MIRRORED = 1<<13,
+ MD2_ROLLANGLE = 1<<14,
+ MD2_SHADOWSCALE = 1<<15,
} mobj_diff2_t;
typedef enum
@@ -1500,6 +1501,8 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
diff2 |= MD2_SLOPE;
if (mobj->colorized)
diff2 |= MD2_COLORIZED;
+ if (mobj->mirrored)
+ diff2 |= MD2_MIRRORED;
if (mobj->rollangle)
diff2 |= MD2_ROLLANGLE;
if (mobj->shadowscale)
@@ -1638,6 +1641,8 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
WRITEUINT16(save_p, mobj->standingslope->id);
if (diff2 & MD2_COLORIZED)
WRITEUINT8(save_p, mobj->colorized);
+ if (diff2 & MD2_MIRRORED)
+ WRITEUINT8(save_p, mobj->mirrored);
if (diff2 & MD2_ROLLANGLE)
WRITEANGLE(save_p, mobj->rollangle);
if (diff2 & MD2_SHADOWSCALE)
@@ -2641,6 +2646,8 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
mobj->standingslope = P_SlopeById(READUINT16(save_p));
if (diff2 & MD2_COLORIZED)
mobj->colorized = READUINT8(save_p);
+ if (diff2 & MD2_MIRRORED)
+ mobj->mirrored = READUINT8(save_p);
if (diff2 & MD2_ROLLANGLE)
mobj->rollangle = READANGLE(save_p);
if (diff2 & MD2_SHADOWSCALE)
diff --git a/src/p_setup.c b/src/p_setup.c
index f86de5ad4954ddbb9c76133596569b8d54cb4187..0ecd1507dd00ce4b4718432e352f40f9d0a90444 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3157,6 +3157,7 @@ static void P_LoadNightsGhosts(void)
{
const size_t glen = strlen(srb2home)+1+strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1;
char *gpath = malloc(glen);
+ INT32 i;
if (!gpath)
return;
@@ -3164,16 +3165,43 @@ static void P_LoadNightsGhosts(void)
sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(gamemap));
// Best Score ghost
- if (cv_ghost_bestscore.value && FIL_FileExists(va("%s-score-best.lmp", gpath)))
- G_AddGhost(va("%s-score-best.lmp", gpath));
+ if (cv_ghost_bestscore.value)
+ {
+ for (i = 0; i < numskins; ++i)
+ {
+ if (cv_ghost_bestscore.value == 1 && players[consoleplayer].skin != i)
+ continue;
+
+ if (FIL_FileExists(va("%s-%s-score-best.lmp", gpath, skins[i].name)))
+ G_AddGhost(va("%s-%s-score-best.lmp", gpath, skins[i].name));
+ }
+ }
// Best Time ghost
- if (cv_ghost_besttime.value && FIL_FileExists(va("%s-time-best.lmp", gpath)))
- G_AddGhost(va("%s-time-best.lmp", gpath));
+ if (cv_ghost_besttime.value)
+ {
+ for (i = 0; i < numskins; ++i)
+ {
+ if (cv_ghost_besttime.value == 1 && players[consoleplayer].skin != i)
+ continue;
+
+ if (FIL_FileExists(va("%s-%s-time-best.lmp", gpath, skins[i].name)))
+ G_AddGhost(va("%s-%s-time-best.lmp", gpath, skins[i].name));
+ }
+ }
// Last ghost
- if (cv_ghost_last.value && FIL_FileExists(va("%s-last.lmp", gpath)))
- G_AddGhost(va("%s-last.lmp", gpath));
+ if (cv_ghost_last.value)
+ {
+ for (i = 0; i < numskins; ++i)
+ {
+ if (cv_ghost_last.value == 1 && players[consoleplayer].skin != i)
+ continue;
+
+ if (FIL_FileExists(va("%s-%s-last.lmp", gpath, skins[i].name)))
+ G_AddGhost(va("%s-%s-last.lmp", gpath, skins[i].name));
+ }
+ }
// Guest ghost
if (cv_ghost_guest.value && FIL_FileExists(va("%s-guest.lmp", gpath)))
diff --git a/src/r_things.c b/src/r_things.c
index de5eb208f49bdebf4c5041bde1dbc0b883e83b38..d2647b8111b7c86a8674025bad6730472784475b 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -1367,6 +1367,8 @@ static void R_ProjectSprite(mobj_t *thing)
size_t frame, rot;
UINT16 flip;
boolean vflip = (!(thing->eflags & MFE_VERTICALFLIP) != !(thing->frame & FF_VERTICALFLIP));
+ boolean mirrored = thing->mirrored;
+ boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored);
INT32 lindex;
@@ -1477,7 +1479,11 @@ static void R_ProjectSprite(mobj_t *thing)
#endif
if (sprframe->rotate != SRF_SINGLE || papersprite)
+ {
ang = R_PointToAngle (thing->x, thing->y) - (thing->player ? thing->player->drawangle : thing->angle);
+ if (mirrored)
+ ang = InvAngle(ang);
+ }
if (sprframe->rotate == SRF_SINGLE)
{
@@ -1537,6 +1543,8 @@ static void R_ProjectSprite(mobj_t *thing)
}
#endif
+ flip = !flip != !hflip;
+
// calculate edges of the shape
if (flip)
offset = spr_offset - spr_width;
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 3ab9a5eabaa949fba14d69d4ef48677f34095393..53d98891339d22c41bb4152667e33e671e0e33e0 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -821,7 +821,7 @@ static void ST_drawLivesArea(void)
// skincolor face/super
UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, stplyr->mo->color, GTC_CACHE);
patch_t *face = faceprefix[stplyr->skin];
- if (stplyr->powers[pw_super])
+ if (stplyr->powers[pw_super] && !(stplyr->charflags & SF_NOSUPERSPRITES))
face = superprefix[stplyr->skin];
V_DrawSmallMappedPatch(hudinfo[HUD_LIVES].x, hudinfo[HUD_LIVES].y,
hudinfo[HUD_LIVES].f|V_PERPLAYER|V_HUDTRANS, face, colormap);