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
444 lines
13 KiB
C
444 lines
13 KiB
C
/**************************************************************************
|
|
* File: genwld.c Part of tbaMUD *
|
|
* Usage: Generic OLC Library - Rooms. *
|
|
* *
|
|
* By Levork. Copyright 1996 by Harvey Gilpin, 1997-2001 by George Greer. *
|
|
**************************************************************************/
|
|
|
|
#include "conf.h"
|
|
#include "sysdep.h"
|
|
#include "structs.h"
|
|
#include "utils.h"
|
|
#include "db.h"
|
|
#include "handler.h"
|
|
#include "comm.h"
|
|
#include "genolc.h"
|
|
#include "genwld.h"
|
|
#include "genzon.h"
|
|
#include "shop.h"
|
|
#include "dg_olc.h"
|
|
|
|
|
|
/* This function will copy the strings so be sure you free your own copies of
|
|
* the description, title, and such. */
|
|
room_rnum add_room(struct room_data *room)
|
|
{
|
|
struct char_data *tch;
|
|
struct obj_data *tobj;
|
|
int j, found = FALSE;
|
|
room_rnum i;
|
|
|
|
if (room == NULL)
|
|
return NOWHERE;
|
|
|
|
if ((i = real_room(room->number)) != NOWHERE) {
|
|
if (SCRIPT(&world[i]))
|
|
extract_script(&world[i], WLD_TRIGGER);
|
|
tch = world[i].people;
|
|
tobj = world[i].contents;
|
|
copy_room(&world[i], room);
|
|
world[i].people = tch;
|
|
world[i].contents = tobj;
|
|
add_to_save_list(zone_table[room->zone].number, SL_WLD);
|
|
log("GenOLC: add_room: Updated existing room #%d.", room->number);
|
|
return i;
|
|
}
|
|
|
|
RECREATE(world, struct room_data, top_of_world + 2);
|
|
top_of_world++;
|
|
|
|
for (i = top_of_world; i > 0; i--) {
|
|
if (room->number > world[i - 1].number) {
|
|
world[i] = *room;
|
|
copy_room_strings(&world[i], room);
|
|
found = i;
|
|
break;
|
|
} else {
|
|
/* Copy the room over now. */
|
|
world[i] = world[i - 1];
|
|
update_wait_events(&world[i], &world[i-1]);
|
|
|
|
/* People in this room must have their in_rooms moved up one. */
|
|
for (tch = world[i].people; tch; tch = tch->next_in_room)
|
|
IN_ROOM(tch) += (IN_ROOM(tch) != NOWHERE);
|
|
|
|
/* Move objects too. */
|
|
for (tobj = world[i].contents; tobj; tobj = tobj->next_content)
|
|
IN_ROOM(tobj) += (IN_ROOM(tobj) != NOWHERE);
|
|
}
|
|
}
|
|
if (!found) {
|
|
world[0] = *room; /* Last place, in front. */
|
|
copy_room_strings(&world[0], room);
|
|
}
|
|
|
|
log("GenOLC: add_room: Added room %d at index #%d.", room->number, found);
|
|
/* found is equal to the array index where we added the room. */
|
|
|
|
/* Find what zone that room was in so we can update the loading table. */
|
|
for (i = room->zone; i <= top_of_zone_table; i++)
|
|
for (j = 0; ZCMD(i, j).command != 'S'; j++)
|
|
switch (ZCMD(i, j).command) {
|
|
case 'M':
|
|
case 'O':
|
|
case 'T':
|
|
case 'V':
|
|
ZCMD(i, j).arg3 += (ZCMD(i, j).arg3 != NOWHERE && ZCMD(i, j).arg3 >= found);
|
|
break;
|
|
case 'D':
|
|
case 'R':
|
|
ZCMD(i, j).arg1 += (ZCMD(i, j).arg1 != NOWHERE && ZCMD(i, j).arg1 >= found);
|
|
case 'G':
|
|
case 'P':
|
|
case 'E':
|
|
case '*':
|
|
/* Known zone entries we don't care about. */
|
|
break;
|
|
default:
|
|
mudlog(BRF, LVL_GOD, TRUE, "SYSERR: GenOLC: add_room: Unknown zone entry found!");
|
|
}
|
|
|
|
/* Update the loadroom table. Adds 1 or 0. */
|
|
r_mortal_start_room += (r_mortal_start_room >= found);
|
|
r_immort_start_room += (r_immort_start_room >= found);
|
|
r_frozen_start_room += (r_frozen_start_room >= found);
|
|
|
|
/* Update world exits. */
|
|
i = top_of_world + 1;
|
|
do {
|
|
i--;
|
|
for (j = 0; j < NUM_OF_DIRS; j++)
|
|
if (W_EXIT(i, j) && W_EXIT(i, j)->to_room != NOWHERE)
|
|
W_EXIT(i, j)->to_room += (W_EXIT(i, j)->to_room >= found);
|
|
} while (i > 0);
|
|
|
|
add_to_save_list(zone_table[room->zone].number, SL_WLD);
|
|
|
|
/* Return what array entry we placed the new room in. */
|
|
return found;
|
|
}
|
|
|
|
int delete_room(room_rnum rnum)
|
|
{
|
|
room_rnum i;
|
|
int j;
|
|
struct char_data *ppl, *next_ppl;
|
|
struct obj_data *obj, *next_obj;
|
|
struct room_data *room;
|
|
|
|
if (rnum <= 0 || rnum > top_of_world) /* Can't delete void yet. */
|
|
return FALSE;
|
|
|
|
room = &world[rnum];
|
|
|
|
add_to_save_list(zone_table[room->zone].number, SL_WLD);
|
|
|
|
/* This is something you might want to read about in the logs. */
|
|
log("GenOLC: delete_room: Deleting room #%d (%s).", room->number, room->name);
|
|
|
|
if (r_mortal_start_room == rnum) {
|
|
log("WARNING: GenOLC: delete_room: Deleting mortal start room!");
|
|
r_mortal_start_room = 0; /* The Void */
|
|
}
|
|
if (r_immort_start_room == rnum) {
|
|
log("WARNING: GenOLC: delete_room: Deleting immortal start room!");
|
|
r_immort_start_room = 0; /* The Void */
|
|
}
|
|
if (r_frozen_start_room == rnum) {
|
|
log("WARNING: GenOLC: delete_room: Deleting frozen start room!");
|
|
r_frozen_start_room = 0; /* The Void */
|
|
}
|
|
|
|
/* Dump the contents of this room into the Void. We could also just extract
|
|
* the people, mobs, and objects here. */
|
|
for (obj = world[rnum].contents; obj; obj = next_obj) {
|
|
next_obj = obj->next_content;
|
|
obj_from_room(obj);
|
|
obj_to_room(obj, 0);
|
|
}
|
|
for (ppl = world[rnum].people; ppl; ppl = next_ppl) {
|
|
next_ppl = ppl->next_in_room;
|
|
char_from_room(ppl);
|
|
char_to_room(ppl, 0);
|
|
}
|
|
|
|
free_room_strings(room);
|
|
if (SCRIPT(room))
|
|
extract_script(room, WLD_TRIGGER);
|
|
free_proto_script(room, WLD_TRIGGER);
|
|
|
|
/* Change any exit going to this room to go the void. Also fix all the exits
|
|
* pointing to rooms above this. */
|
|
i = top_of_world + 1;
|
|
do {
|
|
i--;
|
|
for (j = 0; j < NUM_OF_DIRS; j++) {
|
|
if (W_EXIT(i, j) == NULL)
|
|
continue;
|
|
else if (W_EXIT(i, j)->to_room > rnum)
|
|
W_EXIT(i, j)->to_room -= (W_EXIT(i, j)->to_room != NOWHERE); /* with unsigned NOWHERE > any rnum */
|
|
else if (W_EXIT(i, j)->to_room == rnum) {
|
|
if ((!W_EXIT(i, j)->keyword || !*W_EXIT(i, j)->keyword) &&
|
|
(!W_EXIT(i, j)->general_description || !*W_EXIT(i, j)->general_description)) {
|
|
/* no description, remove exit completely */
|
|
if (W_EXIT(i, j)->keyword)
|
|
free(W_EXIT(i, j)->keyword);
|
|
if (W_EXIT(i, j)->general_description)
|
|
free(W_EXIT(i, j)->general_description);
|
|
free(W_EXIT(i, j));
|
|
W_EXIT(i, j) = NULL;
|
|
} else {
|
|
/* description is set, just point to nowhere */
|
|
W_EXIT(i, j)->to_room = NOWHERE;
|
|
}
|
|
}
|
|
}
|
|
} while (i > 0);
|
|
|
|
/* Find what zone that room was in so we can update the loading table. */
|
|
for (i = 0; i <= top_of_zone_table; i++)
|
|
for (j = 0; ZCMD(i , j).command != 'S'; j++)
|
|
switch (ZCMD(i, j).command) {
|
|
case 'M':
|
|
case 'O':
|
|
case 'T':
|
|
case 'V':
|
|
if (ZCMD(i, j).arg3 == rnum)
|
|
ZCMD(i, j).command = '*'; /* Cancel command. */
|
|
else if (ZCMD(i, j).arg3 > rnum)
|
|
ZCMD(i, j).arg3 -= (ZCMD(i, j).arg3 != NOWHERE); /* with unsigned NOWHERE > any rnum */
|
|
break;
|
|
case 'D':
|
|
case 'R':
|
|
if (ZCMD(i, j).arg1 == rnum)
|
|
ZCMD(i, j).command = '*'; /* Cancel command. */
|
|
else if (ZCMD(i, j).arg1 > rnum)
|
|
ZCMD(i, j).arg1 -= (ZCMD(i, j).arg1 != NOWHERE); /* with unsigned NOWHERE > any rnum */
|
|
case 'G':
|
|
case 'P':
|
|
case 'E':
|
|
case '*':
|
|
/* Known zone entries we don't care about. */
|
|
break;
|
|
default:
|
|
mudlog(BRF, LVL_GOD, TRUE, "SYSERR: GenOLC: delete_room: Unknown zone entry found!");
|
|
}
|
|
|
|
/* Remove this room from all shop lists. */
|
|
for (i = 0; i <= top_shop; i++) {
|
|
for (j = 0;SHOP_ROOM(i, j) != NOWHERE;j++) {
|
|
if (SHOP_ROOM(i, j) == world[rnum].number)
|
|
SHOP_ROOM(i, j) = 0; /* set to the void */
|
|
}
|
|
}
|
|
/* Now we actually move the rooms down. */
|
|
for (i = rnum; i < top_of_world; i++) {
|
|
world[i] = world[i + 1];
|
|
update_wait_events(&world[i], &world[i+1]);
|
|
|
|
for (ppl = world[i].people; ppl; ppl = ppl->next_in_room)
|
|
IN_ROOM(ppl) -= (IN_ROOM(ppl) != NOWHERE); /* Redundant check? */
|
|
|
|
for (obj = world[i].contents; obj; obj = obj->next_content)
|
|
IN_ROOM(obj) -= (IN_ROOM(obj) != NOWHERE); /* Redundant check? */
|
|
}
|
|
|
|
top_of_world--;
|
|
RECREATE(world, struct room_data, top_of_world + 1);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
int save_rooms(zone_rnum rzone)
|
|
{
|
|
int i;
|
|
struct room_data *room;
|
|
FILE *sf;
|
|
char filename[128];
|
|
char buf[MAX_STRING_LENGTH];
|
|
char buf1[MAX_STRING_LENGTH];
|
|
|
|
#if CIRCLE_UNSIGNED_INDEX
|
|
if (rzone == NOWHERE || rzone > top_of_zone_table) {
|
|
#else
|
|
if (rzone < 0 || rzone > top_of_zone_table) {
|
|
#endif
|
|
log("SYSERR: GenOLC: save_rooms: Invalid zone number %d passed! (0-%d)", rzone, top_of_zone_table);
|
|
return FALSE;
|
|
}
|
|
|
|
log("GenOLC: save_rooms: Saving rooms in zone #%d (%d-%d).",
|
|
zone_table[rzone].number, genolc_zone_bottom(rzone), zone_table[rzone].top);
|
|
|
|
snprintf(filename, sizeof(filename), "%s/%d.new", WLD_PREFIX, zone_table[rzone].number);
|
|
if (!(sf = fopen(filename, "w"))) {
|
|
perror("SYSERR: save_rooms");
|
|
return FALSE;
|
|
}
|
|
|
|
for (i = genolc_zone_bottom(rzone); i <= zone_table[rzone].top; i++) {
|
|
room_rnum rnum;
|
|
|
|
if ((rnum = real_room(i)) != NOWHERE) {
|
|
int j;
|
|
|
|
room = (world + rnum);
|
|
|
|
/* Copy the description and strip off trailing newlines. */
|
|
strncpy(buf, room->description ? room->description : "Empty room.", sizeof(buf)-1 );
|
|
strip_cr(buf);
|
|
|
|
/* Save the numeric and string section of the file. */
|
|
fprintf(sf, "#%d\n"
|
|
"%s%c\n"
|
|
"%s%c\n"
|
|
"%d %d %d %d %d %d\n",
|
|
room->number,
|
|
room->name ? room->name : "Untitled", STRING_TERMINATOR,
|
|
buf, STRING_TERMINATOR,
|
|
zone_table[room->zone].number, room->room_flags[0], room->room_flags[1], room->room_flags[2],
|
|
room->room_flags[3], room->sector_type
|
|
);
|
|
|
|
/* Now you write out the exits for the room. */
|
|
for (j = 0; j < NUM_OF_DIRS; j++) {
|
|
if (R_EXIT(room, j)) {
|
|
int dflag;
|
|
if (R_EXIT(room, j)->general_description) {
|
|
strncpy(buf, R_EXIT(room, j)->general_description, sizeof(buf)-1);
|
|
strip_cr(buf);
|
|
} else
|
|
*buf = '\0';
|
|
|
|
/* Figure out door flag. */
|
|
if (IS_SET(R_EXIT(room, j)->exit_info, EX_ISDOOR)) {
|
|
if (IS_SET(R_EXIT(room, j)->exit_info, EX_PICKPROOF))
|
|
dflag = 2;
|
|
else
|
|
dflag = 1;
|
|
} else
|
|
dflag = 0;
|
|
|
|
if (R_EXIT(room, j)->keyword)
|
|
strncpy(buf1, R_EXIT(room, j)->keyword, sizeof(buf1)-1 );
|
|
else
|
|
*buf1 = '\0';
|
|
|
|
/* Now write the exit to the file. */
|
|
fprintf(sf, "D%d\n"
|
|
"%s~\n"
|
|
"%s~\n"
|
|
"%d %d %d\n", j, buf, buf1, dflag,
|
|
R_EXIT(room, j)->key != NOTHING ? R_EXIT(room, j)->key : -1,
|
|
R_EXIT(room, j)->to_room != NOWHERE ? world[R_EXIT(room, j)->to_room].number : -1);
|
|
|
|
}
|
|
}
|
|
|
|
if (room->ex_description) {
|
|
struct extra_descr_data *xdesc;
|
|
|
|
for (xdesc = room->ex_description; xdesc; xdesc = xdesc->next) {
|
|
strncpy(buf, xdesc->description, sizeof(buf));
|
|
strip_cr(buf);
|
|
fprintf(sf, "E\n"
|
|
"%s~\n"
|
|
"%s~\n", xdesc->keyword, buf);
|
|
}
|
|
}
|
|
fprintf(sf, "S\n");
|
|
script_save_to_disk(sf, room, WLD_TRIGGER);
|
|
}
|
|
}
|
|
|
|
/* Write the final line and close it. */
|
|
fprintf(sf, "$~\n");
|
|
fclose(sf);
|
|
|
|
/* Old file we're replacing. */
|
|
snprintf(buf, sizeof(buf), "%s/%d.wld", WLD_PREFIX, zone_table[rzone].number);
|
|
|
|
remove(buf);
|
|
rename(filename, buf);
|
|
|
|
if (in_save_list(zone_table[rzone].number, SL_WLD))
|
|
remove_from_save_list(zone_table[rzone].number, SL_WLD);
|
|
return TRUE;
|
|
}
|
|
|
|
int copy_room(struct room_data *to, struct room_data *from)
|
|
{
|
|
free_room_strings(to);
|
|
*to = *from;
|
|
copy_room_strings(to, from);
|
|
|
|
/* Don't put people and objects in two locations. Should this be done here? */
|
|
from->people = NULL;
|
|
from->contents = NULL;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
/* Copy strings over so bad things don't happen. We do not free the existing
|
|
* strings here because copy_room() did a shallow copy previously and we'd be
|
|
* freeing the very strings we're copying. If this function is used elsewhere,
|
|
* be sure to free_room_strings() the 'dest' room first. */
|
|
int copy_room_strings(struct room_data *dest, struct room_data *source)
|
|
{
|
|
int i;
|
|
|
|
if (dest == NULL || source == NULL) {
|
|
log("SYSERR: GenOLC: copy_room_strings: NULL values passed.");
|
|
return FALSE;
|
|
}
|
|
|
|
dest->description = str_udup(source->description);
|
|
dest->name = str_udup(source->name);
|
|
|
|
for (i = 0; i < NUM_OF_DIRS; i++) {
|
|
if (!R_EXIT(source, i))
|
|
continue;
|
|
|
|
CREATE(R_EXIT(dest, i), struct room_direction_data, 1);
|
|
*R_EXIT(dest, i) = *R_EXIT(source, i);
|
|
if (R_EXIT(source, i)->general_description)
|
|
R_EXIT(dest, i)->general_description = strdup(R_EXIT(source, i)->general_description);
|
|
if (R_EXIT(source, i)->keyword)
|
|
R_EXIT(dest, i)->keyword = strdup(R_EXIT(source, i)->keyword);
|
|
}
|
|
|
|
if (source->ex_description)
|
|
copy_ex_descriptions(&dest->ex_description, source->ex_description);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
int free_room_strings(struct room_data *room)
|
|
{
|
|
int i;
|
|
|
|
/* Free descriptions. */
|
|
if (room->name)
|
|
free(room->name);
|
|
if (room->description)
|
|
free(room->description);
|
|
if (room->ex_description)
|
|
free_ex_descriptions(room->ex_description);
|
|
|
|
/* Free exits. */
|
|
for (i = 0; i < NUM_OF_DIRS; i++) {
|
|
if (room->dir_option[i]) {
|
|
if (room->dir_option[i]->general_description)
|
|
free(room->dir_option[i]->general_description);
|
|
|
|
if (room->dir_option[i]->keyword)
|
|
free(room->dir_option[i]->keyword);
|
|
|
|
free(room->dir_option[i]);
|
|
room->dir_option[i] = NULL;
|
|
}
|
|
}
|
|
|
|
return TRUE;
|
|
}
|