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

Make KOPS unconditional.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-13 22:01:44 -05:00
parent 9e65758947
commit b066b7c170
16 changed files with 9 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/config.h
View File

@@ -423,7 +423,6 @@ typedef unsigned char uchar;
#define WALLIFIED_MAZE /* Fancy mazes - Jean-Christophe Collet */
#define REINCARNATION /* Special Rogue-like levels */
/* monsters & objects */
#define KOPS /* Keystone Kops by Scott R. Turner */
#define SEDUCE /* Succubi/incubi seduction, by KAA, suggested by IM */
#define TOURIST /* Tourist players with cameras and Hawaiian shirts */
/* I/O */

2
include/monflag.h
View File

@@ -29,9 +29,7 @@
#define MS_IMITATE 19 /* imitates others (leocrotta) */
#define MS_ORC MS_GRUNT /* intelligent brutes */
#define MS_HUMANOID 20 /* generic traveling companion */
#ifdef KOPS
#define MS_ARREST 21 /* "Stop in the name of the law!" (Kops) */
#endif
#define MS_SOLDIER 22 /* army and watchmen expressions */
#define MS_GUARD 23 /* "Please drop that gold and follow me." */
#define MS_DJINNI 24 /* "Thank you for freeing me!" */

4
include/obj.h
View File

@@ -312,12 +312,8 @@ struct obj {
(obj)->otyp == TOUCHSTONE)
/* misc */
#ifdef KOPS
#define is_flimsy(otmp) (objects[(otmp)->otyp].oc_material <= LEATHER || \
(otmp)->otyp == RUBBER_HOSE)
#else
#define is_flimsy(otmp) (objects[(otmp)->otyp].oc_material <= LEATHER)
#endif
/* helpers, simple enough to be macros */
#define is_plural(o) ((o)->quan > 1 || \