diff --git a/source/games/duke/src/animatesprites_d.cpp b/source/games/duke/src/animatesprites_d.cpp index fcb6f0a8a..e2bc2abfe 100644 --- a/source/games/duke/src/animatesprites_d.cpp +++ b/source/games/duke/src/animatesprites_d.cpp @@ -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: diff --git a/source/games/duke/src/animatesprites_r.cpp b/source/games/duke/src/animatesprites_r.cpp index 991689890..abcda3679 100644 --- a/source/games/duke/src/animatesprites_r.cpp +++ b/source/games/duke/src/animatesprites_r.cpp @@ -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) diff --git a/source/games/duke/src/input.cpp b/source/games/duke/src/input.cpp index 768bf08cc..60f0634ad 100644 --- a/source/games/duke/src/input.cpp +++ b/source/games/duke/src/input.cpp @@ -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; diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index 42631308d..e8ad7ba7c 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -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); diff --git a/source/games/duke/src/premap_d.cpp b/source/games/duke/src/premap_d.cpp index f2a9cd60b..3b8f19dab 100644 --- a/source/games/duke/src/premap_d.cpp +++ b/source/games/duke/src/premap_d.cpp @@ -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; diff --git a/source/games/duke/src/sectors_d.cpp b/source/games/duke/src/sectors_d.cpp index 83d21369f..9906218cd 100644 --- a/source/games/duke/src/sectors_d.cpp +++ b/source/games/duke/src/sectors_d.cpp @@ -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; diff --git a/source/games/duke/src/sectors_r.cpp b/source/games/duke/src/sectors_r.cpp index 7c46fdaa7..73ed99a13 100644 --- a/source/games/duke/src/sectors_r.cpp +++ b/source/games/duke/src/sectors_r.cpp @@ -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; diff --git a/wadsrc/static/engine/menudef.txt b/wadsrc/static/engine/menudef.txt index 1ad6888da..c4f49ce6a 100644 --- a/wadsrc/static/engine/menudef.txt +++ b/wadsrc/static/engine/menudef.txt @@ -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