mirror of
https://github.com/tbamud/tbamud.git
synced 2026-01-30 04:45:17 +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,40 +20,37 @@
|
|||
#include "constants.h"
|
||||
#include "dg_scripts.h"
|
||||
#include "oasis.h"
|
||||
#include "act.h"
|
||||
#include "quest.h"
|
||||
|
||||
/* local functions */
|
||||
int can_take_obj(struct char_data *ch, struct obj_data *obj);
|
||||
void get_check_money(struct char_data *ch, struct obj_data *obj);
|
||||
int perform_get_from_room(struct char_data *ch, struct obj_data *obj);
|
||||
void get_from_room(struct char_data *ch, char *arg, int amount);
|
||||
void perform_give_gold(struct char_data *ch, struct char_data *vict, int amount);
|
||||
void perform_give(struct char_data *ch, struct char_data *vict, struct obj_data *obj);
|
||||
int perform_drop(struct char_data *ch, struct obj_data *obj, byte mode, const char *sname, room_rnum RDR);
|
||||
void perform_drop_gold(struct char_data *ch, int amount, byte mode, room_rnum RDR);
|
||||
struct char_data *give_find_vict(struct char_data *ch, char *arg);
|
||||
void weight_change_object(struct obj_data *obj, int weight);
|
||||
void perform_put(struct char_data *ch, struct obj_data *obj, struct obj_data *cont);
|
||||
void name_from_drinkcon(struct obj_data *obj);
|
||||
void get_from_container(struct char_data *ch, struct obj_data *cont, char *arg, int mode, int amount);
|
||||
void name_to_drinkcon(struct obj_data *obj, int type);
|
||||
void wear_message(struct char_data *ch, struct obj_data *obj, int where);
|
||||
void perform_wear(struct char_data *ch, struct obj_data *obj, int where);
|
||||
int find_eq_pos(struct char_data *ch, struct obj_data *obj, char *arg);
|
||||
void perform_get_from_container(struct char_data *ch, struct obj_data *obj, struct obj_data *cont, int mode);
|
||||
void perform_remove(struct char_data *ch, int pos);
|
||||
ACMD(do_remove);
|
||||
ACMD(do_put);
|
||||
ACMD(do_get);
|
||||
ACMD(do_drop);
|
||||
ACMD(do_give);
|
||||
ACMD(do_drink);
|
||||
ACMD(do_eat);
|
||||
ACMD(do_pour);
|
||||
ACMD(do_wear);
|
||||
ACMD(do_wield);
|
||||
ACMD(do_grab);
|
||||
|
||||
void perform_put(struct char_data *ch, struct obj_data *obj, struct obj_data *cont)
|
||||
/* local function prototypes */
|
||||
/* do_get utility functions */
|
||||
static int can_take_obj(struct char_data *ch, struct obj_data *obj);
|
||||
static void get_check_money(struct char_data *ch, struct obj_data *obj);
|
||||
static void get_from_container(struct char_data *ch, struct obj_data *cont, char *arg, int mode, int amount);
|
||||
static void get_from_room(struct char_data *ch, char *arg, int amount);
|
||||
static void perform_get_from_container(struct char_data *ch, struct obj_data *obj, struct obj_data *cont, int mode);
|
||||
static int perform_get_from_room(struct char_data *ch, struct obj_data *obj);
|
||||
/* do_give utility functions */
|
||||
static struct char_data *give_find_vict(struct char_data *ch, char *arg);
|
||||
static void perform_give(struct char_data *ch, struct char_data *vict, struct obj_data *obj);
|
||||
static void perform_give_gold(struct char_data *ch, struct char_data *vict, int amount);
|
||||
/* do_drop utility functions */
|
||||
static int perform_drop(struct char_data *ch, struct obj_data *obj, byte mode, const char *sname, room_rnum RDR);
|
||||
static void perform_drop_gold(struct char_data *ch, int amount, byte mode, room_rnum RDR);
|
||||
/* do_put utility functions */
|
||||
static void perform_put(struct char_data *ch, struct obj_data *obj, struct obj_data *cont);
|
||||
/* do_remove utility functions */
|
||||
static void perform_remove(struct char_data *ch, int pos);
|
||||
/* do_wear utility functions */
|
||||
static void perform_wear(struct char_data *ch, struct obj_data *obj, int where);
|
||||
static void wear_message(struct char_data *ch, struct obj_data *obj, int where);
|
||||
|
||||
|
||||
|
||||
|
||||
static void perform_put(struct char_data *ch, struct obj_data *obj, struct obj_data *cont)
|
||||
{
|
||||
|
||||
if (!drop_otrigger(obj, ch))
|
||||
|
|
@ -162,7 +159,7 @@ ACMD(do_put)
|
|||
}
|
||||
}
|
||||
|
||||
int can_take_obj(struct char_data *ch, struct obj_data *obj)
|
||||
static int can_take_obj(struct char_data *ch, struct obj_data *obj)
|
||||
{
|
||||
if (IS_CARRYING_N(ch) >= CAN_CARRY_N(ch)) {
|
||||
act("$p: you can't carry that many items.", FALSE, ch, obj, 0, TO_CHAR);
|
||||
|
|
@ -177,7 +174,7 @@ int can_take_obj(struct char_data *ch, struct obj_data *obj)
|
|||
return (1);
|
||||
}
|
||||
|
||||
void get_check_money(struct char_data *ch, struct obj_data *obj)
|
||||
static void get_check_money(struct char_data *ch, struct obj_data *obj)
|
||||
{
|
||||
int value = GET_OBJ_VAL(obj, 0);
|
||||
|
||||
|
|
@ -194,7 +191,7 @@ void get_check_money(struct char_data *ch, struct obj_data *obj)
|
|||
send_to_char(ch, "There were %d coins.\r\n", value);
|
||||
}
|
||||
|
||||
void perform_get_from_container(struct char_data *ch, struct obj_data *obj,
|
||||
static void perform_get_from_container(struct char_data *ch, struct obj_data *obj,
|
||||
struct obj_data *cont, int mode)
|
||||
{
|
||||
if (mode == FIND_OBJ_INV || can_take_obj(ch, obj)) {
|
||||
|
|
@ -260,7 +257,7 @@ void get_from_container(struct char_data *ch, struct obj_data *cont,
|
|||
}
|
||||
}
|
||||
|
||||
int perform_get_from_room(struct char_data *ch, struct obj_data *obj)
|
||||
static int perform_get_from_room(struct char_data *ch, struct obj_data *obj)
|
||||
{
|
||||
if (can_take_obj(ch, obj) && get_otrigger(obj, ch)) {
|
||||
obj_from_room(obj);
|
||||
|
|
@ -273,7 +270,7 @@ int perform_get_from_room(struct char_data *ch, struct obj_data *obj)
|
|||
return (0);
|
||||
}
|
||||
|
||||
void get_from_room(struct char_data *ch, char *arg, int howmany)
|
||||
static void get_from_room(struct char_data *ch, char *arg, int howmany)
|
||||
{
|
||||
struct obj_data *obj, *next_obj;
|
||||
int dotmode, found = 0;
|
||||
|
|
@ -384,7 +381,7 @@ ACMD(do_get)
|
|||
}
|
||||
}
|
||||
|
||||
void perform_drop_gold(struct char_data *ch, int amount, byte mode, room_rnum RDR)
|
||||
static void perform_drop_gold(struct char_data *ch, int amount, byte mode, room_rnum RDR)
|
||||
{
|
||||
struct obj_data *obj;
|
||||
|
||||
|
|
@ -430,7 +427,7 @@ void perform_drop_gold(struct char_data *ch, int amount, byte mode, room_rnum RD
|
|||
|
||||
#define VANISH(mode) ((mode == SCMD_DONATE || mode == SCMD_JUNK) ? \
|
||||
" It vanishes in a puff of smoke!" : "")
|
||||
int perform_drop(struct char_data *ch, struct obj_data *obj,
|
||||
static int perform_drop(struct char_data *ch, struct obj_data *obj,
|
||||
byte mode, const char *sname, room_rnum RDR)
|
||||
{
|
||||
char buf[MAX_STRING_LENGTH];
|
||||
|
|
@ -594,7 +591,7 @@ ACMD(do_drop)
|
|||
}
|
||||
}
|
||||
|
||||
void perform_give(struct char_data *ch, struct char_data *vict,
|
||||
static void perform_give(struct char_data *ch, struct char_data *vict,
|
||||
struct obj_data *obj)
|
||||
{
|
||||
if (!give_otrigger(obj, ch, vict))
|
||||
|
|
@ -619,10 +616,12 @@ void perform_give(struct char_data *ch, struct char_data *vict,
|
|||
act("You give $p to $N.", FALSE, ch, obj, vict, TO_CHAR);
|
||||
act("$n gives you $p.", FALSE, ch, obj, vict, TO_VICT);
|
||||
act("$n gives $p to $N.", TRUE, ch, obj, vict, TO_NOTVICT);
|
||||
|
||||
autoquest_trigger_check( ch, vict, obj, AQ_OBJ_RETURN);
|
||||
}
|
||||
|
||||
/* utility function for give */
|
||||
struct char_data *give_find_vict(struct char_data *ch, char *arg)
|
||||
static struct char_data *give_find_vict(struct char_data *ch, char *arg)
|
||||
{
|
||||
struct char_data *vict;
|
||||
|
||||
|
|
@ -639,7 +638,7 @@ struct char_data *give_find_vict(struct char_data *ch, char *arg)
|
|||
return (NULL);
|
||||
}
|
||||
|
||||
void perform_give_gold(struct char_data *ch, struct char_data *vict,
|
||||
static void perform_give_gold(struct char_data *ch, struct char_data *vict,
|
||||
int amount)
|
||||
{
|
||||
char buf[MAX_STRING_LENGTH];
|
||||
|
|
@ -871,7 +870,7 @@ ACMD(do_drink)
|
|||
send_to_char(ch, "Your stomach can't contain anymore!\r\n");
|
||||
return;
|
||||
}
|
||||
if ((GET_OBJ_VAL(temp, 1) == 0) && (!GET_OBJ_VAL(temp, 0) == 1)) {
|
||||
if ((GET_OBJ_VAL(temp, 1) == 0) || (!GET_OBJ_VAL(temp, 0) == 1)) {
|
||||
send_to_char(ch, "It is empty.\r\n");
|
||||
return;
|
||||
}
|
||||
|
|
@ -1156,7 +1155,7 @@ ACMD(do_pour)
|
|||
weight_change_object(to_obj, amount); /* Add weight */
|
||||
}
|
||||
|
||||
void wear_message(struct char_data *ch, struct obj_data *obj, int where)
|
||||
static void wear_message(struct char_data *ch, struct obj_data *obj, int where)
|
||||
{
|
||||
const char *wear_messages[][2] = {
|
||||
{"$n lights $p and holds it.",
|
||||
|
|
@ -1218,7 +1217,7 @@ void wear_message(struct char_data *ch, struct obj_data *obj, int where)
|
|||
act(wear_messages[where][1], FALSE, ch, obj, 0, TO_CHAR);
|
||||
}
|
||||
|
||||
void perform_wear(struct char_data *ch, struct obj_data *obj, int where)
|
||||
static void perform_wear(struct char_data *ch, struct obj_data *obj, int where)
|
||||
{
|
||||
/*
|
||||
* ITEM_WEAR_TAKE is used for objects that do not require special bits
|
||||
|
|
@ -1439,7 +1438,7 @@ ACMD(do_grab)
|
|||
}
|
||||
}
|
||||
|
||||
void perform_remove(struct char_data *ch, int pos)
|
||||
static void perform_remove(struct char_data *ch, int pos)
|
||||
{
|
||||
struct obj_data *obj;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue