diff --git a/changelog b/changelog index e3f11ab..9ef7250 100644 --- a/changelog +++ b/changelog @@ -36,6 +36,11 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) (lots of major bugfixes too) @ tbaMUD 3.61 +[Feb 08 2010] - Rumble + Added another define for Windows MSVC users to hide useless warnings. (thanks Kyle) + Added CIRCLE_WINDOWS check for tell m-w usage of getpid(). (thanks Kyle) + Changed zcheck to ignore object type TRASH when checking for a cost of 0. + Changed teleport level to LVL_BUILDER. [Jan 27 2010] - Rumble Updated World (thanks Parna) and other text files for release. [Jan 18 2010] - Fizban diff --git a/lib/misc/typos b/lib/misc/typos new file mode 100644 index 0000000..e69de29 diff --git a/src/act.comm.c b/src/act.comm.c index 751e1b1..6bfcfed 100644 --- a/src/act.comm.c +++ b/src/act.comm.c @@ -135,13 +135,17 @@ ACMD(do_tell) { struct char_data *vict = NULL; char buf[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH]; - int i; half_chop(argument, buf, buf2); if (!*buf || !*buf2) send_to_char(ch, "Who do you wish to tell what??\r\n"); else if (!strcmp(buf, "m-w")) { +#ifdef CIRCLE_WINDOWS + /* getpid() is not portable */ + send_to_char(ch, "Sorry, that is not available in the windows port.\r\n"); +#else /* all other configurations */ + int i; char word[MAX_INPUT_LENGTH], *p, *q; if (last_webster_teller != -1L) { @@ -169,6 +173,7 @@ ACMD(do_tell) i = system(buf); last_webster_teller = GET_IDNUM(ch); send_to_char(ch, "You look up '%s' in Merriam-Webster.\r\n", word); +#endif /* platform specific part */ } else if (GET_LEVEL(ch) < LVL_IMMORT && !(vict = get_player_vis(ch, buf, NULL, FIND_CHAR_WORLD))) send_to_char(ch, "%s", CONFIG_NOPERSON); else if (GET_LEVEL(ch) >= LVL_IMMORT && !(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_WORLD))) diff --git a/src/act.wizard.c b/src/act.wizard.c index c92d25e..e4adbfa 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -3624,7 +3624,7 @@ ACMD (do_zcheck) "- is NO_TAKE, but has cost (%d) weight (%d) or rent (%d) set.\r\n", GET_OBJ_COST(obj), GET_OBJ_WEIGHT(obj), GET_OBJ_RENT(obj)); } else { - if (GET_OBJ_COST(obj) == 0 && (found=1)) + if (GET_OBJ_COST(obj) == 0 && (found=1) && GET_OBJ_TYPE(obj) != ITEM_TRASH) len += snprintf(buf + len, sizeof(buf) - len, "- has 0 cost (min. 1).\r\n"); diff --git a/src/conf.h b/src/conf.h new file mode 100644 index 0000000..64f3c7a --- /dev/null +++ b/src/conf.h @@ -0,0 +1,342 @@ +/* src/conf.h. Generated automatically by configure. */ +/* src/conf.h.in. Generated automatically from configure.in by autoheader. */ + +#ifndef _CONF_H_ +#define _CONF_H_ + +/* Windows complains about standard functions like strcmp() */ +#define _CRT_SECURE_NO_DEPRECATE +#define _CRT_NONSTDC_NO_DEPRECATE + +/* Define to empty if the keyword does not work. */ +/* #undef const */ + +/* Define if you don't have vprintf but do have _doprnt. */ +/* #undef HAVE_DOPRNT */ + +/* Define if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define if you have the vprintf function. */ +#define HAVE_VPRINTF 1 + +/* Define to `int' if doesn't define. */ +/* #undef pid_t */ + +/* Define as the return type of signal handlers (int or void). */ +#define RETSIGTYPE void + +/* Define to `unsigned' if doesn't define. */ +/* #undef size_t */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Define if we're compiling CircleMUD under any type of UNIX system. */ +#define CIRCLE_UNIX 1 + +/* Define if the system is capable of using crypt() to encrypt. */ +#define CIRCLE_CRYPT 1 + +/* Define if we don't have proper support for the system's crypt(). */ +/* #undef HAVE_UNSAFE_CRYPT */ + +/* Define is the system has struct in_addr. */ +#define HAVE_STRUCT_IN_ADDR 1 + +/* Define to `int' if doesn't define. */ +/* #undef socklen_t */ + +/* Define to `int' if doesn't define. */ +/* #undef ssize_t */ + +/* Define if you have the gettimeofday function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define if you have the inet_addr function. */ +#define HAVE_INET_ADDR 1 + +/* Define if you have the inet_aton function. */ +#define HAVE_INET_ATON 1 + +/* Define if you have the select function. */ +#define HAVE_SELECT 1 + +/* Define if you have the snprintf function. */ +#define HAVE_SNPRINTF 1 + +/* Define if you have the strcasecmp function. */ +#define HAVE_STRCASECMP 1 + +/* Define if you have the strdup function. */ +#define HAVE_STRDUP 1 + +/* Define if you have the strerror function. */ +#define HAVE_STRERROR 1 + +/* Define if you have the stricmp function. */ +/* #undef HAVE_STRICMP */ + +/* Define if you have the strlcpy function. */ +/* #undef HAVE_STRLCPY */ + +/* Define if you have the strncasecmp function. */ +#define HAVE_STRNCASECMP 1 + +/* Define if you have the strnicmp function. */ +/* #undef HAVE_STRNICMP */ + +/* Define if you have the strstr function. */ +#define HAVE_STRSTR 1 + +/* Define if you have the vsnprintf function. */ +#define HAVE_VSNPRINTF 1 + +/* Define if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define if you have the header file. */ +#define HAVE_ARPA_TELNET_H 1 + +/* Define if you have the header file. */ +#define HAVE_ASSERT_H 1 + +/* Define if you have the header file. */ +#define HAVE_CRYPT_H 1 + +/* Define if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define if you have the header file. */ +#define HAVE_MCHECK_H 1 + +/* Define if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_NET_ERRNO_H */ + +/* Define if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_FCNTL_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_UIO_H 1 + +/* Define if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define if you have the malloc library (-lmalloc). */ +/* #undef HAVE_LIBMALLOC */ + +/* Check for a prototype to accept. */ +/* #undef NEED_ACCEPT_PROTO */ + +/* Check for a prototype to atoi. */ +/* #undef NEED_ATOI_PROTO */ + +/* Check for a prototype to atol. */ +/* #undef NEED_ATOL_PROTO */ + +/* Check for a prototype to bind. */ +/* #undef NEED_BIND_PROTO */ + +/* Check for a prototype to bzero. */ +/* #undef NEED_BZERO_PROTO */ + +/* Check for a prototype to chdir. */ +/* #undef NEED_CHDIR_PROTO */ + +/* Check for a prototype to close. */ +/* #undef NEED_CLOSE_PROTO */ + +/* Check for a prototype to crypt. */ +/* #undef NEED_CRYPT_PROTO */ + +/* Check for a prototype to fclose. */ +/* #undef NEED_FCLOSE_PROTO */ + +/* Check for a prototype to fcntl. */ +/* #undef NEED_FCNTL_PROTO */ + +/* Check for a prototype to fflush. */ +/* #undef NEED_FFLUSH_PROTO */ + +/* Check for a prototype to fprintf. */ +/* #undef NEED_FPRINTF_PROTO */ + +/* Check for a prototype to fputc. */ +/* #undef NEED_FPUTC_PROTO */ + +/* Check for a prototype to fputs. */ +/* #undef NEED_FPUTS_PROTO */ + +/* Check for a prototype to fread. */ +/* #undef NEED_FREAD_PROTO */ + +/* Check for a prototype to fscanf. */ +/* #undef NEED_FSCANF_PROTO */ + +/* Check for a prototype to fseek. */ +/* #undef NEED_FSEEK_PROTO */ + +/* Check for a prototype to fwrite. */ +/* #undef NEED_FWRITE_PROTO */ + +/* Check for a prototype to getpeername. */ +/* #undef NEED_GETPEERNAME_PROTO */ + +/* Check for a prototype to getpid. */ +/* #undef NEED_GETPID_PROTO */ + +/* Check for a prototype to getrlimit. */ +/* #undef NEED_GETRLIMIT_PROTO */ + +/* Check for a prototype to getsockname. */ +/* #undef NEED_GETSOCKNAME_PROTO */ + +/* Check for a prototype to gettimeofday. */ +/* #undef NEED_GETTIMEOFDAY_PROTO */ + +/* Check for a prototype to htonl. */ +/* #undef NEED_HTONL_PROTO */ + +/* Check for a prototype to htons. */ +/* #undef NEED_HTONS_PROTO */ + +/* Check for a prototype to inet_addr. */ +/* #undef NEED_INET_ADDR_PROTO */ + +/* Check for a prototype to inet_aton. */ +/* #undef NEED_INET_ATON_PROTO */ + +/* Check for a prototype to inet_ntoa. */ +/* #undef NEED_INET_NTOA_PROTO */ + +/* Check for a prototype to listen. */ +/* #undef NEED_LISTEN_PROTO */ + +/* Check for a prototype to ntohl. */ +/* #undef NEED_NTOHL_PROTO */ + +/* Check for a prototype to perror. */ +/* #undef NEED_PERROR_PROTO */ + +/* Check for a prototype to printf. */ +/* #undef NEED_PRINTF_PROTO */ + +/* Check for a prototype to qsort. */ +/* #undef NEED_QSORT_PROTO */ + +/* Check for a prototype to read. */ +/* #undef NEED_READ_PROTO */ + +/* Check for a prototype to remove. */ +/* #undef NEED_REMOVE_PROTO */ + +/* Check for a prototype to rewind. */ +/* #undef NEED_REWIND_PROTO */ + +/* Check for a prototype to select. */ +/* #undef NEED_SELECT_PROTO */ + +/* Check for a prototype to setitimer. */ +/* #undef NEED_SETITIMER_PROTO */ + +/* Check for a prototype to setrlimit. */ +/* #undef NEED_SETRLIMIT_PROTO */ + +/* Check for a prototype to setsockopt. */ +/* #undef NEED_SETSOCKOPT_PROTO */ + +/* Check for a prototype to snprintf. */ +/* #undef NEED_SNPRINTF_PROTO */ + +/* Check for a prototype to socket. */ +/* #undef NEED_SOCKET_PROTO */ + +/* Check for a prototype to sprintf. */ +/* #undef NEED_SPRINTF_PROTO */ + +/* Check for a prototype to sscanf. */ +/* #undef NEED_SSCANF_PROTO */ + +/* Check for a prototype to strcasecmp. */ +/* #undef NEED_STRCASECMP_PROTO */ + +/* Check for a prototype to strdup. */ +/* #undef NEED_STRDUP_PROTO */ + +/* Check for a prototype to strerror. */ +/* #undef NEED_STRERROR_PROTO */ + +/* Check for a prototype to stricmp. */ +#define NEED_STRICMP_PROTO + +/* Check for a prototype to strlcpy. */ +#define NEED_STRLCPY_PROTO + +/* Check for a prototype to strncasecmp. */ +/* #undef NEED_STRNCASECMP_PROTO */ + +/* Check for a prototype to strnicmp. */ +#define NEED_STRNICMP_PROTO + +/* Check for a prototype to system. */ +/* #undef NEED_SYSTEM_PROTO */ + +/* Check for a prototype to time. */ +/* #undef NEED_TIME_PROTO */ + +/* Check for a prototype to unlink. */ +/* #undef NEED_UNLINK_PROTO */ + +/* Check for a prototype to vsnprintf. */ +/* #undef NEED_VSNPRINTF_PROTO */ + +/* Check for a prototype to write. */ +/* #undef NEED_WRITE_PROTO */ + + +#endif /* _CONF_H_ */ diff --git a/src/interpreter.c b/src/interpreter.c index 01bfd28..9a77c0d 100644 --- a/src/interpreter.c +++ b/src/interpreter.c @@ -294,7 +294,7 @@ cpp_extern const struct command_info cmd_info[] = { { "tell" , "t" , POS_DEAD , do_tell , 0, 0 }, { "take" , "ta" , POS_RESTING , do_get , 0, 0 }, { "taste" , "tas" , POS_RESTING , do_eat , 0, SCMD_TASTE }, - { "teleport" , "tele" , POS_DEAD , do_teleport , LVL_GOD, 0 }, + { "teleport" , "tele" , POS_DEAD , do_teleport , LVL_BUILDER, 0 }, { "tedit" , "tedit" , POS_DEAD , do_tedit , LVL_GOD, 0 }, /* XXX: Oasisify */ { "thaw" , "thaw" , POS_DEAD , do_wizutil , LVL_GRGOD, SCMD_THAW }, { "title" , "title" , POS_DEAD , do_title , 0, 0 },