Revert "Add half-dragon anachrononauts"

.gitignore

@@ -1,7 +1,6 @@
 local.mk
 
 src/dnethack
-dnethackdir/
 util/recover
 util/makedefs
 util/dlb

include/color.h

@@ -61,7 +61,7 @@ struct menucoloring {
 #  ifdef MENU_COLOR_REGEX_POSIX
     regex_t match;
 #  else
-    char *match;
+    struct re_pattern_buffer match;
 #  endif
 # else
     char *match;

include/config.h

@@ -382,7 +382,7 @@ typedef long glyph_t;
 
 #if defined(TTY_GRAPHICS) || defined(MSWIN_GRAPHICS)
 # define MENU_COLOR
-// # define MENU_COLOR_REGEX
+# define MENU_COLOR_REGEX
 /* # define MENU_COLOR_REGEX_POSIX */
 /* if MENU_COLOR_REGEX is defined, use regular expressions (regex.h,
  * GNU specific functions by default, POSIX functions with

include/decl.h

@@ -594,7 +594,7 @@ E char *fqn_prefix_names[PREFIX_COUNT];
 #ifdef AUTOPICKUP_EXCEPTIONS
 struct autopickup_exception {
 	char *pattern;
-	char *match;
+	regex_t match;
 	boolean grab;
 	boolean is_regexp;
 	struct autopickup_exception *next;
@@ -649,7 +649,7 @@ E int mailckfreq;
 struct _plinemsg {
     xchar msgtype;
     char *pattern;
-    char *match;
+    regex_t match;
     boolean is_regexp;
     struct _plinemsg *next;
 };

include/system.h

@@ -476,8 +476,8 @@ E  char *sprintf();
 #  if !defined(SVR4) && !defined(apollo)
 #   if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
 #    if !(defined(SUNOS4) && defined(__STDC__)) /* Solaris unbundled cc (acc) */
-// E int FDECL(vsprintf, (char *, const char *, va_list));
-// E int FDECL(vfprintf, (FILE *, const char *, va_list));
+E int FDECL(vsprintf, (char *, const char *, va_list));
+E int FDECL(vfprintf, (FILE *, const char *, va_list));
 E int FDECL(vprintf, (const char *, va_list));
 #    endif
 #   endif

src/eat.c

@@ -2743,18 +2743,6 @@ doeat()		/* generic "eat" command funtion (see cmd.c) */
 		) etype = uUpgrades;
 		else etype = clockwork_eat_menu(TRUE,TRUE);
 	}
