Minor code changes and updated World and files for 3.60 release. --Rumble

src/act.item.c

@@ -170,6 +170,9 @@ static int can_take_obj(struct char_data *ch, struct obj_data *obj)
   } else if (!(CAN_WEAR(obj, ITEM_WEAR_TAKE))) {
     act("$p: you can't take that!", FALSE, ch, obj, 0, TO_CHAR);
     return (0);
+  } else if (OBJ_SAT_IN_BY(obj)){
+    act("It appears someone is sitting on $p..", FALSE, ch, obj, 0, TO_CHAR);
+    return (0);
   }
   return (1);
 }

src/constants.c

@@ -24,7 +24,7 @@
  * @todo cpp_extern isn't needed here (or anywhere) as the extern reserved word
  * works correctly with C compilers (at least in my Experience)
  * Jeremy Osborne 1/28/2008 */
-cpp_extern const char *tbamud_version = "tbaMUD 3.59";
+cpp_extern const char *tbamud_version = "tbaMUD 3.60";
 
 /* strings corresponding to ordinals/bitvectors in structs.h */
 /* (Note: strings for class definitions in class.c instead of here) */

src/db.c

@@ -1522,7 +1522,7 @@ static void interpret_espec(const char *keyword, const char *value, int i, int n
     num_arg = atoi(value);
 
   CASE("BareHandAttack") {
-    RANGE(0, 99);
+    RANGE(0, NUM_ATTACK_TYPES - 1);
     mob_proto[i].mob_specials.attack_type = num_arg;
   }
 
@@ -2094,7 +2094,7 @@ static void load_zones(FILE *fl, char *zonename)
       break;
     }
     error = 0;
-    if (strchr("MOEPDTV", ZCMD.command) == NULL) {	/* a 3-arg command */
+    if (strchr("MOGEPDTV", ZCMD.command) == NULL) {	/* a 3-arg command */
       if (sscanf(ptr, " %d %d %d ", &tmp, &ZCMD.arg1, &ZCMD.arg2) != 3)
 	error = 1;
     } else if (ZCMD.command=='V') { /* a string-arg command */

src/genobj.c

@@ -10,7 +10,6 @@
 #include "structs.h"
 #include "utils.h"
 #include "db.h"
-#include "boards.h"
 #include "shop.h"
 #include "genolc.h"
 #include "genobj.h"

src/structs.h

@@ -19,7 +19,7 @@
  * on an older version. You are supposed to compare this with the macro
  * TBAMUD_VERSION() in utils.h.
  * It is read as Major/Minor/Patchlevel - MMmmPP */
-#define _TBAMUD    0x030590
+#define _TBAMUD    0x030600
 
 /** If you want equipment to be automatically equipped to the same place
  * it was when players rented, set the define below to 1 because

src/utils.h

@@ -40,7 +40,6 @@ void basic_mud_log(const char *format, ...) __attribute__ ((format (printf, 1, 2
 void basic_mud_vlog(const char *format, va_list args);
 int touch(const char *path);
 void mudlog(int type, int level, int file, const char *str, ...) __attribute__ ((format (printf, 4, 5)));
-void log_death_trap(struct char_data *ch);
 int	rand_number(int from, int to);
 int	dice(int number, int size);
 size_t	sprintbit(bitvector_t vektor, const char *names[], char *result, size_t reslen);