thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge

Browse source
This commit is contained in:
Sally Coolatta 2020-08-02 17:30:19 -04:00
commit 4208d22129
1 changed files with 12 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/m_cheat.c
View file

@ -95,19 +95,11 @@ static UINT8 cheatf_warp(void)
} }
} }
<<<<<<< HEAD
if (success) if (success)
{ {
G_SaveGameData(true); //G_SetGameModified(false); G_SaveGameData(true); //G_SetGameModified(false);
S_StartSound(0, sfx_kc42); S_StartSound(0, sfx_kc42);
} }
=======
// Temporarily unlock stuff.
G_SetGameModified(false);
unlockables[31].unlocked = true; // credits
unlockables[30].unlocked = true; // sound test
unlockables[28].unlocked = true; // level select
>>>>>>> srb2/next
// Refresh secrets menu existing. // Refresh secrets menu existing.
M_ClearMenus(true); M_ClearMenus(true);
@ -156,17 +148,12 @@ static UINT8 cheatf_devmode(void)
static cheatseq_t cheat_warp = { static cheatseq_t cheat_warp = {
0, cheatf_warp, 0, cheatf_warp,
<<<<<<< HEAD
//{ SCRAMBLE('r'), SCRAMBLE('e'), SCRAMBLE('d'), SCRAMBLE('x'), SCRAMBLE('v'), SCRAMBLE('i'), 0xff } //{ SCRAMBLE('r'), SCRAMBLE('e'), SCRAMBLE('d'), SCRAMBLE('x'), SCRAMBLE('v'), SCRAMBLE('i'), 0xff }
{ SCRAMBLE('b'), SCRAMBLE('a'), SCRAMBLE('n'), SCRAMBLE('a'), SCRAMBLE('n'), SCRAMBLE('a'), 0xff } { SCRAMBLE('b'), SCRAMBLE('a'), SCRAMBLE('n'), SCRAMBLE('a'), SCRAMBLE('n'), SCRAMBLE('a'), 0xff }
=======
{ SCRAMBLE('c'), SCRAMBLE('a'), SCRAMBLE('s'), SCRAMBLE('h'), SCRAMBLE('r'), SCRAMBLE('i'), SCRAMBLE('d'), SCRAMBLE('a'), 0xff }
>>>>>>> srb2/next
}; };
static cheatseq_t cheat_warp_joy = { static cheatseq_t cheat_warp_joy = {
0, cheatf_warp, 0, cheatf_warp,
<<<<<<< HEAD
/*{ SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_UPARROW), /*{ SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_UPARROW),
SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_UPARROW), SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_UPARROW),
SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_UPARROW), SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_UPARROW),
@ -174,11 +161,6 @@ static cheatseq_t cheat_warp_joy = {
{ SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_UPARROW), SCRAMBLE(KEY_RIGHTARROW), { SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_UPARROW), SCRAMBLE(KEY_RIGHTARROW),
SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_UPARROW), SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_UPARROW), SCRAMBLE(KEY_LEFTARROW),
SCRAMBLE(KEY_DOWNARROW), SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_DOWNARROW), SCRAMBLE(KEY_RIGHTARROW),
=======
{ SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_DOWNARROW),
SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_DOWNARROW),
SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_DOWNARROW),
>>>>>>> srb2/next
SCRAMBLE(KEY_ENTER), 0xff } SCRAMBLE(KEY_ENTER), 0xff }
}; };
@ -1186,11 +1168,7 @@ void OP_NightsObjectplace(player_t *player)
if (player->pflags & PF_ATTACKDOWN) if (player->pflags & PF_ATTACKDOWN)
{ {
// Are ANY objectplace buttons pressed? If no, remove flag. // Are ANY objectplace buttons pressed? If no, remove flag.
<<<<<<< HEAD
if (!(cmd->buttons & (BT_ATTACK|BT_ACCELERATE|BT_BRAKE|BT_FORWARD|BT_BACKWARD))) if (!(cmd->buttons & (BT_ATTACK|BT_ACCELERATE|BT_BRAKE|BT_FORWARD|BT_BACKWARD)))
=======
if (!(cmd->buttons & (BT_ATTACK|BT_TOSSFLAG|BT_USE|BT_WEAPONNEXT|BT_WEAPONPREV)))
>>>>>>> srb2/next
player->pflags &= ~PF_ATTACKDOWN; player->pflags &= ~PF_ATTACKDOWN;
// Do nothing. // Do nothing.
@ -1274,29 +1252,8 @@ void OP_NightsObjectplace(player_t *player)
P_SpawnMapThing(mt); P_SpawnMapThing(mt);
}*/ }*/
<<<<<<< HEAD
// This places a ring! // This places a ring!
if (cmd->buttons & BT_BACKWARD) if (cmd->buttons & BT_BACKWARD)
=======
// This places a sphere!
if (cmd->buttons & BT_WEAPONNEXT)
>>>>>>> srb2/next
{
player->pflags |= PF_ATTACKDOWN;
if (!OP_HeightOkay(player, false))
return;
mt = OP_CreateNewMapThing(player, (UINT16)mobjinfo[MT_BLUESPHERE].doomednum, false);
P_SpawnMapThing(mt);
}
<<<<<<< HEAD
// This places a wing item!
if (cmd->buttons & BT_FORWARD)
=======
// This places a ring!
if (cmd->buttons & BT_WEAPONPREV)
>>>>>>> srb2/next
{ {
player->pflags |= PF_ATTACKDOWN; player->pflags |= PF_ATTACKDOWN;
if (!OP_HeightOkay(player, false)) if (!OP_HeightOkay(player, false))
@ -1306,6 +1263,17 @@ void OP_NightsObjectplace(player_t *player)
P_SpawnMapThing(mt); P_SpawnMapThing(mt);
} }
// This places a wing item
if (cmd->buttons & BT_FORWARD)
{
player->pflags |= PF_ATTACKDOWN;
if (!OP_HeightOkay(player, false))
return;
mt = OP_CreateNewMapThing(player, (UINT16)mobjinfo[MT_NIGHTSWING].doomednum, false);
P_SpawnMapThing(mt);
}
// This places a custom object as defined in the console cv_mapthingnum. // This places a custom object as defined in the console cv_mapthingnum.
if (cmd->buttons & BT_BRAKE) if (cmd->buttons & BT_BRAKE)
{ {
@ -1389,13 +1357,8 @@ void OP_ObjectplaceMovement(player_t *player)
player->mo->eflags &= ~MFE_VERTICALFLIP; player->mo->eflags &= ~MFE_VERTICALFLIP;
// make sure viewz follows player if in 1st person mode // make sure viewz follows player if in 1st person mode
<<<<<<< HEAD
//player->deltaviewheight = 0; //player->deltaviewheight = 0;
player->viewheight = FixedMul(32 << FRACBITS, player->mo->scale); player->viewheight = FixedMul(32 << FRACBITS, player->mo->scale);
=======
player->deltaviewheight = 0;
player->viewheight = FixedMul(41*player->height/48, player->mo->scale);
>>>>>>> srb2/next
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
player->viewz = player->mo->z + player->mo->height - player->viewheight; player->viewz = player->mo->z + player->mo->height - player->viewheight;
else else
@ -1420,35 +1383,23 @@ void OP_ObjectplaceMovement(player_t *player)
op_displayflags |= (UINT16)cv_opflags.value; op_displayflags |= (UINT16)cv_opflags.value;
} }
if (player->pflags & PF_ATTACKDOWN) if (player->pflags & PF_ATTACKDOWN)
{ {
// Are ANY objectplace buttons pressed? If no, remove flag. // Are ANY objectplace buttons pressed? If no, remove flag.
<<<<<<< HEAD
if (!(cmd->buttons & (BT_ATTACK|BT_DRIFT))) if (!(cmd->buttons & (BT_ATTACK|BT_DRIFT)))
=======
if (!(cmd->buttons & (BT_ATTACK|BT_TOSSFLAG|BT_WEAPONNEXT|BT_WEAPONPREV)))
>>>>>>> srb2/next
player->pflags &= ~PF_ATTACKDOWN; player->pflags &= ~PF_ATTACKDOWN;
// Do nothing. // Do nothing.
return; return;
} }
<<<<<<< HEAD
/*if (cmd->buttons & BT_FORWARD) /*if (cmd->buttons & BT_FORWARD)
=======
if (cmd->buttons & BT_WEAPONPREV)
>>>>>>> srb2/next
{ {
OP_CycleThings(-1); OP_CycleThings(-1);
player->pflags |= PF_ATTACKDOWN; player->pflags |= PF_ATTACKDOWN;
} }
<<<<<<< HEAD
else*/ if (cmd->buttons & BT_DRIFT) else*/ if (cmd->buttons & BT_DRIFT)
=======
if (cmd->buttons & BT_WEAPONNEXT)
>>>>>>> srb2/next
{ {
OP_CycleThings(1); OP_CycleThings(1);
player->pflags |= PF_ATTACKDOWN; player->pflags |= PF_ATTACKDOWN;
@ -1530,17 +1481,10 @@ void Command_ObjectPlace_f(void)
HU_DoCEcho(va(M_GetText( HU_DoCEcho(va(M_GetText(
"\\\\\\\\\\\\\\\\\\\\\\\\\x82" "\\\\\\\\\\\\\\\\\\\\\\\\\x82"
" Objectplace Controls: \x80\\\\" " Objectplace Controls: \x80\\\\"
<<<<<<< HEAD
" Drift: Cycle mapthings\\" " Drift: Cycle mapthings\\"
"Accelerate: Float up \\" "Accelerate: Float up \\"
" Brake: Float down \\" " Brake: Float down \\"
" Item: Place object \\"))); " Item: Place object \\")));
=======
"Weapon Next/Prev: Cycle mapthings\\"
" Jump: Float up \\"
" Spin: Float down \\"
" Fire Ring: Place object \\")));
>>>>>>> srb2/next
} }
// Save all the player's data. // Save all the player's data.