-	if (!is_edible(otmp)) {
-	    You("cannot eat that!");
-	    return 0;
-	} else if ((otmp->owornmask & (W_ARMOR|W_TOOL|W_AMUL
-#ifdef STEED
-			|W_SADDLE
-#endif
-			)) != 0) {
-	    /* let them eat rings */
-	    You_cant("eat %s you're wearing.", something);
-	    return 0;
-	}
 	
 	if (Strangled) {
 		pline("If you can't breathe air, how can you consume solids?");
@@ -2796,6 +2784,18 @@ doeat()		/* generic "eat" command funtion (see cmd.c) */
 	 * mails, players who polymorph back to human in the middle of their
 	 * metallic meal, etc....
 	 */
+	if (!is_edible(otmp)) {
+	    You("cannot eat that!");
+	    return 0;
+	} else if ((otmp->owornmask & (W_ARMOR|W_TOOL|W_AMUL
+#ifdef STEED
+			|W_SADDLE
+#endif
+			)) != 0) {
+	    /* let them eat rings */
+	    You_cant("eat %s you're wearing.", something);
+	    return 0;
+	}
 	if (is_metallic(otmp) &&
 	    u.umonnum == PM_RUST_MONSTER && otmp->oerodeproof) {
 	    	otmp->rknown = TRUE;

src/options.c

@@ -1385,7 +1385,7 @@ char *str;
     tmp = (struct menucoloring *)alloc(sizeof(struct menucoloring));
 #ifdef MENU_COLOR_REGEX
 #ifdef MENU_COLOR_REGEX_POSIX
-    errnum = 0;//regcomp(&tmp->match, tmps, REG_EXTENDED | REG_NOSUB);
+    errnum = regcomp(&tmp->match, tmps, REG_EXTENDED | REG_NOSUB);
     if (errnum != 0)
     {
 	regerror(errnum, &tmp->match, errbuf, sizeof(errbuf));
@@ -4186,7 +4186,7 @@ const char *mapping;
 		    int errnum;
 		    char errbuf[80];
 		    const char *err = (char *)0;
-		    errnum = 0;//regcomp(&ape->match, text2, REG_EXTENDED | REG_NOSUB);
+		    errnum = regcomp(&ape->match, text2, REG_EXTENDED | REG_NOSUB);
 		    if (errnum != 0) {
 			regerror(errnum, &ape->match, errbuf, sizeof(errbuf));
 			err = errbuf;

src/pline.c

@@ -34,7 +34,7 @@ msgpline_add(typ, pattern)
     tmp->msgtype = typ;
     tmp->is_regexp = iflags.msgtype_regex;
     if (tmp->is_regexp) {
-	errnum = 0;//regcomp(&tmp->match, pattern, REG_EXTENDED | REG_NOSUB);
+	errnum = regcomp(&tmp->match, pattern, REG_EXTENDED | REG_NOSUB);
 	if (errnum != 0) {
 	    regerror(errnum, &tmp->match, errbuf, sizeof(errbuf));
 	    err = errbuf;

src/role.c

@@ -67,10 +67,10 @@ const struct Role roles[] = {
 	PM_SARA__THE_LAST_ORACLE, PM_TROOPER, NON_PM,
 	NON_PM, NON_PM, NON_PM, NON_PM,
 	ART_ANNULUS,
-	MA_HUMAN|MA_DWARF|MA_ELF|MA_VAMPIRE|MA_DRAGON, ROLE_MALE|ROLE_FEMALE |
+	MA_HUMAN|MA_DWARF|MA_ELF|MA_VAMPIRE, ROLE_MALE|ROLE_FEMALE |
 	  ROLE_NEUTRAL|ROLE_CHAOTIC,
 	/* Str Int Wis Dex Con Cha */
-	{  12, 10,  7, 10,  10,  7 },
+	{  10, 10,  7, 10,  7,  7 },
 	{  15, 17, 15, 12, 15, 15 },
 	/* Init   Lower  Higher */
 	{ 11, 0,  0, 4,  1, 0 },	/* Hit points */

src/u_init.c

@@ -51,20 +51,6 @@ static struct trobj Anachrononaut_Hu[] = {
 	{ PROTEIN_PILL, 0, FOOD_CLASS, 10, 0 },
 	{ 0, 0, 0, 0, 0 }
 };
-static struct trobj Anachrononaut_Hlf[] = {
-	{ AUTO_SHOTGUN,  0, WEAPON_CLASS, 1, 0 },
-	{ SHOTGUN_SHELL, 3, WEAPON_CLASS, 100, 0 },
-	{ SCALE_MAIL, 0, ARMOR_CLASS, 1, 0 },
-	{ BRONZE_HELM, 0, ARMOR_CLASS, 1, 0 },
-	{ GAUNTLETS, 0, ARMOR_CLASS, 1, 0 },
-	{ ARMORED_BOOTS, 0, ARMOR_CLASS, 1, 0 },
-	{ CLOAK_OF_PROTECTION, 0, ARMOR_CLASS, 1, 0 },
-	{ BULLET_FABBER, 0, TOOL_CLASS, 1, 0 },
-	{ CUTTING_LASER,  0, WEAPON_CLASS, 1, 0 },
-	{ POWER_PACK, 0, TOOL_CLASS, 5, 0 },
-	{ PROTEIN_PILL, 0, FOOD_CLASS, 10, 0 },
-	{ 0, 0, 0, 0, 0 }
-};
 static struct trobj Anachrononaut_Dw[] = {
 	{ HEAVY_MACHINE_GUN, 5, WEAPON_CLASS, 1, 0 },
 	{ PISTOL, 1, WEAPON_CLASS, 1, 0 },
@@ -1685,7 +1671,6 @@ u_init()
 		else if(Race_if(PM_INCANTIFIER)) ini_inv(Anachrononaut_Inc);
 		else if(Race_if(PM_VAMPIRE)) ini_inv(Anachrononaut_Vam);
 		else if(Race_if(PM_DWARF)) ini_inv(Anachrononaut_Dw);
-		else if(Race_if(PM_HALF_DRAGON)) ini_inv(Anachrononaut_Hlf);
 		else ini_inv(Anachrononaut_Hu);
 		knows_object(FLINTLOCK);
 		knows_object(PISTOL);
@@ -2726,14 +2711,6 @@ register struct trobj *trop;
 				obj->obj_material = MITHRIL;
 				fix_object(obj);
 			}
-			if(obj->otyp == SCALE_MAIL && Role_if(PM_ANACHRONONAUT)){
-				obj->obj_material = COPPER; // which is actually bronze nice one Chris
-				fix_object(obj);
-			}
-			if(obj->otyp == GAUNTLETS && Role_if(PM_ANACHRONONAUT)){
-				obj->obj_material = COPPER;
-				fix_object(obj);
-			}
 			if(obj->otyp == PISTOL && Role_if(PM_ANACHRONONAUT) && Race_if(PM_DWARF)){
 				obj->obj_material = MITHRIL;
 				fix_object(obj);