Make GOLDOBJ unconditional.

2015-02-14 01:31:22 -05:00
parent 4f59f5c6fd
commit ac108cd365
58 changed files with 8 additions and 1196 deletions
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -874,11 +874,7 @@ register struct monst *mtmp;
 	    else verbl_msg = "Relax, this won't hurt a bit.";
 	    break;
 	case MS_GUARD:
-#ifndef GOLDOBJ
-	    if (u.ugold)
-#else
 	    if (money_cnt(invent))
-#endif
 		verbl_msg = "Please drop that gold and follow me.";
 	    else
 		verbl_msg = "Please follow me.";