zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-27 20:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "- SW: Alt implementation for preparing a nuke."

Browse source 
This reverts commit 4fcec5f6d3.

Functionality wasn't working properly, most players will never use it and care only for 100% originality. Was a nice idea, though.

# Conflicts:
#	source/core/gamecvars.cpp
#	source/games/sw/src/panel.cpp
This commit is contained in:
Mitchell Richters 2021-03-02 20:02:20 +11:00
parent b9050b1a35
commit e0f1a83f40
3 changed files with 2 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/core/gamecvars.cpp
View file

@ -77,7 +77,6 @@ CVARD(Bool, cl_slopetilting, false, CVAR_ARCHIVE, "enable/disable slope tilting"
CVARD(Int, cl_showweapon, 1, CVAR_ARCHIVE, "enable/disable show weapons") // only implemented in Blood
CVARD(Bool, cl_sointerpolation, true, CVAR_ARCHIVE, "enable/disable sector object interpolation") // only implemented in SW
CVARD(Bool, cl_syncinput, false, CVAR_ARCHIVE, "enable/disable synchronized input with game's ticrate") // only implemented in Duke
CVARD(Bool, cl_swaltnukeinit, false, CVAR_ARCHIVE, "enable/disable SW alternative nuke initialisation") // only implemented in SW
CVARD(Bool, cl_dukefixrpgrecoil, false, CVAR_ARCHIVE, "soften recoil of Duke 3D's RPG")
CVARD(Bool, cl_smoothsway, false, CVAR_ARCHIVE, "move SW weapon left and right smoothly while bobbing")
CVARD(Bool, cl_showmagamt, false, CVAR_ARCHIVE, "show the amount of rounds left in the magazine of your weapon on the modern HUD")

1
source/core/gamecvars.h
View file

@ -22,7 +22,6 @@ EXTERN_CVAR(Int, cl_weaponswitch)
EXTERN_CVAR(Float, crosshairscale)
EXTERN_CVAR(Bool, cl_sointerpolation)
EXTERN_CVAR(Bool, cl_syncinput)
EXTERN_CVAR(Bool, cl_swaltnukeinit)
EXTERN_CVAR(Bool, cl_dukefixrpgrecoil)
EXTERN_CVAR(Bool, cl_smoothsway)
EXTERN_CVAR(Bool, cl_showmagamt)

37
source/games/sw/src/panel.cpp
View file

@ -4081,7 +4081,6 @@ void pMicroStandBy(PANEL_SPRITEp psp);
void pMicroCount(PANEL_SPRITEp psp);
void pMicroReady(PANEL_SPRITEp psp);
void pNukeAction(PANEL_SPRITEp psp);
void pMicroInitNukeAlt(PANEL_SPRITEp psp);
extern PANEL_STATE ps_MicroReload[];
@ -4115,17 +4114,6 @@ PANEL_STATE ps_InitNuke[] =
{ID_MicroPresent0, 3, pNukeAction, &ps_MicroRest[0], 0,0,0}
};
PANEL_STATE ps_InitNukeAlt[] =
{
{ID_MicroPresent0, Micro_REST_RATE, pMicroInitNukeAlt, &ps_InitNukeAlt[1], 0,0,0},
{ID_MicroPresent0, 0, pMicroStandBy, &ps_InitNukeAlt[2], psf_QuickCall, 0,0},
{ID_MicroPresent0, 120*2, pMicroAction, &ps_InitNukeAlt[3], 0,0,0},
{ID_MicroPresent0, 0, pMicroCount, &ps_InitNukeAlt[4], psf_QuickCall, 0,0},
{ID_MicroPresent0, 120*3, pMicroAction, &ps_InitNukeAlt[5], 0,0,0},
{ID_MicroPresent0, 0, pMicroReady, &ps_InitNukeAlt[6], psf_QuickCall, 0,0},
{ID_MicroPresent0, 120 + 60, pMicroAction, &ps_PresentMicro[0], 0,0,0}
};
PANEL_STATE ps_MicroRecoil[] =
{
// recoil
@ -4214,7 +4202,7 @@ InitWeaponMicro(PLAYERp pp)
pp->TestNukeInit = false;
pp->InitingNuke = true;
psp = pp->Wpn[WPN_MICRO];
pSetState(psp, !cl_swaltnukeinit ? ps_InitNuke : ps_InitNukeAlt);
pSetState(psp, ps_InitNuke);
}
return;
}
@ -4325,7 +4313,7 @@ pMicroPresent(PANEL_SPRITEp psp)
if (pp->WpnRocketType == 2 && !pp->NukeInitialized)
{
pp->TestNukeInit = false;
pSetState(psp, !cl_swaltnukeinit ? ps_InitNuke : ps_InitNukeAlt);
pSetState(psp, ps_InitNuke);
}
else
pSetState(psp, psp->RestState);
@ -4595,29 +4583,13 @@ pNukeAction(PANEL_SPRITEp psp)
pSetState(psp, psp->PresentState);
}
void
pMicroInitNukeAlt(PANEL_SPRITEp psp)
{
PLAYERp pp = psp->PlayerP;
psp->oy = psp->y;
psp->y += 2 * synctics;
pMicroAction(psp);
}
void
pMicroStandBy(PANEL_SPRITEp psp)
{
PLAYERp pp = psp->PlayerP;
psp->ox = psp->x;
psp->oy = psp->y;
pMicroOverlays(psp);
PlaySound(DIGI_NUKESTDBY, pp, v3df_follow|v3df_dontpan, CHAN_WEAPON);
pMicroAction(psp);
}
void
@ -4626,8 +4598,6 @@ pMicroCount(PANEL_SPRITEp psp)
PLAYERp pp = psp->PlayerP;
PlaySound(DIGI_NUKECDOWN, pp, v3df_follow|v3df_dontpan, CHAN_WEAPON);
pMicroAction(psp);
}
void
@ -4637,8 +4607,6 @@ pMicroReady(PANEL_SPRITEp psp)
PlaySound(DIGI_NUKEREADY, pp, v3df_follow|v3df_dontpan, CHAN_WEAPON);
pp->NukeInitialized = true;
pMicroAction(psp);
}
//////////////////////////////////////////////////////////////////////////////////////////
@ -7428,7 +7396,6 @@ static saveable_data saveable_panel_data[] =
SAVE_DATA(ps_MicroRest),
SAVE_DATA(ps_MicroHide),
SAVE_DATA(ps_InitNuke),
SAVE_DATA(ps_InitNukeAlt),
SAVE_DATA(ps_MicroRecoil),
SAVE_DATA(ps_MicroFire),
SAVE_DATA(ps_MicroSingleFire),