Make SINKS unconditional.

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

View File

@@ -8,10 +8,8 @@
#include "hack.h"
#include "lev.h"
#ifdef SINKS
STATIC_DCL void FDECL(trycall, (struct obj *));
STATIC_DCL void FDECL(dosinkring, (struct obj *));
#endif /* SINKS */
STATIC_PTR int FDECL(drop, (struct obj *));
STATIC_PTR int NDECL(wipeoff);
@@ -244,7 +242,6 @@ doaltarobj(obj) /* obj is an object dropped on an altar */
}
}
#ifdef SINKS
STATIC_OVL
void
trycall(obj)
@@ -396,7 +393,6 @@ giveback:
} else
useup(obj);
}
#endif
/* some common tests when trying to drop or throw items */
boolean
@@ -475,13 +471,11 @@ register struct obj *obj;
mbodypart(u.ustuck, STOMACH));
}
} else {
#ifdef SINKS
if((obj->oclass == RING_CLASS || obj->otyp == MEAT_RING) &&
IS_SINK(levl[u.ux][u.uy].typ)) {
dosinkring(obj);
return(1);
}
#endif
if (!can_reach_floor(TRUE)) {
/* we might be levitating due to #invoke Heart of Ahriman;
if so, levitation would end during call to freeinv()