nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Make SINKS unconditional.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-13 23:30:38 -05:00
parent b066b7c170
commit 5ee71d2757
23 changed files with 6 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dokick.c
View File

@@ -688,9 +688,7 @@ char *buf;
else if (IS_THRONE(maploc->typ)) what = "a throne";
else if (IS_FOUNTAIN(maploc->typ)) what = "a fountain";
else if (IS_GRAVE(maploc->typ)) what = "a headstone";
#ifdef SINKS
else if (IS_SINK(maploc->typ)) what = "a sink";
#endif
else if (IS_ALTAR(maploc->typ)) what = "an altar";
else if (IS_DRAWBRIDGE(maploc->typ)) what = "a drawbridge";
else if (maploc->typ == STAIRS) what = "the stairs";
@@ -1054,7 +1052,6 @@ dokick()
}
goto ouch;
}
#ifdef SINKS
if(IS_SINK(maploc->typ)) {
int gend = poly_gender();
short washerndx = (gend == 1 || (gend == 2 && rn2(2))) ?
@@ -1107,7 +1104,6 @@ dokick()
}
goto ouch;
}
#endif
if (maploc->typ == STAIRS || maploc->typ == LADDER ||
IS_STWALL(maploc->typ)) {
if(!IS_STWALL(maploc->typ) && maploc->ladder == LA_DOWN)