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

Disabled all adult censoring in Duke and RR.

Browse source 
Aside from being "authentic" the parental lock is just a stupid feature with often unwanted side effects.
This commit is contained in:
Christoph Oelckers 2020-07-29 22:43:06 +02:00
parent 5faf202b97
commit 0958bccade
8 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/duke/src/animatesprites_d.cpp
View file

@ -96,8 +96,7 @@ void animatesprites_d(int x,int y,int a,int smoothratio)
case BLOODSPLAT2:
case BLOODSPLAT3:
case BLOODSPLAT4:
if(adult_lockout) t->xrepeat = t->yrepeat = 0;
else if(t->pal == 6)
if(t->pal == 6)
{
t->shade = -127;
continue;
@ -452,11 +451,6 @@ void animatesprites_d(int x,int y,int a,int smoothratio)
case DUKELEG:
case DUKEGUN:
case DUKETORSO:
if(adult_lockout)
{
t->xrepeat = t->yrepeat = 0;
continue;
}
if(t->pal == 6) t->shade = -120;
case SCRAP1:

8
source/games/duke/src/animatesprites_r.cpp
View file

@ -75,8 +75,7 @@ void animatesprites_r(int x,int y,int a,int smoothratio)
case BLOODSPLAT2:
case BLOODSPLAT3:
case BLOODSPLAT4:
if(adult_lockout) t->xrepeat = t->yrepeat = 0;
else if(t->pal == 6)
if(t->pal == 6)
{
t->shade = -127;
continue;
@ -591,11 +590,6 @@ void animatesprites_r(int x,int y,int a,int smoothratio)
case COOTJIBB:
case COOTJIBC:
stuff:
if(adult_lockout)
{
t->xrepeat = t->yrepeat = 0;
continue;
}
if(t->pal == 6) t->shade = -120;
if (shadedsector[s->sectnum] == 1)

3
source/games/duke/src/input.cpp
View file

@ -260,8 +260,7 @@ void hud_input(int snum)
if (!isRRRA() || sprite[p->i].extra > 0)
{
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)
{
sprite[p->i].extra += 2;

1
source/games/duke/src/player_r.cpp
View file

@ -1256,7 +1256,6 @@ int doincrements_r(struct player_struct* p)
if (p->drink_amt > 66 && (p->last_pissed_time % 26) == 0)
p->drink_amt--;
if (adult_lockout == 0)
{
if (p->last_pissed_time == 5662)
S_PlayActorSound(434, p->i);

6
source/games/duke/src/premap_d.cpp
View file

@ -457,12 +457,6 @@ void prelevel_d(int g)
wal->extra = wal->picnum;
animwall[numanimwalls].tag = -1;
if (adult_lockout)
{
if (wal->picnum == FEMPIC1)
wal->picnum = BLANKSCREEN;
else wal->picnum = SCREENBREAK6;
}
animwall[numanimwalls].wallnum = i;
animwall[numanimwalls].tag = wal->picnum;

2
source/games/duke/src/sectors_d.cpp
View file

@ -1629,7 +1629,7 @@ void checksectors_d(int snum)
case STALL:
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->transporter_hold = 29 * 2;

2
source/games/duke/src/sectors_r.cpp
View file

@ -2663,7 +2663,7 @@ void checksectors_r(int snum)
case RRTILE2122:
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->transporter_hold = 29 * 2;

1
wadsrc/static/engine/menudef.txt
View file

@ -931,7 +931,6 @@ OptionMenu GameplayOptions //protected
{
Option "$PLRMNU_EQUIP", "cl_weaponswitch", "WeapSwitch"
}
Option "$PLRMNU_PLOCK", "adult_lockout", "OnOff" // I won't bother password protecting this piece of window dressing
// StaticText ""
// Option "Record Demo", "m_recstat", "OnOff"
// Submenu "Cheats" "CheatsMenu