mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-28 12:30:46 +00:00
Disabled all adult censoring in Duke and RR.
Aside from being "authentic" the parental lock is just a stupid feature with often unwanted side effects.
This commit is contained in:
parent
5faf202b97
commit
0958bccade
8 changed files with 5 additions and 26 deletions
|
@ -96,8 +96,7 @@ void animatesprites_d(int x,int y,int a,int smoothratio)
|
||||||
case BLOODSPLAT2:
|
case BLOODSPLAT2:
|
||||||
case BLOODSPLAT3:
|
case BLOODSPLAT3:
|
||||||
case BLOODSPLAT4:
|
case BLOODSPLAT4:
|
||||||
if(adult_lockout) t->xrepeat = t->yrepeat = 0;
|
if(t->pal == 6)
|
||||||
else if(t->pal == 6)
|
|
||||||
{
|
{
|
||||||
t->shade = -127;
|
t->shade = -127;
|
||||||
continue;
|
continue;
|
||||||
|
@ -452,11 +451,6 @@ void animatesprites_d(int x,int y,int a,int smoothratio)
|
||||||
case DUKELEG:
|
case DUKELEG:
|
||||||
case DUKEGUN:
|
case DUKEGUN:
|
||||||
case DUKETORSO:
|
case DUKETORSO:
|
||||||
if(adult_lockout)
|
|
||||||
{
|
|
||||||
t->xrepeat = t->yrepeat = 0;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if(t->pal == 6) t->shade = -120;
|
if(t->pal == 6) t->shade = -120;
|
||||||
|
|
||||||
case SCRAP1:
|
case SCRAP1:
|
||||||
|
|
|
@ -75,8 +75,7 @@ void animatesprites_r(int x,int y,int a,int smoothratio)
|
||||||
case BLOODSPLAT2:
|
case BLOODSPLAT2:
|
||||||
case BLOODSPLAT3:
|
case BLOODSPLAT3:
|
||||||
case BLOODSPLAT4:
|
case BLOODSPLAT4:
|
||||||
if(adult_lockout) t->xrepeat = t->yrepeat = 0;
|
if(t->pal == 6)
|
||||||
else if(t->pal == 6)
|
|
||||||
{
|
{
|
||||||
t->shade = -127;
|
t->shade = -127;
|
||||||
continue;
|
continue;
|
||||||
|
@ -591,11 +590,6 @@ void animatesprites_r(int x,int y,int a,int smoothratio)
|
||||||
case COOTJIBB:
|
case COOTJIBB:
|
||||||
case COOTJIBC:
|
case COOTJIBC:
|
||||||
stuff:
|
stuff:
|
||||||
if(adult_lockout)
|
|
||||||
{
|
|
||||||
t->xrepeat = t->yrepeat = 0;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if(t->pal == 6) t->shade = -120;
|
if(t->pal == 6) t->shade = -120;
|
||||||
|
|
||||||
if (shadedsector[s->sectnum] == 1)
|
if (shadedsector[s->sectnum] == 1)
|
||||||
|
|
|
@ -260,8 +260,7 @@ void hud_input(int snum)
|
||||||
if (!isRRRA() || sprite[p->i].extra > 0)
|
if (!isRRRA() || sprite[p->i].extra > 0)
|
||||||
{
|
{
|
||||||
p->last_pissed_time = 4000;
|
p->last_pissed_time = 4000;
|
||||||
if (!adult_lockout)
|
S_PlayActorSound(437, p->i);
|
||||||
S_PlayActorSound(437, p->i);
|
|
||||||
if (sprite[p->i].extra <= max_player_health - max_player_health / 10)
|
if (sprite[p->i].extra <= max_player_health - max_player_health / 10)
|
||||||
{
|
{
|
||||||
sprite[p->i].extra += 2;
|
sprite[p->i].extra += 2;
|
||||||
|
|
|
@ -1256,7 +1256,6 @@ int doincrements_r(struct player_struct* p)
|
||||||
if (p->drink_amt > 66 && (p->last_pissed_time % 26) == 0)
|
if (p->drink_amt > 66 && (p->last_pissed_time % 26) == 0)
|
||||||
p->drink_amt--;
|
p->drink_amt--;
|
||||||
|
|
||||||
if (adult_lockout == 0)
|
|
||||||
{
|
{
|
||||||
if (p->last_pissed_time == 5662)
|
if (p->last_pissed_time == 5662)
|
||||||
S_PlayActorSound(434, p->i);
|
S_PlayActorSound(434, p->i);
|
||||||
|
|
|
@ -457,12 +457,6 @@ void prelevel_d(int g)
|
||||||
|
|
||||||
wal->extra = wal->picnum;
|
wal->extra = wal->picnum;
|
||||||
animwall[numanimwalls].tag = -1;
|
animwall[numanimwalls].tag = -1;
|
||||||
if (adult_lockout)
|
|
||||||
{
|
|
||||||
if (wal->picnum == FEMPIC1)
|
|
||||||
wal->picnum = BLANKSCREEN;
|
|
||||||
else wal->picnum = SCREENBREAK6;
|
|
||||||
}
|
|
||||||
|
|
||||||
animwall[numanimwalls].wallnum = i;
|
animwall[numanimwalls].wallnum = i;
|
||||||
animwall[numanimwalls].tag = wal->picnum;
|
animwall[numanimwalls].tag = wal->picnum;
|
||||||
|
|
|
@ -1629,7 +1629,7 @@ void checksectors_d(int snum)
|
||||||
case STALL:
|
case STALL:
|
||||||
if (p->last_pissed_time == 0)
|
if (p->last_pissed_time == 0)
|
||||||
{
|
{
|
||||||
if (adult_lockout == 0) S_PlayActorSound(DUKE_URINATE, p->i);
|
S_PlayActorSound(DUKE_URINATE, p->i);
|
||||||
|
|
||||||
p->last_pissed_time = 26 * 220;
|
p->last_pissed_time = 26 * 220;
|
||||||
p->transporter_hold = 29 * 2;
|
p->transporter_hold = 29 * 2;
|
||||||
|
|
|
@ -2663,7 +2663,7 @@ void checksectors_r(int snum)
|
||||||
case RRTILE2122:
|
case RRTILE2122:
|
||||||
if (p->last_pissed_time == 0)
|
if (p->last_pissed_time == 0)
|
||||||
{
|
{
|
||||||
if (adult_lockout == 0) S_PlayActorSound(435, p->i);
|
S_PlayActorSound(435, p->i);
|
||||||
|
|
||||||
p->last_pissed_time = 26 * 220;
|
p->last_pissed_time = 26 * 220;
|
||||||
p->transporter_hold = 29 * 2;
|
p->transporter_hold = 29 * 2;
|
||||||
|
|
|
@ -931,7 +931,6 @@ OptionMenu GameplayOptions //protected
|
||||||
{
|
{
|
||||||
Option "$PLRMNU_EQUIP", "cl_weaponswitch", "WeapSwitch"
|
Option "$PLRMNU_EQUIP", "cl_weaponswitch", "WeapSwitch"
|
||||||
}
|
}
|
||||||
Option "$PLRMNU_PLOCK", "adult_lockout", "OnOff" // I won't bother password protecting this piece of window dressing
|
|
||||||
// StaticText ""
|
// StaticText ""
|
||||||
// Option "Record Demo", "m_recstat", "OnOff"
|
// Option "Record Demo", "m_recstat", "OnOff"
|
||||||
// Submenu "Cheats" "CheatsMenu
|
// Submenu "Cheats" "CheatsMenu
|
||||||
|
|
Loading…
Reference in a new issue