kyonshi/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-02-20 10:31:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Removed the do_oasis function and called the Xedit commands directly (thanks Rhade).

Browse Source 
- Updated idle timer to keep track of imms too (thanks Jamdog).
- Standardized OLC messages.
- Removed special procedures that were replaced with trigedit.
- Updated README.WIN, README.MSVC8, and README.CYGWIN.
--Rumble
This commit is contained in:
Rumble
2007-03-28 12:53:48 +00:00
parent f34cc2c8ed
commit 7f65248b2a
26 changed files with 534 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

237
src/oasis.c
View File

@@ -7,7 +7,6 @@
#include "conf.h"
#include "sysdep.h"
#include "structs.h"
#include "utils.h"
#include "interpreter.h"
@@ -24,15 +23,10 @@
#include "screen.h"
#include "dg_olc.h"
/******************************************************************************/
/** External Functions **/
/******************************************************************************/
/* External Functions */
int is_name(const char *str, const char *namelist);
/******************************************************************************/
/** Internal Data Structures **/
/******************************************************************************/
/* Internal Data Structures */
struct olc_scmd_info_t {
const char *text;
int con_type;
@@ -51,131 +45,20 @@ struct olc_scmd_info_t {
const char *nrm, *grn, *cyn, *yel;
/******************************************************************************/
/** Internal Functions **/
/******************************************************************************/
/* Internal Functions */
void free_config(struct config_data *data);
/* -------------------------------------------------------------------------- */
/*
* Only player characters should be using OLC anyway.
*/
/* Only player characters should be using OLC anyway. */
void clear_screen(struct descriptor_data *d)
{
if (PRF_FLAGGED(d->character, PRF_CLS))
write_to_output(d, "");
}
/* -------------------------------------------------------------------------- */
/*
* Exported ACMD do_oasis function.
*
* This function is the OLC interface. It deals with all the
* generic OLC stuff, then passes control to the sub-olc sections.
*
* UPDATE:
* I believe that yes, putting the code together that is common in all of the
* olc functions is good to a certain extent, but the do_oasis command was
* getting ridiculous. Therefore, I have separated them into separate
* functions that get called from in do_oasis....yes, similar code, but it is
* easier to handle.... - Kip Potter
*/
ACMD(do_oasis)
{
/*
* No screwing around as a mobile.
*/
if (IS_NPC(ch) || !ch->desc)
return;
/*
* Prevent forcing people in OLC to edit other stuff.
* 'force' just lets command_interpreter() handle the input,
* regardless of the state of the victim.
* This can wreck havoc if people are i OLC already
* - ie. their input would have been redirected by nanny(), and
* never get to command_interpreter().
* -- Welcor 09/03
* - thanks to Mark Garringer (zizazat@hotmail.com) for the bug report.
*/
if (STATE(ch->desc) != CON_PLAYING)
return;
switch (subcmd) {
/*
* The command to see what needs to be saved, typically 'olc'.
*/
case SCMD_OLC_SAVEINFO:
do_show_save_list(ch);
break;
case SCMD_OASIS_CEDIT:
do_oasis_cedit(ch, argument, cmd, subcmd);
break;
case SCMD_OASIS_ZEDIT:
do_oasis_zedit(ch, argument, cmd, subcmd);
break;
case SCMD_OASIS_REDIT:
do_oasis_redit(ch, argument, cmd, subcmd);
break;
case SCMD_OASIS_OEDIT:
do_oasis_oedit(ch, argument, cmd, subcmd);
break;
case SCMD_OASIS_MEDIT:
do_oasis_medit(ch, argument, cmd, subcmd);
break;
case SCMD_OASIS_SEDIT:
do_oasis_sedit(ch, argument, cmd, subcmd);
break;
case SCMD_OASIS_RLIST:
case SCMD_OASIS_MLIST:
case SCMD_OASIS_OLIST:
case SCMD_OASIS_SLIST:
case SCMD_OASIS_ZLIST:
case SCMD_OASIS_TLIST:
do_oasis_list(ch, argument, cmd, subcmd);
break;
case SCMD_OASIS_LINKS:
do_oasis_links(ch, argument, cmd, subcmd);
break;
case SCMD_OASIS_TRIGEDIT:
do_oasis_trigedit(ch, argument, cmd, subcmd);
break;
case SCMD_OASIS_AEDIT:
do_oasis_aedit(ch, argument, cmd, subcmd);
break;
case SCMD_OASIS_HEDIT:
do_oasis_hedit(ch, argument, cmd, subcmd);
break;
default:
log("SYSERR: (OLC) Invalid subcmd passed to do_oasis, subcmd - (%d)", subcmd);
return;
}
return;
}
/*------------------------------------------------------------*\
Exported utilities
\*------------------------------------------------------------*/
/*
* Set the colour string pointers for that which this char will
* see at color level NRM. Changing the entries here will change
* the colour scheme throughout the OLC.
*/
/* Exported utilities */
/* Set the color string pointers for that which this char will see at color
* level NRM. Changing the entries here will change the colour scheme
* throughout the OLC. */
void get_char_colors(struct char_data *ch)
{
nrm = CCNRM(ch, C_NRM);
@@ -184,23 +67,16 @@ void get_char_colors(struct char_data *ch)
yel = CCYEL(ch, C_NRM);
}
/*
* This procedure frees up the strings and/or the structures
* attatched to a descriptor, sets all flags back to how they
* should be.
*/
/* This procedure frees up the strings and/or the structures attatched to a
* descriptor, sets all flags back to how they should be. */
void cleanup_olc(struct descriptor_data *d, byte cleanup_type)
{
/*
* Clean up WHAT?
*/
/* Clean up WHAT? */
if (d->olc == NULL)
return;
/*
* Check for a room. free_room doesn't perform
* sanity checks, we must be careful here.
*/
/* Check for a room. free_room doesn't perform sanity checks, we must be
* careful here. */
if (OLC_ROOM(d)) {
switch (cleanup_type) {
case CLEANUP_ALL:
@@ -220,38 +96,28 @@ void cleanup_olc(struct descriptor_data *d, byte cleanup_type)
}
}
/*
* Check for an existing object in the OLC. The strings
* aren't part of the prototype any longer. They get added
* with strdup().
*/
/* Check for an existing object in the OLC. The strings aren't part of the
* prototype any longer. They get added with strdup(). */
if (OLC_OBJ(d)) {
free_object_strings(OLC_OBJ(d));
free(OLC_OBJ(d));
}
/*
* Check for a mob. free_mobile() makes sure strings are not in
* the prototype.
*/
/* Check for a mob. free_mobile() makes sure strings are not in the
* prototype. */
if (OLC_MOB(d))
free_mobile(OLC_MOB(d));
/*
* Check for a zone. cleanup_type is irrelevant here, free() everything.
*/
/* Check for a zone. cleanup_type is irrelevant here, free() everything. */
if (OLC_ZONE(d)) {
free(OLC_ZONE(d)->name);
free(OLC_ZONE(d)->cmd);
free(OLC_ZONE(d));
}
/*
* Check for a shop. free_shop doesn't perform sanity checks, we must
* be careful here.
* OLC_SHOP(d) is a _copy_ - no pointers to the original. Just go ahead
* and free it all.
*/
/* Check for a shop. free_shop doesn't perform sanity checks, we must be
* careful here. OLC_SHOP(d) is a _copy_ - no pointers to the original. Just
* go ahead and free it all. */
if (OLC_SHOP(d))
free_shop(OLC_SHOP(d));
@@ -284,33 +150,23 @@ void cleanup_olc(struct descriptor_data *d, byte cleanup_type)
}
}
/* free storage if allocated (for tedit and aedit) */
/* and Triggers */
/*
* this is the command list - it's been copied to disk already,
* so just free it -- Welcor
*/
/* Free storage if allocated (tedit, aedit, and trigedit). This is the command
* list - it's been copied to disk already, so just free it -Welcor. */
if (OLC_STORAGE(d)) {
free(OLC_STORAGE(d));
OLC_STORAGE(d) = NULL;
}
/*
* Free this one regardless. If we've left olc, we've either made
* a fresh copy of it in the trig index, or we lost connection.
* Either way, we need to get rid of this.
*/
/* Free this one regardless. If we've left olc, we've either made a fresh
* copy of it in the trig index, or we lost connection. Either way, we need
* to get rid of this. */
if (OLC_TRIG(d)) {
free_trigger(OLC_TRIG(d));
OLC_TRIG(d) = NULL;
}
/*
* OLC_SCRIPT is always set as trig_proto of OLC_OBJ/MOB/ROOM.
* Therefore it should not be free'd here.
*/
/* OLC_SCRIPT is always set as trig_proto of OLC_OBJ/MOB/ROOM. Therefore it
* should not be free'd here. */
/*
* Restore descriptor playing status.
*/
/* Restore descriptor playing status. */
if (d->character) {
REMOVE_BIT(PLR_FLAGS(d->character), PLR_WRITING);
act("$n stops using OLC.", TRUE, d->character, NULL, NULL, TO_ROOM);
@@ -331,10 +187,8 @@ void cleanup_olc(struct descriptor_data *d, byte cleanup_type)
d->olc = NULL;
}
/*
* This function is an exact duplicate of the tag_argument function found in
* one of the ascii patches located on the circlemud ftp website.
*/
/* This function is an exact duplicate of the tag_argument function found in
* one of the ascii patches located on the circlemud ftp website. */
void split_argument(char *argument, char *tag)
{
char *tmp = argument, *ttag = tag, *wrt = argument;
@@ -360,34 +214,17 @@ void split_argument(char *argument, char *tag)
void free_config(struct config_data *data)
{
/****************************************************************************/
/** Free strings. **/
/****************************************************************************/
/* Free strings. */
free_strings(data, OASIS_CFG);
/****************************************************************************/
/** Free the data structure. **/
/****************************************************************************/
/* Free the data structure. */
free(data);
}
/******************************************************************************/
/** **/
/** Function : can_edit_zone() **/
/** **/
/** Description : Checks to see if a builder can modify the specified **/
/** zone. **/
/** **/
/** Arguments : **/
/** ch **/
/** The character requesting access to modify this zone. **/
/** rnum **/
/** The real number of the zone attempted to be modified. **/
/** **/
/** Returns : Returns TRUE if the builder has access, otherwise **/
/** FALSE. **/
/** **/
/******************************************************************************/
/* Checks to see if a builder can modify the specified zone. Ch is the imm
* requesting access to modify this zone. Rnum is the real number of the zone
* attempted to be modified. Returns TRUE if the builder has access, otherwisei
* FALSE. */
int can_edit_zone(struct char_data *ch, zone_rnum rnum)
{
/* no access if called with bad arguments */