mirror of
https://github.com/tbamud/tbamud.git
synced 2025-12-22 18:20:13 +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
118
src/objsave.c
118
src/objsave.c
|
|
@ -11,12 +11,17 @@
|
|||
#include "conf.h"
|
||||
#include "sysdep.h"
|
||||
#include "structs.h"
|
||||
#include "utils.h"
|
||||
#include "comm.h"
|
||||
#include "handler.h"
|
||||
#include "db.h"
|
||||
#include "interpreter.h"
|
||||
#include "utils.h"
|
||||
#include "spells.h"
|
||||
#include "act.h"
|
||||
#include "class.h"
|
||||
#include "config.h"
|
||||
#include "modify.h"
|
||||
#include "genolc.h" /* for strip_cr and sprintascii */
|
||||
|
||||
/* these factors should be unique integers */
|
||||
#define RENT_FACTOR 1
|
||||
|
|
@ -25,48 +30,25 @@
|
|||
#define LOC_INVENTORY 0
|
||||
#define MAX_BAG_ROWS 5
|
||||
|
||||
/* external variables */
|
||||
extern struct player_index_element *player_table;
|
||||
extern int top_of_p_table;
|
||||
extern int rent_file_timeout, crash_file_timeout;
|
||||
extern int free_rent;
|
||||
extern int min_rent_cost;
|
||||
extern int max_obj_save; /* change in config.c */
|
||||
|
||||
/* Extern functions */
|
||||
ACMD(do_action);
|
||||
SPECIAL(receptionist);
|
||||
SPECIAL(cryogenicist);
|
||||
int invalid_class(struct char_data *ch, struct obj_data *obj);
|
||||
bitvector_t asciiflag_conv(char *flag);
|
||||
int sprintascii(char *out, bitvector_t bits);
|
||||
|
||||
/* local functions */
|
||||
void Crash_extract_norent_eq(struct char_data *ch);
|
||||
void auto_equip(struct char_data *ch, struct obj_data *obj, int location);
|
||||
int Crash_offer_rent(struct char_data *ch, struct char_data *receptionist, int display, int factor);
|
||||
int Crash_report_unrentables(struct char_data *ch, struct char_data *recep, struct obj_data *obj);
|
||||
void Crash_report_rent(struct char_data *ch, struct char_data *recep, struct obj_data *obj, long *cost, long *nitems, int display, int factor);
|
||||
struct obj_data *Obj_from_store(struct obj_file_elem object, int *location);
|
||||
void update_obj_file(void);
|
||||
int gen_receptionist(struct char_data *ch, struct char_data *recep, int cmd, char *arg, int mode);
|
||||
int Crash_save(struct obj_data *obj, FILE *fp, int location);
|
||||
void Crash_rent_deadline(struct char_data *ch, struct char_data *recep, long cost);
|
||||
void Crash_restore_weight(struct obj_data *obj);
|
||||
void Crash_extract_objs(struct obj_data *obj);
|
||||
int Crash_is_unrentable(struct obj_data *obj);
|
||||
void Crash_extract_norents(struct obj_data *obj);
|
||||
void Crash_extract_expensive(struct obj_data *obj);
|
||||
void Crash_calculate_rent(struct obj_data *obj, int *cost);
|
||||
void Crash_rentsave(struct char_data *ch, int cost);
|
||||
void Crash_cryosave(struct char_data *ch, int cost);
|
||||
int Crash_load_objs(struct char_data *ch);
|
||||
void tag_argument(char *argument, char *tag);
|
||||
int handle_obj(struct obj_data *obj, struct char_data *ch, int locate, struct obj_data **cont_rows);
|
||||
obj_save_data *objsave_parse_objects(FILE *fl);
|
||||
int objsave_write_rentcode(FILE *fl, int rentcode, int cost_per_day, struct char_data *ch);
|
||||
int objsave_save_obj_record(struct obj_data *obj, FILE *fl, int location);
|
||||
void strip_cr(char *buffer);
|
||||
static int Crash_save(struct obj_data *obj, FILE *fp, int location);
|
||||
static void Crash_extract_norent_eq(struct char_data *ch);
|
||||
static void auto_equip(struct char_data *ch, struct obj_data *obj, int location);
|
||||
static int Crash_offer_rent(struct char_data *ch, struct char_data *receptionist, int display, int factor);
|
||||
static int Crash_report_unrentables(struct char_data *ch, struct char_data *recep, struct obj_data *obj);
|
||||
static void Crash_report_rent(struct char_data *ch, struct char_data *recep, struct obj_data *obj, long *cost, long *nitems, int display, int factor);
|
||||
static int gen_receptionist(struct char_data *ch, struct char_data *recep, int cmd, char *arg, int mode);
|
||||
static void Crash_rent_deadline(struct char_data *ch, struct char_data *recep, long cost);
|
||||
static void Crash_restore_weight(struct obj_data *obj);
|
||||
static void Crash_extract_objs(struct obj_data *obj);
|
||||
static int Crash_is_unrentable(struct obj_data *obj);
|
||||
static void Crash_extract_norents(struct obj_data *obj);
|
||||
static void Crash_extract_expensive(struct obj_data *obj);
|
||||
static void Crash_calculate_rent(struct obj_data *obj, int *cost);
|
||||
static void Crash_cryosave(struct char_data *ch, int cost);
|
||||
static int Crash_load_objs(struct char_data *ch);
|
||||
static int handle_obj(struct obj_data *obj, struct char_data *ch, int locate, struct obj_data **cont_rows);
|
||||
static int objsave_write_rentcode(FILE *fl, int rentcode, int cost_per_day, struct char_data *ch);
|
||||
|
||||
/* Writes one object record to FILE. Old name: Obj_to_store() */
|
||||
int objsave_save_obj_record(struct obj_data *obj, FILE *fp, int locate)
|
||||
|
|
@ -182,7 +164,7 @@ int objsave_save_obj_record(struct obj_data *obj, FILE *fp, int locate)
|
|||
#undef TEST_OBJN
|
||||
|
||||
/* AutoEQ by Burkhard Knopf. */
|
||||
void auto_equip(struct char_data *ch, struct obj_data *obj, int location)
|
||||
static void auto_equip(struct char_data *ch, struct obj_data *obj, int location)
|
||||
{
|
||||
int j;
|
||||
|
||||
|
|
@ -356,7 +338,7 @@ int Crash_clean_file(char *name)
|
|||
if ((rentcode == RENT_CRASH) ||
|
||||
(rentcode == RENT_FORCED) ||
|
||||
(rentcode == RENT_TIMEDOUT) ) {
|
||||
if (timed < time(0) - (crash_file_timeout * SECS_PER_REAL_DAY)) {
|
||||
if (timed < time(0) - (CONFIG_CRASH_TIMEOUT * SECS_PER_REAL_DAY)) {
|
||||
Crash_delete_file(name);
|
||||
switch (rentcode) {
|
||||
case RENT_CRASH:
|
||||
|
|
@ -377,7 +359,7 @@ int Crash_clean_file(char *name)
|
|||
}
|
||||
/* Must retrieve rented items w/in 30 days */
|
||||
} else if (rentcode == RENT_RENTED)
|
||||
if (timed < time(0) - (rent_file_timeout * SECS_PER_REAL_DAY)) {
|
||||
if (timed < time(0) - (CONFIG_RENT_TIMEOUT * SECS_PER_REAL_DAY)) {
|
||||
Crash_delete_file(name);
|
||||
log(" Deleting %s's rent file.", name);
|
||||
return TRUE;
|
||||
|
|
@ -470,7 +452,7 @@ int Crash_load(struct char_data *ch)
|
|||
return (Crash_load_objs(ch));
|
||||
}
|
||||
|
||||
int Crash_save(struct obj_data *obj, FILE *fp, int location)
|
||||
static int Crash_save(struct obj_data *obj, FILE *fp, int location)
|
||||
{
|
||||
struct obj_data *tmp;
|
||||
int result;
|
||||
|
|
@ -490,7 +472,7 @@ int Crash_save(struct obj_data *obj, FILE *fp, int location)
|
|||
return (TRUE);
|
||||
}
|
||||
|
||||
void Crash_restore_weight(struct obj_data *obj)
|
||||
static void Crash_restore_weight(struct obj_data *obj)
|
||||
{
|
||||
if (obj) {
|
||||
Crash_restore_weight(obj->contains);
|
||||
|
|
@ -502,7 +484,7 @@ void Crash_restore_weight(struct obj_data *obj)
|
|||
|
||||
/* Get !RENT items from equipment to inventory and extract !RENT out of worn
|
||||
* containers. */
|
||||
void Crash_extract_norent_eq(struct char_data *ch)
|
||||
static void Crash_extract_norent_eq(struct char_data *ch)
|
||||
{
|
||||
int j;
|
||||
|
||||
|
|
@ -517,7 +499,7 @@ void Crash_extract_norent_eq(struct char_data *ch)
|
|||
}
|
||||
}
|
||||
|
||||
void Crash_extract_objs(struct obj_data *obj)
|
||||
static void Crash_extract_objs(struct obj_data *obj)
|
||||
{
|
||||
if (obj) {
|
||||
Crash_extract_objs(obj->contains);
|
||||
|
|
@ -526,7 +508,7 @@ void Crash_extract_objs(struct obj_data *obj)
|
|||
}
|
||||
}
|
||||
|
||||
int Crash_is_unrentable(struct obj_data *obj)
|
||||
static int Crash_is_unrentable(struct obj_data *obj)
|
||||
{
|
||||
if (!obj)
|
||||
return FALSE;
|
||||
|
|
@ -542,7 +524,7 @@ int Crash_is_unrentable(struct obj_data *obj)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
void Crash_extract_norents(struct obj_data *obj)
|
||||
static void Crash_extract_norents(struct obj_data *obj)
|
||||
{
|
||||
if (obj) {
|
||||
Crash_extract_norents(obj->contains);
|
||||
|
|
@ -552,7 +534,7 @@ void Crash_extract_norents(struct obj_data *obj)
|
|||
}
|
||||
}
|
||||
|
||||
void Crash_extract_expensive(struct obj_data *obj)
|
||||
static void Crash_extract_expensive(struct obj_data *obj)
|
||||
{
|
||||
struct obj_data *tobj, *max;
|
||||
|
||||
|
|
@ -563,7 +545,7 @@ void Crash_extract_expensive(struct obj_data *obj)
|
|||
extract_obj(max);
|
||||
}
|
||||
|
||||
void Crash_calculate_rent(struct obj_data *obj, int *cost)
|
||||
static void Crash_calculate_rent(struct obj_data *obj, int *cost)
|
||||
{
|
||||
if (obj) {
|
||||
*cost += MAX(0, GET_OBJ_RENT(obj));
|
||||
|
|
@ -725,7 +707,7 @@ void Crash_rentsave(struct char_data *ch, int cost)
|
|||
Crash_extract_objs(ch->carrying);
|
||||
}
|
||||
|
||||
int objsave_write_rentcode(FILE *fl, int rentcode, int cost_per_day, struct char_data *ch)
|
||||
static int objsave_write_rentcode(FILE *fl, int rentcode, int cost_per_day, struct char_data *ch)
|
||||
{
|
||||
if (fprintf(fl, "%d %ld %d %d %d %d\r\n",
|
||||
rentcode,
|
||||
|
|
@ -743,7 +725,7 @@ int objsave_write_rentcode(FILE *fl, int rentcode, int cost_per_day, struct char
|
|||
|
||||
}
|
||||
|
||||
void Crash_cryosave(struct char_data *ch, int cost)
|
||||
static void Crash_cryosave(struct char_data *ch, int cost)
|
||||
{
|
||||
char buf[MAX_INPUT_LENGTH];
|
||||
int j;
|
||||
|
|
@ -787,7 +769,7 @@ void Crash_cryosave(struct char_data *ch, int cost)
|
|||
}
|
||||
|
||||
/* Routines used for the receptionist. */
|
||||
void Crash_rent_deadline(struct char_data *ch, struct char_data *recep,
|
||||
static void Crash_rent_deadline(struct char_data *ch, struct char_data *recep,
|
||||
long cost)
|
||||
{
|
||||
long rent_deadline;
|
||||
|
|
@ -802,7 +784,7 @@ void Crash_rent_deadline(struct char_data *ch, struct char_data *recep,
|
|||
act(buf, FALSE, recep, 0, ch, TO_VICT);
|
||||
}
|
||||
|
||||
int Crash_report_unrentables(struct char_data *ch, struct char_data *recep,
|
||||
static int Crash_report_unrentables(struct char_data *ch, struct char_data *recep,
|
||||
struct obj_data *obj)
|
||||
{
|
||||
char buf[128];
|
||||
|
|
@ -820,7 +802,7 @@ int Crash_report_unrentables(struct char_data *ch, struct char_data *recep,
|
|||
return (has_norents);
|
||||
}
|
||||
|
||||
void Crash_report_rent(struct char_data *ch, struct char_data *recep, struct
|
||||
static void Crash_report_rent(struct char_data *ch, struct char_data *recep, struct
|
||||
obj_data *obj, long *cost, long *nitems, int display, int factor)
|
||||
{
|
||||
static char buf[256];
|
||||
|
|
@ -840,7 +822,7 @@ void Crash_report_rent(struct char_data *ch, struct char_data *recep, struct
|
|||
}
|
||||
}
|
||||
|
||||
int Crash_offer_rent(struct char_data *ch, struct char_data *receptionist,
|
||||
static int Crash_offer_rent(struct char_data *ch, struct char_data *receptionist,
|
||||
int display, int factor)
|
||||
{
|
||||
char buf[MAX_INPUT_LENGTH];
|
||||
|
|
@ -854,7 +836,7 @@ int Crash_offer_rent(struct char_data *ch, struct char_data *receptionist,
|
|||
if (norent)
|
||||
return FALSE;
|
||||
|
||||
totalcost = min_rent_cost * factor;
|
||||
totalcost = CONFIG_MIN_RENT_COST * factor;
|
||||
|
||||
Crash_report_rent(ch, receptionist, ch->carrying, &totalcost, &numitems, display, factor);
|
||||
|
||||
|
|
@ -866,15 +848,15 @@ int Crash_offer_rent(struct char_data *ch, struct char_data *receptionist,
|
|||
FALSE, receptionist, 0, ch, TO_VICT);
|
||||
return FALSE;
|
||||
}
|
||||
if (numitems > max_obj_save) {
|
||||
if (numitems > CONFIG_MAX_OBJ_SAVE) {
|
||||
sprintf(buf, "$n tells you, 'Sorry, but I cannot store more than %d items.'",
|
||||
max_obj_save);
|
||||
CONFIG_MAX_OBJ_SAVE);
|
||||
act(buf, FALSE, receptionist, 0, ch, TO_VICT);
|
||||
return FALSE;
|
||||
}
|
||||
if (display) {
|
||||
sprintf(buf, "$n tells you, 'Plus, my %d coin fee..'",
|
||||
min_rent_cost * factor);
|
||||
CONFIG_MIN_RENT_COST * factor);
|
||||
act(buf, FALSE, receptionist, 0, ch, TO_VICT);
|
||||
sprintf(buf, "$n tells you, 'For a total of %ld coins%s.'",
|
||||
totalcost, (factor == RENT_FACTOR ? " per day" : ""));
|
||||
|
|
@ -889,7 +871,7 @@ int Crash_offer_rent(struct char_data *ch, struct char_data *receptionist,
|
|||
return (totalcost);
|
||||
}
|
||||
|
||||
int gen_receptionist(struct char_data *ch, struct char_data *recep, int cmd,
|
||||
static int gen_receptionist(struct char_data *ch, struct char_data *recep, int cmd,
|
||||
char *arg, int mode)
|
||||
{
|
||||
int cost;
|
||||
|
|
@ -917,7 +899,7 @@ int gen_receptionist(struct char_data *ch, struct char_data *recep, int cmd,
|
|||
return (TRUE);
|
||||
}
|
||||
|
||||
if (free_rent) {
|
||||
if (CONFIG_FREE_RENT) {
|
||||
act("$n tells you, 'Rent is free here. Just quit, and your objects will be saved!'",
|
||||
FALSE, recep, 0, ch, TO_VICT);
|
||||
return TRUE;
|
||||
|
|
@ -1178,7 +1160,7 @@ obj_save_data *objsave_parse_objects(FILE *fl)
|
|||
return head;
|
||||
}
|
||||
|
||||
int Crash_load_objs(struct char_data *ch) {
|
||||
static int Crash_load_objs(struct char_data *ch) {
|
||||
FILE *fl;
|
||||
char fname[MAX_STRING_LENGTH];
|
||||
char line[READ_SIZE];
|
||||
|
|
@ -1265,7 +1247,7 @@ int Crash_load_objs(struct char_data *ch) {
|
|||
|
||||
/* Little hoarding check. -gg 3/1/98 */
|
||||
mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "%s (level %d) has %d objects (max %d).",
|
||||
GET_NAME(ch), GET_LEVEL(ch), num_objs, max_obj_save);
|
||||
GET_NAME(ch), GET_LEVEL(ch), num_objs, CONFIG_MAX_OBJ_SAVE);
|
||||
|
||||
fclose(fl);
|
||||
|
||||
|
|
@ -1275,7 +1257,7 @@ int Crash_load_objs(struct char_data *ch) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
int handle_obj(struct obj_data *temp, struct char_data *ch, int locate, struct obj_data **cont_row)
|
||||
static int handle_obj(struct obj_data *temp, struct char_data *ch, int locate, struct obj_data **cont_row)
|
||||
{
|
||||
int j;
|
||||
struct obj_data *obj1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue