mirror of
https://github.com/tbamud/tbamud.git
synced 2026-01-27 11:26:10 +01:00
jeremyosborne | 2008-04-04 02:36:38 +0200 (Fri, 04 Apr 2008) | 1 line
Minor Bugfix: All game configuration settings now reference the world config structure, not the individual config variables found in config.c. ------------------------------------------------------------------------ rumble | 2008-03-22 13:27:00 +0100 (Sat, 22 Mar 2008) | 1 line Added lib/world/qst/ directory, index, index.mini, and 0.qst. ------------------------------------------------------------------------ jeremyosborne | 2008-03-08 03:27:51 +0100 (Sat, 08 Mar 2008) | 3 lines Bugfix: the include directory (for .h files) is now referenced correctly in the depend statement. Deletion: listrent.c removed as a separate utility. ------------------------------------------------------------------------ jeremyosborne | 2008-03-08 03:08:51 +0100 (Sat, 08 Mar 2008) | 1 line Enhancement: utils/ Makefile will now use a depends file, and looks for dependen cies in the ../ directory (shrinks the necessary information to make each utilit y). ------------------------------------------------------------------------ Rumble | 2008-03-06 23:39:35 +0100 (Thu, 06 Mar 2008) | 1 line Made TBA specific changes. do_cheat, removed help level checking, and advance to level 32. ------------------------------------------------------------------------ jeremyosborne | 2008-03-06 18:37:12 +0100 (Thu, 06 Mar 2008) | 1 line Minor Update: Changed header of Makefile.in to read 'tbaMUD' and also added in a ttribution for the changes. (Thanks seqwith.) ------------------------------------------------------------------------ jeremyosborne | 2008-03-06 18:31:07 +0100 (Thu, 06 Mar 2008) | 4 lines Changed Makefile.in to use glob expressions when building the objects. This translates into no longer a need to update Makefile.in whenever a new .c file is added to the mud code. Other Makefile.* have not yet been changed (and need review, anyway). All CXREF cruft left in Makefile.in has been removed. tbaMUD is now using Doxygen. Technically, CXREF provides a bit more auto-documentation than Doxygen does, however the tbaMUD (and legacy circle code) has never been marked-up with the special CXREF codes required to effectively use the program. Since Doxygen is easier to use, and provides almost as much functionality as CXREF, CXREF support has been dropped. ------------------------------------------------------------------------ jeremyosborne | 2008-03-06 08:31:02 +0100 (Thu, 06 Mar 2008) | 1 line Bug Fix: asciiflag_conv* functions now can handle a negative numeric value. ------------------------------------------------------------------------ jeremyosborne | 2008-03-06 08:16:06 +0100 (Thu, 06 Mar 2008) | 1 line Bug fix/enhancement: Charmed mobs (specifically charmed mobs with a ->master) will no longer attempt to wander off. ------------------------------------------------------------------------ jeremyosborne | 2008-03-06 08:13:38 +0100 (Thu, 06 Mar 2008) | 6 lines Based on the compiler warning about mag_materials being an unused function, and the clone spell being unused. Bug fix: Clone can now be cast. It is an 'ignore' target spell. Fix and Modification: Clone, being an effectively unused spell that is only used by mortal Magic Users at level 30, is now implemented as very simple example of how to use mag_materials(). The item required by mag_materials is vnum 161, which in stock tbaMUD is some sacrificial entrails. ------------------------------------------------------------------------ jeremyosborne | 2008-03-05 01:43:09 +0100 (Wed, 05 Mar 2008) | 3 lines Bug Fix for "Did you mean:" including DG commands. ------------------------------------------------------------------------ jeremyosborne | 2008-03-05 01:29:18 +0100 (Wed, 05 Mar 2008) | 3 lines Bug Fix: do_simple_move slightly rewritten to handle Leave triggers that purge a door. Documentation: do_simple_move documented. ------------------------------------------------------------------------ Laoris | 2008-03-01 08:22:12 +0100 (Sat, 01 Mar 2008) | 1 line Trial run of columnizer function on commands list to see how people like it. ------------------------------------------------------------------------ jeremyosborne | 2008-02-26 22:36:17 +0100 (Tue, 26 Feb 2008) | 1 line asciimap, an in game automap, along with a couple of minor bug fixes to do with the automap, patched in (Thanks Jamdog). ------------------------------------------------------------------------ jeremyosborne | 2008-02-22 04:08:05 +0100 (Fri, 22 Feb 2008) | 1 line Minor update: Relocate local variable declaration to the top of ACMD(do_help) ------------------------------------------------------------------------ jeremyosborne | 2008-02-22 04:04:37 +0100 (Fri, 22 Feb 2008) | 6 lines Checked in the following placeholders for do_gen_tog: #define SCMD_AUTOLOOT 24 #define SCMD_AUTOGOLD 25 #define SCMD_AUTOSPLIT 26 #define SCMD_AUTOSAC 27 #define SCMD_AUTOASSIST 28 ------------------------------------------------------------------------ jeremyosborne | 2008-02-22 03:57:06 +0100 (Fri, 22 Feb 2008) | 1 line The Autoquest patch, along with a couple of minor bug fixes, has been integrated into tbaMUD. (Thanks Jamdog, Kenneth Ray and Morgaelin.) ------------------------------------------------------------------------ jeremyosborne | 2008-02-18 21:46:45 +0100 (Mon, 18 Feb 2008) | 2 lines Minor Fix: Casted NOWHERE, NOTHING, NOBODY and NOFLAG as IDXTYPE for the signed short int index types. ------------------------------------------------------------------------ jeremyosborne | 2008-02-18 03:36:16 +0100 (Mon, 18 Feb 2008) | 7 lines Added a new atoidx() conversion function for dealing with string to IDXTYPE conversions (in utils.c, prototype exported through utils.h). Added IDXTYPE_MIN and IDXTYPE_MAX defines (in structs.h). Replaced atoi references with atoidx in do_oasis_zedit (in zedit.c). ------------------------------------------------------------------------ Rumble | 2008-02-18 01:44:13 +0100 (Mon, 18 Feb 2008) | 1 line Fixed direction mapping to give readable directions instead of sub commands. ------------------------------------------------------------------------ jeremyosborne | 2008-02-18 00:26:15 +0100 (Mon, 18 Feb 2008) | 5 lines Since general olc editing are automatically saved to disk, 'shutdown reboot' has been changed to not-autosave by default. (Small change made to do_shutdown in act.wizard.c). ------------------------------------------------------------------------ jeremyosborne | 2008-02-18 00:12:12 +0100 (Mon, 18 Feb 2008) | 3 lines Changed: struct attack_hit_type moved to fight.h attack_hit_text exported through fight.h ------------------------------------------------------------------------ jeremyosborne | 2008-02-17 22:32:51 +0100 (Sun, 17 Feb 2008) | 7 lines - do_file heads or tails files correctly and has also been enhanced to return file info (act.wizard.c) - defines made for common log files created by autorun, and those used by do_file (db.h) - utility functions added: file_head(), file_tail(), file_sizeof(), and file_numlines() (defined utils.c and exported through utils.h) ------------------------------------------------------------------------ Rumble | 2008-02-16 23:24:05 +0100 (Sat, 16 Feb 2008) | 1 line Fixed export command. (thanks Kyle) ------------------------------------------------------------------------ jeremyosborne | 2008-02-16 22:42:46 +0100 (Sat, 16 Feb 2008) | 1 line Files are now tagged as executable. Should be able to be checked out from subver sion and executed without running chmod. ------------------------------------------------------------------------ Rumble | 2008-02-15 17:03:06 +0100 (Fri, 15 Feb 2008) | 1 line Fixed strcat() writing out of bounds in cedit.c since strdup() only malloc() strlen(str)+1 bytes. (thanks Buggo) and moved attack_hit_text back. ------------------------------------------------------------------------ jeremyosborne | 2008-02-13 20:41:02 +0100 (Wed, 13 Feb 2008) | 1 line Event queue function definitions, global variables and defines doxygenated. ------------------------------------------------------------------------ Rumble | 2008-02-12 00:23:38 +0100 (Tue, 12 Feb 2008) | 1 line Updated levels command to use an arg/range and added color parsing to greetings. (thanks Jamdog) ------------------------------------------------------------------------ jeremyosborne | 2008-02-11 21:06:10 +0100 (Mon, 11 Feb 2008) | 1 line Doxygen comments completed for weather.c ------------------------------------------------------------------------ Rumble | 2008-02-11 03:52:50 +0100 (Mon, 11 Feb 2008) | 1 line Corrected several 64-bit warnings. (thanks Buggo) ------------------------------------------------------------------------ Rumble | 2008-02-10 22:56:56 +0100 (Sun, 10 Feb 2008) | 1 line Added get_flag_by_name allowing for new trigedit variable checks like %actor.pref(FLAG)% checks. (thanks Jamdog) ------------------------------------------------------------------------ jeremyosborne | 2008-02-08 21:22:26 +0100 (Fri, 08 Feb 2008) | 3 lines COMPLETE: tbaMUD code re-org of global and local scope function and variable declarations. There may be a few things that I did not catch (some non extern keyword declarations of function prototypes within other functions, for example). BUG FIX: Unused functions encrypt_hex() and decrypt_hex() removed from mail.c. ------------------------------------------------------------------------ jeremyosborne | 2008-02-05 23:31:09 +0100 (Tue, 05 Feb 2008) | 2 lines Continued clean-up of 'extern' references to functions and variables. BUG UNCOVERED: set_title() in class.c incorrectly handles the const nature of the char * returned from title_female and title_male. ------------------------------------------------------------------------ jeremyosborne | 2008-02-05 19:38:17 +0100 (Tue, 05 Feb 2008) | 3 lines More work on mud clean-up. New file: spec_procs.h Created this file to house the legacy special procedures (spec_procs.c and castle.c) and special feature assignment in general. ------------------------------------------------------------------------ jeremyosborne | 2008-02-05 00:59:44 +0100 (Tue, 05 Feb 2008) | 3 lines - Minor Bugfix: Fixed parse error in mobact.c - Minor Bugfix: act.h is now included in all of the act functions. Forgot to do that the first time :( - Additions: ban.h has been added as the external entry point into the ban.c globals and functions. Files needing ban.h have been updated. ------------------------------------------------------------------------ jeremyosborne | 2008-02-04 20:02:11 +0100 (Mon, 04 Feb 2008) | 1 line All act*.c functions, defines and globals have been prototyped/declared in act.h. The file act.h does not contain every ACMD, only those ACMDs and utility functions available within the act*.c files. ------------------------------------------------------------------------ Rumble | 2008-02-04 17:59:47 +0100 (Mon, 04 Feb 2008) | 1 line Fixed the last few flags missed for the 128 bit conversion. ------------------------------------------------------------------------ Laoris | 2008-02-04 07:27:56 +0100 (Mon, 04 Feb 2008) | 3 lines Adding a column formatter for lists. Accepts printf-like arguments. Only used by medit right now. ------------------------------------------------------------------------ jeremyosborne | 2008-02-04 07:09:19 +0100 (Mon, 04 Feb 2008) | 2 lines - Changed the 'struct queue' to 'struct dg_queue' to avoid namespace conflicts. - Ongoing cleanup to mud project. ------------------------------------------------------------------------ Rumble | 2008-02-04 00:07:09 +0100 (Mon, 04 Feb 2008) | 1 line Fixed run_autowiz which ran twice on advancement. ------------------------------------------------------------------------ jeremyosborne | 2008-02-03 03:46:22 +0100 (Sun, 03 Feb 2008) | 1 line act.h created and added. This header will be the external entry point for the functions, function subcommands and variables within the act*.c files. It is not designed to be the entry point for all ACMD functions. ------------------------------------------------------------------------ jeremyosborne | 2008-02-03 02:44:29 +0100 (Sun, 03 Feb 2008) | 1 line Merge of another part of the code cleanup, the dg script stuff. ------------------------------------------------------------------------ jeremyosborne | 2008-02-02 08:56:03 +0100 (Sat, 02 Feb 2008) | 1 line Modularizing and organizing files continues. Committing comm.c and comm.h because they are hairy, and I don't want to do them over if my hard drive crashes. ------------------------------------------------------------------------ jeremyosborne | 2008-02-02 07:05:08 +0100 (Sat, 02 Feb 2008) | 4 lines - Marking all file scope functions as 'static' - Reorganization of the global variables and functions. ------------------------------------------------------------------------ jeremyosborne | 2008-01-31 10:20:47 +0100 (Thu, 31 Jan 2008) | 1 line * Protected the conf.h.* system config files from multiple calls. ------------------------------------------------------------------------ jeremyosborne | 2008-01-31 09:56:18 +0100 (Thu, 31 Jan 2008) | 1 line * Removed extraneous references to TRUE / FALSE and YES / NO defines. ------------------------------------------------------------------------ jeremyosborne | 2008-01-31 09:46:20 +0100 (Thu, 31 Jan 2008) | 2 lines * BUGFIX: NUM_POSITIONS set to 8 (was incorrectly set to 15 before) * Migrated NUM_* settings from oasis.h to more appropriate locations near where they are defined. (For Example: NUM_POSITIONS moved to structs.h next to the POSITION_* defines.) ------------------------------------------------------------------------ jeremyosborne | 2008-01-31 03:58:28 +0100 (Thu, 31 Jan 2008) | 1 line Added Appendix A - Coder Support. Right now, it simply speaks to the fact that we have included doxygen config files, are working to document the source code, and provides a rudimentary "do this" guide to create the doxygen cross references. ------------------------------------------------------------------------ jeremyosborne | 2008-01-30 07:12:07 +0100 (Wed, 30 Jan 2008) | 2 lines - All .h files now have doxygen recognized headers, and the format is slightly altered to ease editing of headers. - Protected all .h files from multiple calls. (Standard format is #ifndef _HEADE R_H_ #define _HEADER_H_ .... #endif) ------------------------------------------------------------------------ jeremyosborne | 2008-01-29 11:18:14 +0100 (Tue, 29 Jan 2008) | 1 line constants.h, structs.h and utils.h now protected from multiple includes. This is sometimes overkill, but good practice overall. ------------------------------------------------------------------------ jeremyosborne | 2008-01-29 10:38:18 +0100 (Tue, 29 Jan 2008) | 1 line Updated documentation for constants.c and constants.h. ------------------------------------------------------------------------ jeremyosborne | 2008-01-29 10:15:25 +0100 (Tue, 29 Jan 2008) | 3 lines The standard Doxygen configuration doxyfiles (config files) for tbaMUD. One is to be used with the Graphviz DOT (dox_withGraphs), one is designed to be used if Graphviz is not available. Now just need a short document describing the usage of doxygen. ------------------------------------------------------------------------ jeremyosborne | 2008-01-29 10:11:36 +0100 (Tue, 29 Jan 2008) | 1 line Minor document correction in struct dex_app_tpe. ------------------------------------------------------------------------ jeremyosborne | 2008-01-28 20:53:51 +0100 (Mon, 28 Jan 2008) | 1 line *bugfix* do_drink command: When a container is empty, the correct, "It is empty." message is now displayed. ------------------------------------------------------------------------ jeremyosborne | 2008-01-28 07:58:15 +0100 (Mon, 28 Jan 2008) | 3 lines Merging changes to trunk for: * utils.h, utils.c and structs.h doxygen comments * adding file dox_withGraphs.doxyfile
This commit is contained in:
Rumble
parent
70f648c85b
commit
ebc985f010
120 changed files with 9028 additions and 4364 deletions
|
|
@ -20,31 +20,23 @@
|
|||
#include "house.h"
|
||||
#include "constants.h"
|
||||
#include "dg_scripts.h"
|
||||
#include "act.h"
|
||||
#include "fight.h"
|
||||
#include "oasis.h" /* for buildwalk */
|
||||
|
||||
/* external functions */
|
||||
int special(struct char_data *ch, int cmd, char *arg);
|
||||
void death_cry(struct char_data *ch);
|
||||
int find_eq_pos(struct char_data *ch, struct obj_data *obj, char *arg);
|
||||
int buildwalk(struct char_data *ch, int dir);
|
||||
|
||||
/* local functions */
|
||||
int has_boat(struct char_data *ch);
|
||||
int find_door(struct char_data *ch, const char *type, char *dir, const char *cmdname);
|
||||
int has_key(struct char_data *ch, obj_vnum key);
|
||||
void do_doorcmd(struct char_data *ch, struct obj_data *obj, int door, int scmd);
|
||||
int ok_pick(struct char_data *ch, obj_vnum keynum, int pickproof, int scmd);
|
||||
ACMD(do_gen_door);
|
||||
ACMD(do_enter);
|
||||
ACMD(do_leave);
|
||||
ACMD(do_stand);
|
||||
ACMD(do_sit);
|
||||
ACMD(do_rest);
|
||||
ACMD(do_sleep);
|
||||
ACMD(do_wake);
|
||||
ACMD(do_follow);
|
||||
/* local only functions */
|
||||
/* do_simple_move utility functions */
|
||||
static int has_boat(struct char_data *ch);
|
||||
/* do_gen_door utility functions */
|
||||
static int find_door(struct char_data *ch, const char *type, char *dir, const char *cmdname);
|
||||
static int has_key(struct char_data *ch, obj_vnum key);
|
||||
static void do_doorcmd(struct char_data *ch, struct obj_data *obj, int door, int scmd);
|
||||
static int ok_pick(struct char_data *ch, obj_vnum keynum, int pickproof, int scmd);
|
||||
|
||||
|
||||
/* simple function to determine if char can walk on water */
|
||||
int has_boat(struct char_data *ch)
|
||||
static int has_boat(struct char_data *ch)
|
||||
{
|
||||
struct obj_data *obj;
|
||||
int i;
|
||||
|
|
@ -118,63 +110,136 @@ int has_scuba(struct char_data *ch)
|
|||
return (0);
|
||||
}
|
||||
|
||||
/* do_simple_move assumes that there is no master, no followers and that the
|
||||
* direction exists. It returns 1 for success, 0 if failure. */
|
||||
/** Move a PC/NPC character from their current location to a new location. This
|
||||
* is the standard movement locomotion function that all normal walking
|
||||
* movement by characters should be sent through. This function also defines
|
||||
* the move cost of normal locomotion as:
|
||||
* ( (move cost for source room) + (move cost for destination) ) / 2
|
||||
*
|
||||
* @pre Function assumes that ch has no master controlling character, that
|
||||
* ch has no followers (in other words followers won't be moved by this
|
||||
* function) and that the direction traveled in is one of the valid, enumerated
|
||||
* direction.
|
||||
* @param ch The character structure to attempt to move.
|
||||
* @param dir The defined direction (NORTH, SOUTH, etc...) to attempt to
|
||||
* move into.
|
||||
* @param need_specials_check If TRUE will cause
|
||||
* @retval int 1 for a successful move (ch is now in a new location)
|
||||
* or 0 for a failed move (ch is still in the original location). */
|
||||
int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
|
||||
{
|
||||
char throwaway[MAX_INPUT_LENGTH] = ""; /* Functions assume writable. */
|
||||
/* Begin Local variable definitions */
|
||||
/*---------------------------------------------------------------------*/
|
||||
/* Used in our special proc check. By default, we pass a NULL argument
|
||||
* when checking for specials */
|
||||
char spec_proc_args[MAX_INPUT_LENGTH] = "";
|
||||
/* The room the character is currently in and will move from... */
|
||||
room_rnum was_in = IN_ROOM(ch);
|
||||
int need_movement;
|
||||
/* ... and the room the character will move into. */
|
||||
room_rnum going_to = EXIT(ch, dir)->to_room;
|
||||
/* How many movement points are required to travel from was_in to going_to.
|
||||
* We redefine this later when we need it. */
|
||||
int need_movement = 0;
|
||||
/* Contains the "leave" message to display to the was_in room. */
|
||||
char leave_message[SMALL_BUFSIZE];
|
||||
/*---------------------------------------------------------------------*/
|
||||
/* End Local variable definitions */
|
||||
|
||||
|
||||
/* Begin checks that can prevent a character from leaving the was_in room. */
|
||||
/* Future checks should be implemented within this section and return 0. */
|
||||
/*---------------------------------------------------------------------*/
|
||||
/* Check for special routines that might activate because of the move and
|
||||
* also might prevent the movement. Special requires commands, so we pass
|
||||
* in the "command" equivalent of the direction (ie. North is '1' in the
|
||||
* command list, but NORTH is defined as '0').
|
||||
* Note -- only check if following; this avoids 'double spec-proc' bug */
|
||||
if (need_specials_check && special(ch, dir + 1, spec_proc_args))
|
||||
return 0;
|
||||
|
||||
/* Check for special routines (North is 1 in command list, but 0 here) Note
|
||||
* -- only check if following; this avoids 'double spec-proc' bug */
|
||||
if (need_specials_check && special(ch, dir + 1, throwaway))
|
||||
return (0);
|
||||
|
||||
/* blocked by a leave trigger ? */
|
||||
/* Leave Trigger Checks: Does a leave trigger block exit from the room? */
|
||||
if (!leave_mtrigger(ch, dir) || IN_ROOM(ch) != was_in) /* prevent teleport crashes */
|
||||
return 0;
|
||||
if (!leave_wtrigger(&world[IN_ROOM(ch)], ch, dir) || IN_ROOM(ch) != was_in) /* prevent teleport crashes */
|
||||
return 0;
|
||||
if (!leave_otrigger(&world[IN_ROOM(ch)], ch, dir) || IN_ROOM(ch) != was_in) /* prevent teleport crashes */
|
||||
return 0;
|
||||
/* charmed? */
|
||||
if (AFF_FLAGGED(ch, AFF_CHARM) && ch->master && IN_ROOM(ch) == IN_ROOM(ch->master)) {
|
||||
|
||||
/* Charm effect: Does it override the movement? */
|
||||
if (AFF_FLAGGED(ch, AFF_CHARM) && ch->master && was_in == IN_ROOM(ch->master))
|
||||
{
|
||||
send_to_char(ch, "The thought of leaving your master makes you weep.\r\n");
|
||||
act("$n bursts into tears.", FALSE, ch, 0, 0, TO_ROOM);
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* if this room or the one we're going to needs a boat, check for one */
|
||||
if ((SECT(IN_ROOM(ch)) == SECT_WATER_NOSWIM) ||
|
||||
(SECT(EXIT(ch, dir)->to_room) == SECT_WATER_NOSWIM)) {
|
||||
if (!has_boat(ch)) {
|
||||
/* Water, No Swimming Rooms: Does the deep water prevent movement? */
|
||||
if ((SECT(was_in) == SECT_WATER_NOSWIM) ||
|
||||
(SECT(going_to) == SECT_WATER_NOSWIM))
|
||||
{
|
||||
if (!has_boat(ch))
|
||||
{
|
||||
send_to_char(ch, "You need a boat to go there.\r\n");
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
|
||||
/* If this room or the one we're going to needs flight, check for it. */
|
||||
if ((SECT(IN_ROOM(ch)) == SECT_FLYING) || (SECT(EXIT(ch, dir)->to_room) == SECT_FLYING)) {
|
||||
if (!has_flight(ch)) {
|
||||
/* Flying Required: Does lack of flying prevent movement? */
|
||||
if ((SECT(was_in) == SECT_FLYING) || (SECT(going_to) == SECT_FLYING))
|
||||
{
|
||||
if (!has_flight(ch))
|
||||
{
|
||||
send_to_char(ch, "You need to be flying to go there!\r\n");
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
|
||||
/* If this room or the one we're going to needs scuba, check for it. */
|
||||
if ((SECT(IN_ROOM(ch)) == SECT_UNDERWATER) || (SECT(EXIT(ch, dir)->to_room) == SECT_UNDERWATER)) {
|
||||
/* Underwater Room: Does lack of underwater breathing prevent movement? */
|
||||
if ((SECT(was_in) == SECT_UNDERWATER) || (SECT(going_to) == SECT_UNDERWATER))
|
||||
{
|
||||
if (!has_scuba(ch)) {
|
||||
send_to_char(ch, "You need to be able to breathe water to go there!\r\n");
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
|
||||
/* move points needed is avg. move loss for src and destination sect type */
|
||||
need_movement = (movement_loss[SECT(IN_ROOM(ch))] +
|
||||
movement_loss[SECT(EXIT(ch, dir)->to_room)]) / 2;
|
||||
/* Houses: Can the player walk into the house? */
|
||||
if (ROOM_FLAGGED(was_in, ROOM_ATRIUM))
|
||||
{
|
||||
if (!House_can_enter(ch, GET_ROOM_VNUM(going_to)))
|
||||
{
|
||||
send_to_char(ch, "That's private property -- no trespassing!\r\n");
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
|
||||
if (GET_MOVE(ch) < need_movement && !IS_NPC(ch)) {
|
||||
/* Room Size Capacity: Is the room full of people already? */
|
||||
if (ROOM_FLAGGED(going_to, ROOM_TUNNEL) &&
|
||||
num_pc_in_room(&(world[going_to])) >= CONFIG_TUNNEL_SIZE)
|
||||
{
|
||||
if (CONFIG_TUNNEL_SIZE > 1)
|
||||
send_to_char(ch, "There isn't enough room for you to go there!\r\n");
|
||||
else
|
||||
send_to_char(ch, "There isn't enough room there for more than one person!\r\n");
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* Room Level Requirements: Is ch privileged enough to enter the room? */
|
||||
if (ROOM_FLAGGED(going_to, ROOM_GODROOM) && GET_LEVEL(ch) < LVL_GOD)
|
||||
{
|
||||
send_to_char(ch, "You aren't godly enough to use that room!\r\n");
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* All checks passed, nothing will prevent movement now other than lack of
|
||||
* move points. */
|
||||
/* move points needed is avg. move loss for src and destination sect type */
|
||||
need_movement = (movement_loss[SECT(was_in)] +
|
||||
movement_loss[SECT(going_to)]) / 2;
|
||||
|
||||
/* Move Point Requirement Check */
|
||||
if (GET_MOVE(ch) < need_movement && !IS_NPC(ch))
|
||||
{
|
||||
if (need_specials_check && ch->master)
|
||||
send_to_char(ch, "You are too exhausted to follow.\r\n");
|
||||
else
|
||||
|
|
@ -182,69 +247,78 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
|
|||
|
||||
return (0);
|
||||
}
|
||||
if (ROOM_FLAGGED(IN_ROOM(ch), ROOM_ATRIUM)) {
|
||||
if (!House_can_enter(ch, GET_ROOM_VNUM(EXIT(ch, dir)->to_room))) {
|
||||
send_to_char(ch, "That's private property -- no trespassing!\r\n");
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
if (ROOM_FLAGGED(EXIT(ch, dir)->to_room, ROOM_TUNNEL) &&
|
||||
num_pc_in_room(&(world[EXIT(ch, dir)->to_room])) >= CONFIG_TUNNEL_SIZE) {
|
||||
if (CONFIG_TUNNEL_SIZE > 1)
|
||||
send_to_char(ch, "There isn't enough room for you to go there!\r\n");
|
||||
else
|
||||
send_to_char(ch, "There isn't enough room there for more than one person!\r\n");
|
||||
return (0);
|
||||
}
|
||||
/* Mortals and low level gods cannot enter greater god rooms. */
|
||||
if (ROOM_FLAGGED(EXIT(ch, dir)->to_room, ROOM_GODROOM) &&
|
||||
GET_LEVEL(ch) < LVL_GOD) {
|
||||
send_to_char(ch, "You aren't godly enough to use that room!\r\n");
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* Now we know we're allowed to go into the room. */
|
||||
/*---------------------------------------------------------------------*/
|
||||
/* End checks that can prevent a character from leaving the was_in room. */
|
||||
|
||||
|
||||
/* Begin: the leave operation. */
|
||||
/*---------------------------------------------------------------------*/
|
||||
/* If applicable, subtract movement cost. */
|
||||
if (GET_LEVEL(ch) < LVL_IMMORT && !IS_NPC(ch))
|
||||
GET_MOVE(ch) -= need_movement;
|
||||
|
||||
if (!AFF_FLAGGED(ch, AFF_SNEAK)) {
|
||||
char buf2[MAX_STRING_LENGTH];
|
||||
|
||||
snprintf(buf2, sizeof(buf2), "$n leaves %s.", dirs[dir]);
|
||||
act(buf2, TRUE, ch, 0, 0, TO_ROOM);
|
||||
/* Generate the leave message and display to others in the was_in room. */
|
||||
if (!AFF_FLAGGED(ch, AFF_SNEAK))
|
||||
{
|
||||
snprintf(leave_message, sizeof(leave_message), "$n leaves %s.", dirs[dir]);
|
||||
act(leave_message, TRUE, ch, 0, 0, TO_ROOM);
|
||||
}
|
||||
was_in = IN_ROOM(ch);
|
||||
|
||||
char_from_room(ch);
|
||||
char_to_room(ch, world[was_in].dir_option[dir]->to_room);
|
||||
char_to_room(ch, going_to);
|
||||
/*---------------------------------------------------------------------*/
|
||||
/* End: the leave operation. The character is now in the new room. */
|
||||
|
||||
/* move them first, then move them back if they aren't allowed to go. Also,
|
||||
* see if an entry trigger disallows the move */
|
||||
if (!entry_mtrigger(ch) || !enter_wtrigger(&world[IN_ROOM(ch)], ch, dir)) {
|
||||
|
||||
/* Begin: Post-move operations. */
|
||||
/*---------------------------------------------------------------------*/
|
||||
/* Post Move Trigger Checks: Check the new room for triggers.
|
||||
* Assumptions: The character has already truly left the was_in room. If
|
||||
* the entry trigger "prevents" movement into the room, it is thr triggers
|
||||
* job to provide a message to the original was_in room. */
|
||||
if (!entry_mtrigger(ch) || !enter_wtrigger(&world[going_to], ch, dir)) {
|
||||
char_from_room(ch);
|
||||
char_to_room(ch, was_in);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Display arrival information to anyone in the destination room... */
|
||||
if (!AFF_FLAGGED(ch, AFF_SNEAK))
|
||||
act("$n has arrived.", TRUE, ch, 0, 0, TO_ROOM);
|
||||
|
||||
/* ... and the room description to the character. */
|
||||
if (ch->desc != NULL)
|
||||
look_at_room(ch, 0);
|
||||
|
||||
if (ROOM_FLAGGED(IN_ROOM(ch), ROOM_DEATH) && GET_LEVEL(ch) < LVL_IMMORT) {
|
||||
mudlog(BRF, LVL_IMMORT, TRUE, "%s hit death trap #%d (%s)", GET_NAME(ch), GET_ROOM_VNUM(IN_ROOM(ch)), world[IN_ROOM(ch)].name);
|
||||
/* ... and Kill the player if the room is a death trap. */
|
||||
if (ROOM_FLAGGED(going_to, ROOM_DEATH) && GET_LEVEL(ch) < LVL_IMMORT)
|
||||
{
|
||||
mudlog(BRF, LVL_IMMORT, TRUE, "%s hit death trap #%d (%s)", GET_NAME(ch), GET_ROOM_VNUM(going_to), world[going_to].name);
|
||||
death_cry(ch);
|
||||
extract_char(ch);
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* At this point, the character is safe and in the room. */
|
||||
/* Fire memory and greet triggers, check and see if the greet trigger
|
||||
* prevents movement, and if so, move the player back to the previous room. */
|
||||
entry_memory_mtrigger(ch);
|
||||
if (!greet_mtrigger(ch, dir)) {
|
||||
if (!greet_mtrigger(ch, dir))
|
||||
{
|
||||
char_from_room(ch);
|
||||
char_to_room(ch, was_in);
|
||||
look_at_room(ch, 0);
|
||||
} else greet_memory_mtrigger(ch);
|
||||
|
||||
/* Failed move, return a failure */
|
||||
return (0);
|
||||
}
|
||||
else
|
||||
greet_memory_mtrigger(ch);
|
||||
/*---------------------------------------------------------------------*/
|
||||
/* End: Post-move operations. */
|
||||
|
||||
/* Only here is the move successful *and* complete. Return success for
|
||||
* calling functions to handle post move operations. */
|
||||
return (1);
|
||||
}
|
||||
|
||||
|
|
@ -285,13 +359,11 @@ int perform_move(struct char_data *ch, int dir, int need_specials_check)
|
|||
|
||||
ACMD(do_move)
|
||||
{
|
||||
/* This is basically a mapping of cmd numbers to perform_move indices. It
|
||||
* cannot be done in perform_move because perform_move is called by other
|
||||
* functions which do not require the remapping. */
|
||||
perform_move(ch, subcmd - 1, 0);
|
||||
/* These subcmd defines are mapped precisely to the direction defines. */
|
||||
perform_move(ch, subcmd, 0);
|
||||
}
|
||||
|
||||
int find_door(struct char_data *ch, const char *type, char *dir, const char *cmdname)
|
||||
static int find_door(struct char_data *ch, const char *type, char *dir, const char *cmdname)
|
||||
{
|
||||
int door;
|
||||
|
||||
|
|
@ -350,6 +422,7 @@ int has_key(struct char_data *ch, obj_vnum key)
|
|||
#define NEED_UNLOCKED (1 << 2)
|
||||
#define NEED_LOCKED (1 << 3)
|
||||
|
||||
/* cmd_door is required external from act.movement.c */
|
||||
const char *cmd_door[] =
|
||||
{
|
||||
"open",
|
||||
|
|
@ -359,7 +432,7 @@ const char *cmd_door[] =
|
|||
"pick"
|
||||
};
|
||||
|
||||
const int flags_door[] =
|
||||
static const int flags_door[] =
|
||||
{
|
||||
NEED_CLOSED | NEED_UNLOCKED,
|
||||
NEED_OPEN,
|
||||
|
|
@ -385,7 +458,7 @@ const int flags_door[] =
|
|||
(TOGGLE_BIT(GET_OBJ_VAL(obj, 1), CONT_LOCKED)) :\
|
||||
(TOGGLE_BIT(EXITN(room, door)->exit_info, EX_LOCKED)))
|
||||
|
||||
void do_doorcmd(struct char_data *ch, struct obj_data *obj, int door, int scmd)
|
||||
static void do_doorcmd(struct char_data *ch, struct obj_data *obj, int door, int scmd)
|
||||
{
|
||||
char buf[MAX_STRING_LENGTH];
|
||||
size_t len;
|
||||
|
|
@ -456,7 +529,7 @@ void do_doorcmd(struct char_data *ch, struct obj_data *obj, int door, int scmd)
|
|||
scmd == SCMD_CLOSE ? "d" : "ed");
|
||||
}
|
||||
|
||||
int ok_pick(struct char_data *ch, obj_vnum keynum, int pickproof, int scmd)
|
||||
static int ok_pick(struct char_data *ch, obj_vnum keynum, int pickproof, int scmd)
|
||||
{
|
||||
int percent, skill_lvl;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue