Difference for server/c_wiz.c from version 1.76 to 1.77

version 1.76

version 1.77

Line 1

* static char *rcsid_c_wiz_c =

* "$Id: c_wiz.c,v 1.76 2005/11/27 14:16:46 ryo_saeba Exp $";

* "$Id: c_wiz.c,v 1.77 2005/12/18 11:45:00 akirschbaum Exp $";

Line 26

The authors can be reached via e-mail at crossfire-devel@real-time.com

* End of non-DM commands. DM-only commands below.

* (This includes commands directly from socket)

/* Some commands not accepted from socket */

#include <global.h>

#ifndef __CEXTRACT__

#include <sproto.h>

Line 50

Line 43

#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */

/* Enough of the DM functions seem to need this that I broke

/**

* Enough of the DM functions seem to need this that I broke

* it out to a seperate function. name is the person

* being saught, rq is who is looking for them. This

* prints diagnostics messages, and returns the

* other player, or NULL otherwise.

static player *get_other_player_from_name(object *op, char *name)

static player *get_other_player_from_name(object *op, char *name) {

{

player *pl;

if (!name) return NULL;

if (!name)

return NULL;

for(pl=first_player;pl!=NULL;pl=pl->next)

if(!strncmp(pl->ob->name, name, MAX_NAME))

Line 82

Line 76

return pl;

}

/**

* This command will stress server.

int command_loadtest(object *op, char *params){

uint32 x,y;

char buf[1024];

/*This command will stress server*/

new_draw_info(NDI_UNIQUE, 0,op, "loadtest will stress server through teleporting");

new_draw_info(NDI_UNIQUE, 0,op, "at different map places.");

new_draw_info(NDI_UNIQUE, 0,op, "use at your own risks.");

Line 97

Line 93

return 0;

if (strncmp (params,"TRUE",4))

return 0;

new_draw_info_format(NDI_UNIQUE, 0, op,"gogogo");

for (x=0; x<settings.worldmaptilesx; x++)

for (x = 0; x < settings.worldmaptilesx; x++) {

for (y=0; y<settings.worldmaptilesy; y++){

sprintf (buf,"/world/world_%d_%d",x+settings.worldmapstartx,y+settings.worldmapstarty);

/*new_draw_info_format(NDI_UNIQUE, 0, op,"going to %s",buf);*/

command_goto (op, buf);

}

return 0;

}

Line 112

Line 110

* If 'silent_dm' is non zero, other players are informed of DM entering/leaving,

* else they just think someone left/entered.

void do_wizard_hide( object* op, int silent_dm )

void do_wizard_hide(object *op, int silent_dm) {

{

if (op->contr->hidden) {

if (op->contr->hidden)

{

op->contr->hidden=0;

op->invisible=1;

new_draw_info(NDI_UNIQUE, 0,op, "You are no longer hidden from other players");

op->map->players++;

new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL,

"%s has entered the game.",op->name);

if ( !silent_dm )

if (!silent_dm) {

{

new_draw_info(NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL,

"The Dungeon Master has arrived!");

}

} else {

else

{

op->contr->hidden=1;

new_draw_info(NDI_UNIQUE, 0,op, "Other players will no longer see you.");

op->map->players--;

if ( !silent_dm )

if (!silent_dm) {

{

new_draw_info(NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL,

"The Dungeon Master is gone..");

}

Line 151

Line 143

return 1;

}

/**

/* This finds and returns the object which matches the name or

* This finds and returns the object which matches the name or

* object nubmer (specified via num #whatever).

static object *find_object_both(char *params) {

static object *find_object_both(char *params)

if (!params)

{

return NULL;

if (!params) return NULL;

if (params[0] == '#')

if(params[0]=='#') return find_object(atol(params+1));

return find_object(atol(params+1));

else return find_object_name(params);

else

return find_object_name(params);

}

/* Sets the god for some objects. params should contain two values -

/**

* Sets the god for some objects. params should contain two values -

* first the object to change, followed by the god to change it to.

int command_setgod(object *op, char *params)

int command_setgod(object *op, char *params) {

{

object *ob, *god;

char *str;

Line 175

Line 168

new_draw_info(NDI_UNIQUE,0,op,"Usage: setgod object god");

return 0;

}

/* kill the space, and set string to the next param */

*str++='\0';

if(!(ob=find_object_both(params))) {

new_draw_info_format(NDI_UNIQUE,0,op,"Set whose god - can not find object %s?",params);

return 1;

}

/* Perhaps this is overly restrictive? Should we perhaps be able

* Perhaps this is overly restrictive? Should we perhaps be able

* to rebless altars and the like?

if (ob->type!=PLAYER) {

new_draw_info_format(NDI_UNIQUE,0,op,"%s is not a player - can not change its god",ob->name);

return 1;

}

god = find_god(str);

if(god==NULL) {

new_draw_info_format(NDI_UNIQUE,0,op,"No such god %s.",str);

return 1;

}

become_follower(ob,god);

return 1;

}

/*Add player's IP to ban_file and kick them off the server

/**

* Add player's IP to ban_file and kick them off the server

* I know most people have dynamic IPs but this is more of a short term

* solution if they have to get a new IP to play maybe they'll calm down.

* This uses the banish_file in the local directory *not* the ban_file

Line 215

Line 214

}

pl = get_other_player_from_name(op, params);

if (!pl) return 1;

if (!pl)

return 1;

sprintf (buf, "%s/%s", settings.localdir, BANISHFILE);

if ((banishfile = fopen(buf, "a")) == NULL) {

LOG (llevDebug, "Could not find file banish_file.\n");

new_draw_info(NDI_UNIQUE,0,op,"Could not find banish_file.");

return(0);

return 0;

}

now = time(NULL);

/* Record this as a comment - then we don't have to worry about changing

* Record this as a comment - then we don't have to worry about changing

* the parsing code.

fprintf(banishfile, "# %s (%s) banned by %s at %s\n", pl->ob->name,

Line 241

Line 243

return 1;

}

int command_kick (object *op, char *params)

int command_kick(object *op, char *params) {

{

struct pl *pl;

for(pl=first_player;pl!=NULL;pl=pl->next)

for (pl = first_player; pl != NULL; pl = pl->next) {

{

if((params==NULL || !strcmp(pl->ob->name,params)) && pl->ob!=op) {

object *op;

int removed=0;

Line 263

"%s is kicked out of the game.",op->name);

strcpy(op->contr->killer,"left");

check_score(op); /* Always check score */

/* not sure how the player would be freed, but did see

* not sure how the player would be freed, but did see

* a crash here - if that is the case, don't save the

* the player.

if (!removed && !QUERY_FLAG(op, FLAG_FREED)) {

(void)save_player(op,0);

if (op->map) op->map->players--;

if (op->map)

op->map->players--;

}

#if MAP_MAXTIMEOUT

if (op->map) op->map->timeout = MAP_TIMEOUT(op->map);

if (op->map)

op->map->timeout = MAP_TIMEOUT(op->map);

#endif

pl->socket.status = Ns_Dead;

}

return 1;

}

int command_save_overlay(object *op, char *params)

int command_save_overlay(object *op, char *params) {

{

if (!op)

return(0);

return 0;

if (op!=NULL && !QUERY_FLAG(op, FLAG_WIZ))

if (op != NULL && !QUERY_FLAG(op, FLAG_WIZ)) {

{

new_draw_info(NDI_UNIQUE, 0, op,

"Sorry, you can't force an overlay save.");

return(1);

return 1;

}

new_save_map(op->map, 2);

new_save_map(op->map, 0);

new_draw_info(NDI_UNIQUE, 0, op, "Current map has been saved as an"

Line 298

Line 302

ready_map_name(op->map->path, 0);

return(1);

return 1;

}

/*a simple toggle for the no_shout field.

AKA the MUZZLE command

* A simple toggle for the no_shout field.

* AKA the MUZZLE command

int command_toggle_shout(object *op, char *params)

int command_toggle_shout(object *op, char *params) {

{

player *pl;

if (!params) {

Line 313

Line 318

}

pl = get_other_player_from_name(op, params);

if (!pl) return 1;

if (!pl)

return 1;

if (pl->ob->contr->no_shout == 0){

pl->ob->contr->no_shout = 1;

new_draw_info(NDI_UNIQUE | NDI_RED, 0, pl->ob,

"You have been muzzled by the DM!");

new_draw_info(NDI_UNIQUE|NDI_RED, 0, pl->ob, "You have been muzzled by the DM!");

new_draw_info_format(NDI_UNIQUE , 0, op,

new_draw_info_format(NDI_UNIQUE, 0, op, "You muzzle %s.", pl->ob->name);

"You muzzle %s.", pl->ob->name);

/* Avion : Here we handle the MUZZLE global event */

execute_global_event(EVENT_MUZZLE,pl->ob,params);

Line 336

Line 341

}

int command_shutdown(object *op, char *params)

int command_shutdown(object *op, char *params) {

{

if (op!=NULL && !QUERY_FLAG(op, FLAG_WIZ)) {

if(op!=NULL && !QUERY_FLAG(op,FLAG_WIZ))

{

new_draw_info(NDI_UNIQUE,0,op,"Sorry, you can't shutdown the server.");

return 1;

}

/* We need to give op - command_kick expects it. however, this means

* We need to give op - command_kick expects it. however, this means

* the op won't get kicked off, so we do it ourselves

command_kick(op,NULL);

Line 368

Line 372

new_draw_info(NDI_UNIQUE, 0,op,"Go to what level?");

return 1;

}

name = params;

dummy=get_object();

dummy->map = op->map;

Line 380

Line 385

new_draw_info_format(NDI_UNIQUE, 0, op,

"Difficulty: %d.",op->map->difficulty);

}

return 1;

}

Line 396

Line 402

sscanf(params, "%d", &nr);

for(i = 0; i < nr; i++) {

retry = 50;

while((tmp=generate_treasure(0,op->map->difficulty))==NULL && --retry);

while ((tmp=generate_treasure(0, op->map->difficulty)) == NULL && --retry)

;

if (tmp != NULL) {

tmp = insert_ob_in_ob(tmp, op);

if (op->type == PLAYER)

esrv_send_item (op, tmp);

}

return 1;

}

int command_freeze(object *op, char *params)

int command_freeze(object *op, char *params) {

{

int ticks;

player *pl;

Line 418

Line 425

ticks = atoi(params);

if (ticks) {

while ((isdigit(*params) || isspace(*params)) && *params != 0) params++;

while ((isdigit(*params) || isspace(*params)) && *params != 0)

params++;

if (*params == 0) {

new_draw_info(NDI_UNIQUE, 0,op,"Usage: freeze [ticks] <player>.");

return 1;

}

} else ticks=100;

} else

ticks = 100;

pl = get_other_player_from_name(op, params);

if (!pl) return 1;

if (!pl)

return 1;

new_draw_info(NDI_UNIQUE | NDI_RED, 0, pl->ob, "You have been frozen by the DM!");

new_draw_info_format(NDI_UNIQUE , 0, op,

"You freeze %s for %d ticks", pl->ob->name, ticks);

Line 433

Line 445

return 0;

}

int command_summon(object *op, char *params) {

int command_summon (object *op, char *params)

{

int i;

object *dummy;

player *pl;

Line 449

Line 459

}

pl = get_other_player_from_name(op, params);

if (!pl) return 1;

if (!pl)

return 1;

i=find_free_spot(op,op->map,op->x,op->y,1,9);

if (i==-1) {

new_draw_info(NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");

return 1;

}

dummy=get_object();

EXIT_PATH(dummy)=add_string(op->map->path);

EXIT_X(dummy)=op->x+freearr_x[i];

Line 468

Line 480

return 1;

}

/* Teleport next to target player */

/**

* Teleport next to target player.

/* mids 01/16/2002 */

int command_teleport (object *op, char *params) {

int i;

object *dummy;

Line 485

Line 498

}

pl = get_other_player_from_name(op, params);

if (!pl) return 1;

if (!pl)

return 1;

i = find_free_spot(pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);

if (i==-1) {

new_draw_info(NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");

return 1;

}

dummy = get_object();

EXIT_PATH(dummy) = add_string(pl->ob->map->path);

EXIT_X(dummy) = pl->ob->x + freearr_x[i];

Line 504

Line 519

return 1;

}

/* This function is a real mess, because we're stucking getting

/**

* This function is a real mess, because we're stucking getting

* the entire item description in one block of text, so we just

* can't simply parse it - we need to look for double quotes

* for example. This could actually get much simpler with just a

Line 518

Line 534

* dragon name "big nasty creature" hp 5 sp 30

* for example.

int command_create (object *op, char *params)

int command_create(object *op, char *params) {

{

object *tmp=NULL;

int nrof,i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace;

char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline;

Line 566

Line 581

*cp = '\0';

cp += 4;

}

for (bp2=bp; *bp2; bp2++)

for (bp2 = bp; *bp2; bp2++) {

if (*bp2 == ' ') {

*bp2 = '\0';

bp2++;

break;

}

if((at=find_archetype(bp))==NULL) {

new_draw_info(NDI_UNIQUE, 0, op, "No such archetype.");

Line 581

Line 597

if (cp) {

char spell_name[MAX_BUF], *fsp=NULL;

/* Try to find a spell object for this. Note that

* Try to find a spell object for this. Note that

* we also set up spell_name which is only

* the first word.

Line 612

Line 629

if (find_artifactlist(at->clone.type)==NULL) {

new_draw_info_format(NDI_UNIQUE, 0, op,

"No artifact list for type %d\n", at->clone.type);

}

} else {

else {

art = find_artifactlist(at->clone.type)->items;

do {

if (!strcmp(art->item->name, cp)) break;

if (!strcmp(art->item->name, cp))

break;

art = art->next;

} while (art!=NULL);

if (!art) {

Line 629

Line 646

set_nrof ? nrof : 0, set_magic ? magic : 0 , bp, cp);

}

} /* if cp */

if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL ||

at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) {

new_draw_info_format(NDI_UNIQUE, 0, op,

Line 637

Line 655

return 1;

}

/* Rather than have two different blocks with a lot of similar code,

* Rather than have two different blocks with a lot of similar code,

* just create one object, do all the processing, and then determine

* if that one object should be inserted or if we need to make copies.

Line 653

Line 672

CLEAR_FLAG(tmp, FLAG_KNOWN_MAGICAL);

}

/* This entire block here tries to find variable pairings,

* This entire block here tries to find variable pairings,

* eg, 'hp 4' or the like. The mess here is that values

* can be quoted (eg "my cool sword"); So the basic logic

* is we want to find two spaces, but if we got a quote,

Line 676

Line 696

if (*bp3 == '"') {

*bp3 = '\0';

gotquote++;

} else

bp3++;

}

else bp3++;

} else if (*bp3==' ') {

}

else if (*bp3==' ') {

gotspace++;

}

/* If we got two spaces, send the second one to null.

* If we got two spaces, send the second one to null.

* if we've reached the end of the line, increase gotspace -

* this is perfectly valid for the list entry listed.

if (gotspace == 2 || gotquote == 2) {

bp3--; /* Undo the extra increment */

*bp3='\0';

} else if (*bp3=='\0') gotspace++;

} else if (*bp3=='\0')

gotspace++;

if ((gotquote && gotquote != 2) || (gotspace !=2 && gotquote!=2)) {

/* Unfortunately, we've clobbered lots of values, so printing

* Unfortunately, we've clobbered lots of values, so printing

* out what we have probably isn't useful. Break out, because

* trying to recover is probably won't get anything useful

* anyways, and we'd be confused about end of line pointers

Line 716

Line 739

bp2 = bp3 + 1;

}

if(at->clone.nrof) {

if (at_spell)

insert_ob_in_ob(arch_to_object(at_spell), tmp);

Line 745

Line 767

if (at_spell)

insert_ob_in_ob(arch_to_object(at_spell), dup);

/* The head is what contains all the important bits,

* The head is what contains all the important bits,

* so just copying it over should be fine.

if(head==NULL) {

Line 764

Line 787

}

prev=dup;

}

if (QUERY_FLAG(head, FLAG_ALIVE)) {

object* check = head;

int size_x = 0;

int size_y = 0;

while (check)

{

while (check) {

size_x = MAX(size_x, check->arch->clone.x);

size_y = MAX(size_y, check->arch->clone.y);

check = check->more;

}

if (out_of_map(op->map,head->x + size_x, head->y + size_y))

{

if (out_of_map(op->map, head->x+size_x, head->y+size_y)) {

if ((head->x < size_x) || (head->y < size_y))

if (head->x < size_x || head->y < size_y) {

{

dm_stack_pop(op->contr);

free_object(head);

new_draw_info(NDI_UNIQUE, 0, op,"Object too big to insert in map, or wrong position.");

free_object(tmp);

return 1;

}

check = head;

while ( check )

while (check) {

{

check->x -= size_x;

check->y -= size_y;

check = check->more;

}

insert_ob_in_map(head, op->map, op, 0);

}

} else

else

head = insert_ob_in_ob(head, op);

/* Let's put this created item on stack so dm can access it easily. */

Line 808

Line 831

op->map->difficulty, 0);

esrv_send_item(op, head);

}

/* free the one we used to copy */

free_object(tmp);

}

return 1;

}

/* if(<not socket>) */

* Now follows dm-commands which are also acceptable from sockets

int command_inventory (object *op, char *params)

int command_inventory(object *op, char *params) {

{

object *tmp;

int i;

Line 834

Line 856

new_draw_info(NDI_UNIQUE, 0,op,"Inventory of what object (nr)?");

return 1;

}

inventory(op,tmp);

return 1;

}

Line 842

Line 865

* already see skills w/ inventory command - b.t.

int command_skills (object *op, char *params)

int command_skills (object *op, char *params) {

{

show_skills(op, params);

return 0;

}

int command_dump (object *op, char *params)

int command_dump (object *op, char *params) {

{

object *tmp;

tmp = get_dm_object( op->contr, &params, NULL );

if ( !tmp )

return 1;

Line 862

Line 884

return 1;

}

/* When DM is possessing a monster, flip aggression on and off, to allow

/**

better motion */

* When DM is possessing a monster, flip aggression on and off, to allow

* better motion.

int command_mon_aggr (object *op, char *params)

{

int command_mon_aggr(object *op, char *params) {

if (op->enemy || !QUERY_FLAG(op, FLAG_UNAGGRESSIVE)) {

op->enemy = NULL;

SET_FLAG(op, FLAG_UNAGGRESSIVE);

Line 876

Line 898

CLEAR_FLAG(op, FLAG_UNAGGRESSIVE);

new_draw_info(NDI_UNIQUE, 0, op, "Aggression turned ON");

}

return 1;

}

/* DM can possess a monster. Basically, this tricks the client into thinking

/** DM can possess a monster. Basically, this tricks the client into thinking

* a given monster, is actually the player it controls. This allows a DM

* to inhabit a monster's body, and run around the game with it.

* This function is severely broken - it has tons of hardcoded values,

int command_possess(object *op, char *params) {

int command_possess (object *op, char *params)

{

object *victim, *curinv, *nextinv;

player *pl;

int i;

Line 903

Line 924

new_draw_info(NDI_UNIQUE, 0, op, "Patch what object (nr)?");

return 1;

}

if (victim==op) {

new_draw_info(NDI_UNIQUE, 0, op, "As insane as you are, I cannot "

"allow you to possess yourself.");

Line 916

Line 938

esrv_del_item(op->contr, curinv->count);

curinv = nextinv;

}

/* make the switch */

pl = op->contr;

victim->contr = pl;

Line 923

Line 946

victim->type = PLAYER;

SET_FLAG(victim, FLAG_WIZ);

/* remove all the skill/exp granting code - that was broken.

/* send the inventory to the client */

curinv = victim->inv;

while (curinv != NULL) {

Line 956

Line 976

return 1;

}

int command_patch(object *op, char *params) {

int command_patch (object *op, char *params)

{

char *arg,*arg2;

object *tmp;

Line 973

Line 991

new_draw_info(NDI_UNIQUE, 0,op,"Patch what values?");

return 1;

}

if((arg2=strchr(arg,' ')))

arg2++;

if (settings.real_wiz == FALSE)

Line 983

Line 1002

new_draw_info_format(NDI_UNIQUE, 0, op,

"(%s#%d)->%s=%s",tmp->name,tmp->count,arg,arg2);

}

return 1;

}

int command_remove (object *op, char *params)

int command_remove (object *op, char *params) {

{

object *tmp;

int from;

Line 996

Line 1015

new_draw_info(NDI_UNIQUE, 0,op,"Remove what object (nr)?");

return 1;

}

if (tmp->type == PLAYER) {

new_draw_info(NDI_UNIQUE, 0,op,"Unable to remove a player!");

return 1;

}

if (QUERY_FLAG(tmp, FLAG_REMOVED)) {

new_draw_info_format(NDI_UNIQUE, 0,op,"%s is already removed!",

query_name(tmp));

return 1;

}

if ( from != STACK_FROM_STACK )

/* Item is either stack top, or is a number thus is now stack top, let's remove it */

dm_stack_pop( op->contr );

/* Always work on the head - otherwise object will get in odd state */

if (tmp->head) tmp=tmp->head;

if (tmp->head)

tmp = tmp->head;

remove_ob(tmp);

return 1;

}

int command_free (object *op, char *params)

int command_free(object *op, char *params) {

{

object *tmp;

int from;

Line 1026

Line 1048

new_draw_info(NDI_UNIQUE, 0,op,"Free what object (nr)?");

return 1;

}

if ( from != STACK_FROM_STACK )

/* Item is either stack top, or is a number thus is now stack top, let's remove it */

dm_stack_pop( op->contr );

if ( !QUERY_FLAG( tmp, FLAG_REMOVED ) )

if (!QUERY_FLAG(tmp, FLAG_REMOVED)) {

{

new_draw_info( NDI_UNIQUE, 0, op, "Warning, item wasn't removed." );

remove_ob( tmp );

}

if (tmp->head) tmp=tmp->head;

if (tmp->head)

tmp = tmp->head;

free_object(tmp);

return 1;

}

/* This adds exp to a player. We now allow adding to a specific skill.

/**

* This adds exp to a player. We now allow adding to a specific skill.

int command_addexp (object *op, char *params)

int command_addexp(object *op, char *params) {

{

char buf[MAX_BUF], skill[MAX_BUF];

int i, q;

object *skillob=NULL;

Line 1070

Line 1093

new_draw_info_format(NDI_UNIQUE, 0,op,"Unable to find skill %s in %s", skill, buf);

return 1;

}

i = check_exp_adjust(skillob,i);

skillob->stats.exp += i;

calc_perm_exp(skillob);

player_lvl_adj(pl->ob, skillob);

}

pl->ob->stats.exp += i;

calc_perm_exp(pl->ob);

player_lvl_adj(pl->ob, NULL);

Line 1086

Line 1109

return 1;

}

int command_speed (object *op, char *params)

int command_speed(object *op, char *params) {

{

int i;

if(params==NULL || !sscanf(params, "%d", &i)) {

sprintf(errmsg,"Current speed is %ld",max_time);

new_draw_info(NDI_UNIQUE, 0,op,errmsg);

return 1;

}

set_max_time(i);

reset_sleep();

new_draw_info(NDI_UNIQUE, 0,op,"The speed is changed.");

return 1;

}

/**************************************************************************/

/* Mods made by Tyler Van Gorder, May 10-13, 1992. */

/* CSUChico : tvangod@cscihp.ecst.csuchico.edu */

/**************************************************************************/

int command_stats (object *op, char *params)

int command_stats(object *op, char *params) {

{

char thing[20];

player *pl;

char buf[MAX_BUF];

Line 1117

Line 1139

new_draw_info(NDI_UNIQUE, 0,op,"Who?");

return 1;

}

for(pl=first_player;pl!=NULL;pl=pl->next)

if(!strcmp(pl->ob->name,thing)) {

sprintf(buf,"Str : %-2d H.P. : %-4d MAX : %d",

Line 1151

Line 1174

return 1;

}

int command_abil (object *op, char *params)

int command_abil(object *op, char *params) {

{

char thing[20], thing2[20];

int iii;

player *pl;

Line 1166

Line 1188

new_draw_info(NDI_UNIQUE, 0,op,"Who?");

return 1;

}

if (thing2==NULL){

new_draw_info(NDI_UNIQUE, 0,op,"You can't change that.");

return 1;

}

if (iii<MIN_STAT||iii>MAX_STAT) {

new_draw_info(NDI_UNIQUE, 0,op,"Illegal range of stat.\n");

return 1;

}

for(pl=first_player;pl!=NULL;pl=pl->next)

for (pl = first_player; pl != NULL; pl = pl->next) {

if(!strcmp(pl->ob->name,thing)){

if (settings.real_wiz == FALSE)

SET_FLAG(pl->ob, FLAG_WAS_WIZ);

Line 1197

Line 1222

fix_player(pl->ob);

return 1;

}

new_draw_info(NDI_UNIQUE, 0,op,"No such player.");

return 1;

}

int command_reset (object *op, char *params)

int command_reset (object *op, char *params) {

{

mapstruct *m;

object *dummy = NULL, *tmp = NULL;

Line 1210

Line 1236

new_draw_info(NDI_UNIQUE, 0,op,"Reset what map [name]?");

return 1;

}

if (strcmp(params, ".") == 0)

params = op->map->path;

m = has_been_loaded(params);

Line 1223

Line 1250

LOG(llevError,"Tried to swap out map which was not in memory.\n");

return 0;

}

/* Only attempt to remove the player that is doing the reset, and not other

* Only attempt to remove the player that is doing the reset, and not other

* players or wiz's.

if (op->map == m ) {

Line 1239

Line 1268

swap_map(m);

}

if (m->in_memory == MAP_SWAPPED) {

LOG(llevDebug,"Resetting map %s.\n",m->path);

Line 1255

Line 1283

} else {

player *pl;

int playercount=0;

/* Need to re-insert player if swap failed for some reason */

if (tmp) {

insert_ob_in_map(op, m, NULL,0);

free_object(dummy);

}

new_draw_info(NDI_UNIQUE, 0,op,

"Reset failed, couldn't swap map, the following players are on it:");

for (pl=first_player; pl!=NULL; pl=pl->next) {

Line 1268

Line 1298

playercount++;

}

if (!playercount) new_draw_info(NDI_UNIQUE, 0, op,

if (!playercount)

new_draw_info(NDI_UNIQUE, 0, op,

"hmm, I don't see any other players on this map, something else is the problem.");

return 1;

}

int command_nowiz (object *op, char *params) /* 'noadm' is alias */

int command_nowiz(object *op, char *params) { /* 'noadm' is alias */

{

CLEAR_FLAG(op, FLAG_WIZ);

CLEAR_FLAG(op, FLAG_WIZPASS);

CLEAR_FLAG(op, FLAG_WIZCAST);

if (settings.real_wiz == TRUE)

CLEAR_FLAG(op, FLAG_WAS_WIZ);

if ( op->contr->hidden )

if (op->contr->hidden) {

{

new_draw_info(NDI_UNIQUE, 0,op, "You are no longer hidden from other players");

op->map->players++;

new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL,

"%s has entered the game.",op->name);

op->contr->hidden=0;

op->invisible=1;

}

} else

else

new_draw_info(NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");

return 1;

}

/**

* object *op is trying to become dm.

* pl_name is name supplied by player. Restrictive DM will make it harder

* for socket users to become DM - in that case, it will check for the players

Line 1315

Line 1343

sprintf (buf, "%s/%s", settings.confdir, DMFILE);

if ((dmfile = fopen(buf, "r")) == NULL) {

LOG (llevDebug, "Could not find DM file.\n");

return(0);

return 0;

}

while(fgets(line_buf, 160, dmfile) != NULL) {

if (line_buf[0]=='#') continue;

if (line_buf[0] == '#')

continue;

if (sscanf(line_buf,"%[^:]:%[^:]:%s\n",name, passwd, host)!=3) {

LOG(llevError,"Warning - malformed dm file entry: %s\n", line_buf);

}

} else if ((!strcmp(name, "*") || (pl_name && !strcmp(pl_name, name)))

else if ((!strcmp(name,"*") || (pl_name && !strcmp(pl_name, name)))

&& (!strcmp(passwd,"*") || !strcmp(passwd,pl_passwd)) &&

(!strcmp(host,"*") || !strcmp(host, pl_host))) {

fclose(dmfile);

Line 1334

Line 1363

}

int do_wizard_dm( object* op, char* params, int silent ) {

if ( !op->contr )

return 0;

Line 1350

Line 1378

SET_FLAG(op, FLAG_WIZPASS);

SET_FLAG(op, FLAG_WIZCAST);

new_draw_info(NDI_UNIQUE, 0,op, "Ok, you are the Dungeon Master!");

/* Remove setting flying here - that won't work, because next

* Remove setting flying here - that won't work, because next

* fix_player() is called that will get cleared - proper solution

* is probably something like a wiz_force which gives that and any

* other desired abilities.

Line 1370

Line 1399

}

/* Actual command to perhaps become dm. Changed aroun a bit in version 0.92.2

* Actual command to perhaps become dm. Changed aroun a bit in version 0.92.2

* - allow people on sockets to become dm, and allow better dm file

int command_dm(object *op, char *params) {

int command_dm (object *op, char *params)

if (!op->contr)

{

return 0;

if (!op->contr) return 0;

do_wizard_dm( op, params, 0 );

return 1;

}

int command_invisible (object *op, char *params)

int command_invisible(object *op, char *params) {

{

if (op) {

op->invisible+=100;

update_object(op,UP_OBJ_FACE);

new_draw_info(NDI_UNIQUE, 0,op,"You turn invisible.");

}

return 0;

}

Line 1398

Line 1427

* Returns NULL if 0 or more than one spell matches.

* Used for wizard's learn spell/prayer.

object* get_spell_by_name( const char* spell_name )

object *get_spell_by_name(const char *spell_name) {

{

archetype* ar;

archetype* found;

size_t length;

Line 1407

Line 1435

found = NULL;

length = strlen( spell_name );

for (ar = first_archetype ; ar != NULL; ar = ar->next )

for (ar = first_archetype; ar != NULL; ar = ar->next) {

{

if ( ar->clone.type != SPELL )

continue;

if ( strlen( ar->clone.name ) < length )

continue;

if ( !strncmp( ar->clone.name, spell_name, length ) )

if (!strncmp(ar->clone.name, spell_name, length)) {

{

if ( found )

/* Already had one, >1 match, return NULL. */

return NULL;

Line 1432

Line 1458

}

static int command_learn_spell_or_prayer (object *op, char *params,

int special_prayer)

int special_prayer) {

{

object *tmp;

if (op->contr == NULL || params == NULL)

Line 1445

Line 1470

"Could not find a spell by name of %s\n", params);

return 0;

}

do_learn_spell (op, tmp, special_prayer);

free_object(tmp);

return 1;

}

int command_learn_spell (object *op, char *params)

int command_learn_spell(object *op, char *params) {

{

return command_learn_spell_or_prayer (op, params, 0);

}

Line 1468

Line 1493

do_forget_spell (op, params);

return 1;

}

/* Lauwenmark */

/* Lists all plugins currently loaded with their IDs and full names. */

/**

* Lists all plugins currently loaded with their IDs and full names.

int command_listplugins(object *op, char *params)

{

plugins_display_list(op);

return 1;

}

/* Lauwenmark */

/* Loads the given plugin. The DM specifies the name of the library to load */

/**

/* (no pathname is needed). Do not ever attempt to load the same plugin more */

* Loads the given plugin. The DM specifies the name of the library to load (no

/* than once at a time, or bad things could happen. */

* pathname is needed). Do not ever attempt to load the same plugin more than

int command_loadplugin(object *op, char *params)

* once at a time, or bad things could happen.

{

int command_loadplugin(object *op, char *params) {

char buf[MAX_BUF];

if (params == NULL) {

Line 1498

Line 1526

new_draw_info(NDI_UNIQUE, 0, op, "Could not load plugin.");

return 1;

}

/* Lauwenmark */

/* Unloads the given plugin. The DM specified the ID of the library to */

/**

/* unload. Note that some things may behave strangely if the correct plugins */

* Unloads the given plugin. The DM specified the ID of the library to unload.

/* are not loaded. */

* Note that some things may behave strangely if the correct plugins are not

* loaded.

int command_unloadplugin(object *op, char *params)

{

if (params == NULL) {

Line 1521

Line 1551

* Let's see if that's authorized.

* Make sure to not tell anything to anyone.

int command_dmhide( object* op, char* params )

int command_dmhide(object *op, char *params) {

{

if ( !do_wizard_dm( op, params, 1 ) )

return 0;

Line 1531

Line 1560

return 1;

}

void dm_stack_pop( player* pl )

void dm_stack_pop(player *pl) {

{

if (!pl->stack_items || !pl->stack_position) {

if ( !pl->stack_items || !pl->stack_position )

{

new_draw_info( NDI_UNIQUE, 0, pl->ob, "Empty stack!" );

return;

}

Line 1543

Line 1570

new_draw_info_format( NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position );

}

/**

* Get current stack top item for player.

* Returns NULL if no stacked item.

Line 1551

Line 1577

* Ryo, august 2004

object* dm_stack_peek( player* pl )

object *dm_stack_peek(player *pl) {

{

object* ob;

if ( !pl->stack_position )

if (!pl->stack_position) {

{

new_draw_info( NDI_UNIQUE, 0, pl->ob, "Empty stack!" );

return NULL;

}

ob = find_object( pl->stack_items[ pl->stack_position - 1 ] );

if ( !ob )

if (!ob) {

{

new_draw_info( NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!" );

dm_stack_pop( pl );

return NULL;

Line 1577

Line 1600

* Inform player of position.

* Initializes variables if needed.

void dm_stack_push( player* pl, tag_t item )

void dm_stack_push(player *pl, tag_t item) {

{

if (!pl->stack_items) {

if ( !pl->stack_items )

{

pl->stack_items = ( tag_t* )malloc( sizeof( tag_t ) * STACK_SIZE );

memset( pl->stack_items, 0, sizeof( tag_t ) * STACK_SIZE );

}

if ( pl->stack_position == STACK_SIZE )

if (pl->stack_position == STACK_SIZE) {

{

new_draw_info( NDI_UNIQUE, 0, pl->ob, "Item stack full!" );

return;

}

Line 1615

Line 1635

* Ryo, august 2004

object* get_dm_object( player* pl, char** params, int* from )

object *get_dm_object(player *pl, char **params, int *from) {

{

int item_tag, item_position;

object* ob;

if ( !pl )

return NULL;

if ( ( !params ) || !( *params ) || ( '\0' == **params ) )

if (!params || !*params || **params == '\0') {

{

if ( from )

*from = STACK_FROM_TOP;

/* No parameter => get stack item */

Line 1636

Line 1654

( *params )++;

/* Next case: number => item tag */

if ( sscanf( *params, "%d", &item_tag ) )

if (sscanf(*params, "%d", &item_tag)) {

{

/* Move parameter to next item */

while ( isdigit( **params ) )

( *params )++;

/* And skip blanks, too */

while ( ' ' == ( **params ) )

while (**params == ' ')

( *params )++;

/* Get item */

ob = find_object( item_tag );

if ( !ob )

if (!ob) {

{

if ( from )

*from = STACK_FROM_NONE;

new_draw_info_format( NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag );

Line 1663

Line 1680

}

/* Next case: $number => stack item */

if ( sscanf( *params, "$%d", &item_position ) )

if (sscanf(*params, "$%d", &item_position)) {

{

/* Move parameter to next item */

( *params )++;

while ( isdigit( **params ) )

( *params )++;

while ( ' ' == ( **params ) )

while (**params == ' ')

( *params )++;

if ( item_position >= pl->stack_position )

if (item_position >= pl->stack_position) {

{

if ( from )

*from = STACK_FROM_NONE;

new_draw_info_format( NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position );

Line 1681

Line 1697

}

ob = find_object( pl->stack_items[ item_position ] );

if ( !ob )

if (!ob) {

{

if ( from )

*from = STACK_FROM_NONE;

new_draw_info_format( NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position );

Line 1690

Line 1705

}

if ( from )

*from = ( item_position < ( pl->stack_position - 1 ) ) ? STACK_FROM_STACK : STACK_FROM_TOP;

*from = item_position < pl->stack_position-1 ? STACK_FROM_STACK : STACK_FROM_TOP;

return ob;

}

/* Next case: 'me' => return pl->ob */

if ( !strncmp( *params, "me", 2 ) )

if (!strncmp(*params, "me", 2)) {

{

if ( from )

*from = STACK_FROM_NUMBER;

dm_stack_push( pl, pl->ob->count );

/* Skip to next token */

( *params ) += 2;

while ( ' ' == ( **params ) )

while (**params == ' ')

( *params )++;

return pl->ob;

Line 1718

Line 1732

/**

* Pop the stack top.

int command_stack_pop( object* op, char* params )

int command_stack_pop(object *op, char *params) {

{

dm_stack_pop( op->contr );

return 0;

}

Line 1727

Line 1740

/**

* Push specified item on stack.

int command_stack_push( object* op, char* params )

int command_stack_push(object *op, char *params) {

{

object* ob;

int from;

ob = get_dm_object( op->contr, &params, &from );

if ( ob && ( from != STACK_FROM_NUMBER ) )

if (ob && from != STACK_FROM_NUMBER)

/* Object was from stack, need to push it again */

dm_stack_push( op->contr, ob->count );

Line 1743

Line 1755

/**

* Displays stack contents.

int command_stack_list( object* op, char* params )

int command_stack_list(object *op, char *params) {

{

int item;

object* display;

player* pl = op->contr;

new_draw_info( NDI_UNIQUE,0, op, "Item stack contents: " );

for ( item = 0; item < pl->stack_position; item++ )

for (item = 0; item < pl->stack_position; item++) {

{

display = find_object( pl->stack_items[ item ] );

if ( display )

new_draw_info_format( NDI_UNIQUE, 0, op, " %d : %s [%d]", item, display->name, display->count );

Line 1767

Line 1777

/**

* Empty DM item stack.

int command_stack_clear( object* op, char* params )

int command_stack_clear(object *op, char *params) {

{

op->contr->stack_position = 0;

new_draw_info( NDI_UNIQUE, 0, op, "Item stack cleared." );

return 0;

Line 1786

Line 1795

* Ryo, august 2004

int command_diff( object* op, char* params )

int command_diff(object *op, char *params) {

{

object* left, *right, *top;

const char* diff;

int left_from, right_from;

Line 1795

Line 1803

top = NULL;

left = get_dm_object( op->contr, &params, &left_from );

if ( !left )

if (!left) {

{

new_draw_info( NDI_UNIQUE, 0, op, "Compare to what item?" );

return 0;

}

Line 1807

Line 1814

right = get_dm_object( op->contr, &params, &right_from );

if ( !right )

if (!right) {

{

new_draw_info( NDI_UNIQUE, 0, op, "Compare what item?" );

return 0;

}

new_draw_info( NDI_UNIQUE, 0, op, "Item difference:" );

if ( ( left_from == STACK_FROM_TOP ) && ( right_from == STACK_FROM_TOP ) )

if (left_from == STACK_FROM_TOP && right_from == STACK_FROM_TOP) {

{

/* Special case: both items were taken from stack top.

* Special case: both items were taken from stack top.

Override the behaviour, taking left as item just below top, if exists.

* Override the behaviour, taking left as item just below top, if exists.

See function description for why.

* See function description for why.

Besides, if we don't do anything, compare an item to itself, not really useful.

* Besides, if we don't do anything, compare an item to itself, not really useful.

if ( op->contr->stack_position > 1 )

if (op->contr->stack_position > 1) {

{

left = find_object( op->contr->stack_items[ op->contr->stack_position - 2 ] );

if ( left )

new_draw_info( NDI_UNIQUE, 0, op, "(Note: first item taken from undertop)" );

Line 1835

Line 1840

diff = get_ob_diff( left, right );

if ( !diff )

if (!diff) {

{

new_draw_info( NDI_UNIQUE, 0, op, "Objects are the same." );

return 0;

}

new_draw_info( NDI_UNIQUE, 0, op, diff );

return 0;

}

Legend:

line(s) removed in v.1.76
line(s) changed
	line(s) added in v.1.77

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:29