pull request #1148 - remove old wall_angle() code
Pull request from argrath: "These codes have been commented out since 3.4.3, at least." The two "#if 0 /* older method, fixed */" blocks were present in 3.2.0. wall_angle() itself wasn't present yet in 3.1.0 so the "older method" couldn't have been in use for very long. I examined sources hosted by nethackwiki.com, which doesn't offer 3.1.1 through 3.1.3. git log only goes back far enough to include the second cvs repository, so not far enough. I'm not sure but 3.1.x might not have even used the first cvs repository. Go ahead and get rid of this dead code now rather than wait for some potential future purge. Closes #1148
This commit is contained in:
@@ -3406,22 +3406,6 @@ wall_angle(struct rm *lev)
|
||||
}
|
||||
break;
|
||||
case WM_T_BL:
|
||||
#if 0 /* older method, fixed */
|
||||
if (only(seenv, SV4 | SV5)) {
|
||||
col = T_tlcorn;
|
||||
} else if ((seenv & (SV0 | SV1 | SV2))
|
||||
&& only(seenv, SV0 | SV1 | SV2 | SV6 | SV7)) {
|
||||
col = T_hwall;
|
||||
} else if ((seenv & SV3)
|
||||
|| ((seenv & (SV0 | SV1 | SV2))
|
||||
&& (seenv & (SV4 | SV5)))) {
|
||||
col = T_tdwall;
|
||||
} else {
|
||||
if (seenv != SV6)
|
||||
t_warn(lev);
|
||||
col = T_stone;
|
||||
}
|
||||
#endif /* 0 */
|
||||
if (only(seenv, SV4 | SV5))
|
||||
col = T_tlcorn;
|
||||
else if ((seenv & (SV0 | SV1 | SV2 | SV7))
|
||||
@@ -3433,22 +3417,6 @@ wall_angle(struct rm *lev)
|
||||
col = T_tdwall;
|
||||
break;
|
||||
case WM_T_BR:
|
||||
#if 0 /* older method, fixed */
|
||||
if (only(seenv, SV5 | SV6)) {
|
||||
col = T_trcorn;
|
||||
} else if ((seenv & (SV0 | SV1 | SV2))
|
||||
&& only(seenv, SV0 | SV1 | SV2 | SV3 | SV4)) {
|
||||
col = T_hwall;
|
||||
} else if ((seenv & SV7)
|
||||
|| ((seenv & (SV0 | SV1 | SV2))
|
||||
&& (seenv & (SV5 | SV6)))) {
|
||||
col = T_tdwall;
|
||||
} else {
|
||||
if (seenv != SV4)
|
||||
t_warn(lev);
|
||||
col = T_stone;
|
||||
}
|
||||
#endif /* 0 */
|
||||
if (only(seenv, SV5 | SV6))
|
||||
col = T_trcorn;
|
||||
else if ((seenv & (SV0 | SV1 | SV2 | SV3))
|
||||
|
||||
Reference in New Issue
Block a user