Difference for server/plugins.c from version 1.61 to 1.62

version 1.61

version 1.62

Line 1

* static char *rcsid_plugins_c =

* "$Id: plugins.c,v 1.61 2006/01/07 17:41:32 ryo_saeba Exp $";

* "$Id: plugins.c,v 1.62 2006/01/08 14:35:00 akirschbaum Exp $";

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

Line 156

object* tmp;

player *pl;

if (op->env != NULL)

if (op->env != NULL) {

{

tmp = is_player_inv(op->env);

if (!tmp)

if (!tmp) {

{

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

if (pl->ob->container == op->env)

break;

Line 171

Line 169

}

if (tmp)

esrv_send_item(tmp, op);

}

} else {

else

{

for (tmp = op->above; tmp != NULL; tmp = tmp->above)

if (tmp->type == PLAYER)

esrv_send_item(tmp, op);

Line 191

Line 187

object* tmp;

player *pl;

if (op->env == NULL)

if (op->env == NULL) {

{

/* no action necessary: remove_ob() notifies the client */

return;

}

tmp = is_player_inv(op->env);

if (!tmp)

if (!tmp) {

{

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

if (pl->ob->container == op->env)

break;

Line 217

Line 211

object *tmp, *next;

crossfire_plugin* plugin;

int rv = 0;

for (tmp = op->inv; tmp != NULL; tmp=next)

for (tmp = op->inv; tmp != NULL; tmp = next) {

{

next = tmp->below;

if ((tmp->type == EVENT_CONNECTOR)&&(tmp->subtype==eventcode))

if (tmp->type == EVENT_CONNECTOR && tmp->subtype == eventcode) {

{

LOG(llevDebug, "********** EVENT HANDLER **********\n");

LOG(llevDebug, " - Who am I :%s\n",op->name);

if (activator != NULL)

Line 236

Line 228

if (tmp->name != NULL)

LOG(llevDebug, " - Event options :%s\n", tmp->name);

if (tmp->title == NULL)

if (tmp->title == NULL) {

{

object *env = object_get_env_recursive(tmp);

LOG(llevError, "Event object without title at %d/%d in map %s\n", env->x, env->y, env->map->name);

send_removed_object(tmp);

remove_ob(tmp);

free_object(tmp);

}

} else if (tmp->slaying == NULL) {

else if (tmp->slaying == NULL)

{

object *env = object_get_env_recursive(tmp);

LOG(llevError, "Event object without slaying at %d/%d in map %s\n", env->x, env->y, env->map->name);

send_removed_object(tmp);

remove_ob(tmp);

free_object(tmp);

}

} else {

else

{

plugin = plugins_find_plugin(tmp->title);

if (plugin == NULL)

if (plugin == NULL) {

{

object *env = object_get_env_recursive(tmp);

LOG(llevError, "The requested plugin doesn't exit: %s at %d/%d in map %s\n", tmp->title, env->x, env->y, env->map->name);

send_removed_object(tmp);

remove_ob(tmp);

free_object(tmp);

}

} else {

else

{

int rvt = 0;

int *rv;

Line 291

Line 275

va_start(args,eventcode);

switch (eventcode)

switch (eventcode) {

{

case EVENT_BORN:

/*BORN: op*/

op = va_arg(args, object*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,op);

}

break;

case EVENT_CLOCK:

/*CLOCK: -*/

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode);

}

break;

case EVENT_CRASH:

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode);

}

break;

case EVENT_PLAYER_DEATH:

/*PLAYER_DEATH: op*/

op = va_arg(args, object*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,op);

}

break;

case EVENT_GKILL:

/*GKILL: op, hitter*/

op = va_arg(args, object*);

op2 = va_arg(args, object*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,op,op2);

}

break;

case EVENT_LOGIN:

/*LOGIN: pl, pl->socket.host*/

pl = va_arg(args, player*);

buf = va_arg(args, char*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,pl,buf);

}

break;

case EVENT_LOGOUT:

/*LOGOUT: pl, pl->socket.host*/

pl = va_arg(args, player*);

buf = va_arg(args, char*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,pl,buf);

}

break;

case EVENT_MAPENTER:

/*MAPENTER: op*/

op = va_arg(args, object*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,op);

}

break;

case EVENT_MAPLEAVE:

/*MAPLEAVE: op*/

op = va_arg(args, object*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,op);

}

break;

case EVENT_MAPRESET:

/*MAPRESET: map->path*/

buf = va_arg(args, char*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,buf);

}

break;

case EVENT_REMOVE:

/*REMOVE: op*/

op = va_arg(args, object*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,op);

}

break;

case EVENT_SHOUT:

/*SHOUT: op, parms, priority*/

op = va_arg(args, object*);

buf = va_arg(args, char*);

i = va_arg(args, int);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,op,buf,i);

}

break;

case EVENT_TELL:

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode);

}

break;

case EVENT_MUZZLE:

/*MUZZLE: op, parms*/

op = va_arg(args, object*);

buf = va_arg(args, char*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,op,buf);

}

break;

case EVENT_KICK:

/*KICK: op, parms*/

op = va_arg(args, object*);

buf = va_arg(args, char*);

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (cp->gevent[eventcode]!=NULL)

cp->gevent[eventcode](&rt,eventcode,op,buf);

}

Line 449

Line 431

/* Open the plugin lib and load the required functions */

ptr = plugins_dlopen(libfile);

if (ptr == NULL)

if (ptr == NULL) {

{

LOG(llevError, "Error trying to load %s: %s\n", libfile, plugins_dlerror());

return -1;

}

initfunc = (f_plug_init) plugins_dlsym(ptr, "initPlugin");

if (initfunc == NULL)

if (initfunc == NULL) {

{

LOG(llevError, "Plugin error while requesting %s.initPlugin: %s\n",

libfile, plugins_dlerror());

plugins_dlclose(ptr);

return -1;

}

propfunc = (f_plug_api) plugins_dlsym(ptr, "getPluginProperty");

if (propfunc == NULL)

if (propfunc == NULL) {

{

LOG(llevError, "Plugin error while requesting %s.getPluginProperty: %s\n",

libfile, plugins_dlerror());

plugins_dlclose(ptr);

return -1;

}

eventfunc = (f_plug_api) plugins_dlsym(ptr, "eventListener");

if (eventfunc == NULL)

if (eventfunc == NULL) {

{

LOG(llevError, "Plugin error while requesting %s.eventListener: %s\n",

libfile, plugins_dlerror());

plugins_dlclose(ptr);

return -1;

}

postfunc = (f_plug_postinit) plugins_dlsym(ptr, "postInitPlugin");

if (postfunc == NULL)

if (postfunc == NULL) {

{

LOG(llevError, "Plugin error while requesting %s.postInitPlugin: %s\n",

libfile, plugins_dlerror());

plugins_dlclose(ptr);

return -1;

}

closefunc = (f_plug_postinit) plugins_dlsym(ptr, "closePlugin");

if (postfunc == NULL)

if (postfunc == NULL) {

{

LOG(llevError, "Plugin error while requesting %s.closePlugin: %s\n",

libfile, plugins_dlerror());

plugins_dlclose(ptr);

return -1;

}

if (postfunc == NULL)

if (postfunc == NULL) {

{

LOG(llevError, "Plugin error while requesting %s.closePlugin: %s\n",

libfile, plugins_dlerror());

plugins_dlclose(ptr);

Line 513

Line 488

strcpy(cp->fullname,propfunc(&i, "FullName"));

cp->next = NULL;

cp->prev = NULL;

if (plugins_list == NULL)

if (plugins_list == NULL) {

{

plugins_list = cp;

}

} else {

else

for (ccp = plugins_list; ccp->next != NULL; ccp = ccp->next)

{

;

for(ccp=plugins_list; ccp->next!=NULL; ccp=ccp->next);

ccp->next = cp;

cp->prev = ccp;

}

Line 539

Line 512

va_start(args,type);

request_type = va_arg(args, int);

if (request_type == 0) /* By nr */

if (request_type == 0) { /* By nr */

{

fid = va_arg(args, int);

if ((fid < 0)||(fid >= NR_OF_HOOKS))

if (fid < 0 || fid >= NR_OF_HOOKS) {

{

rv = NULL;

*type = CFAPI_NONE;

}

} else {

else

{

rv = plug_hooks[fid].func;

*type = CFAPI_FUNC;

}

} else { /* by name */

else /* by name */

{

buf = va_arg(args, char*);

rv = NULL;

for(i=0; i<NR_OF_HOOKS; i++)

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

{

if (!strcmp(buf, plug_hooks[i].fname)) {

if (!strcmp(buf, plug_hooks[i].fname))

{

rv = plug_hooks[i].func;

*type = CFAPI_FUNC;

break;

}

if (rv == NULL)

if (rv == NULL) {

{

*type = CFAPI_NONE;

}

Line 582

Line 546

if (plugins_list == NULL)

return -1;

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (!strcmp(id, cp->id)) {

if(!strcmp(id,cp->id))

{

crossfire_plugin* n;

crossfire_plugin* p;

n = cp->next;

p = cp->prev;

plugins_dlclose(cp->libptr);

if (n != NULL)

if (n != NULL) {

{

if (p != NULL) {

if (p != NULL)

{

n->prev = p;

p->next = n;

}

} else {

else

{

n->prev = NULL;

plugins_list = n;

}

} else {

else

{

if (p != NULL)

p->next = NULL;

else

Line 626

Line 582

if (plugins_list == NULL)

return NULL;

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

if (!strcmp(id, cp->id)) {

if(!strcmp(id,cp->id))

{

return cp;

}

Line 650

Line 604

if (plugins_list == NULL)

return;

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

new_draw_info_format (NDI_UNIQUE, 0, op, "%s, %s", cp->id, cp->fullname);

}

Line 803

Line 756

case 0:

return settings.mapdir;

break;

case 1:

return settings.uniquedir;

break;

case 2:

return settings.tmpdir;

break;

case 3:

return settings.confdir;

break;

case 4:

return settings.localdir;

break;

case 5:

return settings.playerdir;

break;

case 6:

return settings.datadir;

break;

Line 851

Line 810

y = va_arg(args, int);

rv = get_empty_map(x,y);

break;

case 1:

name = va_arg(args, char*);

x = va_arg(args, int);

rv = ready_map_name(name, x);

break;

case 2:

m = va_arg(args, mapstruct*);

nx = va_arg(args, int);

ny = va_arg(args, int);

rv = get_map_from_coord(m, &nx,&ny);

break;

case 3:

rv = first_map;

break;

default:

*type = CFAPI_NONE;

va_end(args);

Line 905

Line 868

case 0:

rv = (char*)create_pathname(str);

break;

case 1:

rv = (char*)create_overlay_pathname(str);

break;

/*case 2:

rv = create_items_path(str);

break;*/

default:

rv = NULL;

*type = CFAPI_NONE;

Line 947

Line 913

*type = CFAPI_INT;

return &rv;

break;

case CFAPI_MAP_PROP_DIFFICULTY:

map = va_arg(args, mapstruct*);

rv = calculate_difficulty(map);

Line 954

Line 921

*type = CFAPI_INT;

return &rv;

break;

case CFAPI_MAP_PROP_PATH:

map = va_arg(args, mapstruct*);

buf = map->path;

Line 961

Line 929

va_end(args);

return buf;

break;

case CFAPI_MAP_PROP_TMPNAME:

map = va_arg(args, mapstruct*);

buf = map->tmpname;

Line 968

Line 937

va_end(args);

return buf;

break;

case CFAPI_MAP_PROP_NAME:

map = va_arg(args, mapstruct*);

buf = map->name;

Line 975

Line 945

va_end(args);

return buf;

break;

case CFAPI_MAP_PROP_RESET_TIME:

map = va_arg(args, mapstruct*);

rv = map->reset_time;

Line 982

Line 953

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_RESET_TIMEOUT:

map = va_arg(args, mapstruct*);

rv = map->reset_timeout;

Line 989

Line 961

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_PLAYERS:

map = va_arg(args, mapstruct*);

rv = map->players;

Line 996

Line 969

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_DARKNESS:

map = va_arg(args, mapstruct*);

rv = map->darkness;

Line 1003

Line 977

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_WIDTH:

map = va_arg(args, mapstruct*);

rv = map->width;

Line 1010

Line 985

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_HEIGHT:

map = va_arg(args, mapstruct*);

rv = map->height;

Line 1017

Line 993

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_ENTER_X:

map = va_arg(args, mapstruct*);

rv = map->enter_x;

Line 1024

Line 1001

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_ENTER_Y:

map = va_arg(args, mapstruct*);

rv = map->enter_y;

Line 1031

Line 1009

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_TEMPERATURE:

map = va_arg(args, mapstruct*);

rv = map->temp;

Line 1038

Line 1017

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_PRESSURE:

map = va_arg(args, mapstruct*);

rv = map->pressure;

Line 1045

Line 1025

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_HUMIDITY:

map = va_arg(args, mapstruct*);

rv = map->humid;

Line 1052

Line 1033

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_WINDSPEED:

map = va_arg(args, mapstruct*);

rv = map->windspeed;

Line 1059

Line 1041

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_WINDDIR:

map = va_arg(args, mapstruct*);

rv = map->winddir;

Line 1066

Line 1049

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_SKY:

map = va_arg(args, mapstruct*);

rv = map->sky;

Line 1073

Line 1057

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_WPARTX:

map = va_arg(args, mapstruct*);

rv = map->wpartx;

Line 1080

Line 1065

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_WPARTY:

map = va_arg(args, mapstruct*);

rv = map->wparty;

Line 1087

Line 1073

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_MESSAGE:

map = va_arg(args, mapstruct*);

buf = map->msg;

Line 1094

Line 1081

va_end(args);

return buf;

break;

case CFAPI_MAP_PROP_NEXT:

map = va_arg(args, mapstruct*);

*type = CFAPI_PMAP;

va_end(args);

return map->next;

break;

case CFAPI_MAP_PROP_REGION:

map = va_arg(args, mapstruct*);

*type = CFAPI_PREGION;

va_end(args);

return get_region_by_map(map);

break;

default:

*type = CFAPI_NONE;

va_end(args);

return NULL;

break;

}

Line 1133

Line 1126

va_end(args);

return &rv;

break;

case CFAPI_MAP_PROP_RESET_TIME:

map = va_arg(args, mapstruct*);

*type = CFAPI_NONE;

va_end(args);

return NULL;

break;

default:

*type = CFAPI_NONE;

va_end(args);

return NULL;

break;

}

void* cfapi_map_out_of_map(int* type, ...)

Line 1296

Line 1292

va_end(args);

rv = move_ob(op,direction,activator);

break;

case 1:

pl = va_arg(args, player*);

direction = va_arg(args, int);

Line 1353

Line 1350

op = va_arg(args, object*);

property = va_arg(args, int);

rv = NULL;

if (op != NULL)

if (op != NULL) {

switch (property)

{

case CFAPI_OBJECT_PROP_OB_ABOVE :

rv = op->above;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_OB_BELOW :

rv = op->below;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_NEXT_ACTIVE_OB :

rv = op->active_next;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_PREV_ACTIVE_OB :

rv = op->active_prev;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_INVENTORY :

rv = op->inv;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_ENVIRONMENT :

rv = op->env;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_HEAD :

rv = op->head;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_CONTAINER :

rv = op->container;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_MAP :

rv = op->map;

*type = CFAPI_PMAP;

break;

case CFAPI_OBJECT_PROP_COUNT :

rv = &op->count;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_REFCOUNT :

rv = &op->refcount;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_NAME :

rv = query_name(op);

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_NAME_PLURAL :

rv = (char*)op->name_pl;

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_TITLE :

rv = (char*)op->title;

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_RACE :

rv = (char*)op->race;

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_SLAYING :

rv = (char*)op->slaying;

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_SKILL :

rv = (char*)op->skill;

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_MESSAGE :

rv = (char*)op->msg;

if (rv == NULL)

rv = "";

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_LORE :

rv = (char*)op->lore;

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_X :

ri = op->x;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_Y :

ri = op->y;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_SPEED :

rv = &op->speed;

*type = CFAPI_DOUBLE;

break;

case CFAPI_OBJECT_PROP_SPEED_LEFT :

rv = &op->speed_left;

*type = CFAPI_DOUBLE;

break;

case CFAPI_OBJECT_PROP_NROF :

rv = &op->nrof;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_DIRECTION :

rv = &op->direction;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_FACING :

rv = &op->facing;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_TYPE :

rv = &op->type;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_SUBTYPE :

rv = &op->subtype;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_CLIENT_TYPE :

rv = &op->client_type;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_RESIST :

{

int idx;

Line 1484

Line 1510

}

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_ATTACK_TYPE :

rv = &op->attacktype;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_PATH_ATTUNED :

rv = &op->path_attuned;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_PATH_REPELLED :

rv = &op->path_repelled;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_PATH_DENIED :

rv = &op->path_denied;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_MATERIAL :

rv = &op->material;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_MATERIAL_NAME :

rv = (char*)op->materialname;

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_MAGIC :

rv = &op->magic;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_VALUE :

rv = &op->value;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_LEVEL :

rv = &op->level;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_LAST_HEAL :

rv = &op->last_heal;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_LAST_SP :

rv = &op->last_sp;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_LAST_GRACE :

rv = &op->last_grace;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_LAST_EAT :

rv = &op->last_eat;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_INVISIBLE_TIME :

rv = &op->invisible;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_PICK_UP :

rv = &op->pick_up;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_ITEM_POWER :

rv = &op->item_power;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_GEN_SP_ARMOUR :

rv = &op->gen_sp_armour;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_WEIGHT :

rv = &op->weight;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_WEIGHT_LIMIT :

rv = &op->weight_limit;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_CARRYING :

rv = &op->carrying;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_GLOW_RADIUS :

rv = &op->glow_radius;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_PERM_EXP :

rv = &op->perm_exp;

*type = CFAPI_LONG;

break;

case CFAPI_OBJECT_PROP_CURRENT_WEAPON :

rv = op->current_weapon;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_ENEMY :

rv = op->enemy;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_ATTACKED_BY :

rv = op->attacked_by;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_RUN_AWAY :

rv = &op->run_away;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_CHOSEN_SKILL :

rv = op->chosen_skill;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_HIDDEN :

rv = &op->hide;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_MOVE_STATUS :

rv = &op->move_status;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_MOVE_TYPE :

rv = &op->attack_movement;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_SPELL_ITEM :

rv = op->spellitem;

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_EXP_MULTIPLIER :

rv = &op->expmul;

*type = CFAPI_DOUBLE;

break;

case CFAPI_OBJECT_PROP_ARCHETYPE :

rv = op->arch;

*type = CFAPI_PARCH;

break;

case CFAPI_OBJECT_PROP_OTHER_ARCH :

rv = op->other_arch;

*type = CFAPI_PARCH;

break;

case CFAPI_OBJECT_PROP_CUSTOM_NAME :

rv = (char*)op->custom_name;

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_ANIM_SPEED :

rv = &op->anim_speed;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_FRIENDLY :

ri = is_friendly(op);

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_SHORT_NAME :

rv = (char*)query_short_name(op);

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_BASE_NAME :

{

int i;

Line 1645

Line 1710

*type = CFAPI_STRING;

}

break;

case CFAPI_OBJECT_PROP_MAGICAL :

ri = is_magical(op);

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_LUCK :

rv = &op->stats.luck;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_EXP :

rv = &op->stats.exp;

*type = CFAPI_LONG;

break;

case CFAPI_OBJECT_PROP_OWNER :

rv = get_owner(op);

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_PRESENT :

{

int stype;

rv = 0;

stype = va_arg(args, int);

switch (stype)

switch (stype) {

{

unsigned char ptype;

char* buf;

archetype* at;

case 0: /* present_in_ob */

ptype = (unsigned char)(va_arg(args, int));

rv = present_in_ob(ptype, op);

break;

case 1: /* present_in_ob_by_name */

ptype = (unsigned char)(va_arg(args, int));

buf = va_arg(args, char*);

rv = present_in_ob_by_name(ptype, buf, op);

break;

case 2: /* present_arch_in_ob */

at = va_arg(args, archetype*);

rv = present_arch_in_ob(at, op);

Line 1689

Line 1762

}

*type = CFAPI_POBJECT;

break;

case CFAPI_OBJECT_PROP_CHEATER :

ri = (QUERY_FLAG(op, FLAG_WAS_WIZ));

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_MERGEABLE :

{

object* op2;

Line 1702

Line 1777

}

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_PICKABLE :

{

object* op2;

Line 1712

Line 1788

}

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_FLAGS :

{

int fl;

Line 1722

Line 1799

}

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_STR:

ri = op->stats.Str;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_DEX:

ri = op->stats.Dex;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_CON:

ri = op->stats.Con;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_WIS:

ri = op->stats.Wis;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_INT:

ri = op->stats.Int;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_POW:

ri = op->stats.Pow;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_CHA:

ri = op->stats.Cha;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_WC:

ri = op->stats.wc;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_AC:

ri = op->stats.ac;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_HP:

ri = op->stats.hp;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_SP:

ri = op->stats.sp;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_GP:

ri = op->stats.grace;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_FP:

ri = op->stats.food;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_MAXHP:

ri = op->stats.maxhp;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_MAXSP:

ri = op->stats.maxsp;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_MAXGP:

ri = op->stats.maxgrace;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_DAM:

ri = op->stats.dam;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_GOD:

rv = (char*)determine_god(op);

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_ARCH_NAME:

rv = (char*)op->arch->name;

*type = CFAPI_STRING;

break;

case CFAPI_OBJECT_PROP_INVISIBLE:

ri = op->invisible;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_OBJECT_PROP_FACE :

ri = op->animation_id;

rv = &ri;

*type = CFAPI_INT;

break;

case CFAPI_PLAYER_PROP_IP :

rv = op->contr->socket.host;

*type = CFAPI_STRING;

break;

case CFAPI_PLAYER_PROP_MARKED_ITEM:

rv = find_marked_object(op);

*type = CFAPI_POBJECT;

break;

case CFAPI_PLAYER_PROP_PARTY:

rv = (op->contr ? op->contr->party : NULL);

*type = CFAPI_PPARTY;

Line 1841

Line 1942

*type = CFAPI_NONE;

break;

}

va_end(args);

return rv;

}

Line 1863

Line 1965

property = va_arg(args, int);

rv = NULL;

if (op != NULL && (!op->arch || (op != &op->arch->clone)))

if (op != NULL && (!op->arch || (op != &op->arch->clone))) {

switch (property)

{

case CFAPI_OBJECT_PROP_NAME :

Line 1871

Line 1973

FREE_AND_COPY(op->name, sarg);

send_changed_object(op);

break;

case CFAPI_OBJECT_PROP_NAME_PLURAL :

sarg = va_arg(args, char*);

FREE_AND_COPY(op->name_pl, sarg);

send_changed_object(op);

break;

case CFAPI_OBJECT_PROP_TITLE :

sarg = va_arg(args, char*);

FREE_AND_COPY(op->title, sarg);

break;

case CFAPI_OBJECT_PROP_RACE :

sarg = va_arg(args, char*);

FREE_AND_COPY(op->race, sarg);

break;

case CFAPI_OBJECT_PROP_SLAYING :

sarg = va_arg(args, char*);

FREE_AND_COPY(op->slaying, sarg);

break;

case CFAPI_OBJECT_PROP_SKILL :

sarg = va_arg(args, char*);

FREE_AND_COPY(op->skill, sarg);

break;

case CFAPI_OBJECT_PROP_MESSAGE :

sarg = va_arg(args, char*);

FREE_AND_COPY(op->msg, sarg);

break;

case CFAPI_OBJECT_PROP_LORE :

sarg = va_arg(args, char*);

FREE_AND_COPY(op->lore, sarg);

break;

case CFAPI_OBJECT_PROP_SPEED :

darg = va_arg(args, double);

op->speed = darg;

break;

case CFAPI_OBJECT_PROP_SPEED_LEFT :

darg = va_arg(args, double);

op->speed_left = darg;

break;

case CFAPI_OBJECT_PROP_NROF :

iarg = va_arg(args, int);

if (iarg < 0)

iarg = 0;

if (op->nrof > (uint32)iarg)

decrease_ob_nr(op,op->nrof-iarg);

else if (op->nrof < (uint32)iarg)

else if (op->nrof < (uint32)iarg) {

{

object* tmp;

player *pl;

op->nrof = iarg;

if (op->env != NULL)

if (op->env != NULL) {

{

tmp = is_player_inv(op->env);

if (!tmp)

if (!tmp) {

{

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

if (pl->ob->container == op->env) break;

if (pl->ob->container == op->env)

if (pl) tmp=pl->ob;

break;

else tmp=NULL;

if (pl)

tmp = pl->ob;

else

tmp = NULL;

}

else {

sum_weight(tmp);

Line 1946

Line 2058

}

break;

case CFAPI_OBJECT_PROP_DIRECTION :

iarg = va_arg(args, int);

op->direction = iarg;

break;

case CFAPI_OBJECT_PROP_FACING :

iarg = va_arg(args, int);

op->facing = iarg;

break;

case CFAPI_OBJECT_PROP_RESIST :

{

int iargbis = va_arg(args, int);

Line 1961

Line 2076

op->resist[iargbis] = iarg;

}

break;

case CFAPI_OBJECT_PROP_ATTACK_TYPE :

iarg = va_arg(args, int);

op->attacktype = iarg;

break;

case CFAPI_OBJECT_PROP_PATH_ATTUNED :

iarg = va_arg(args, int);

op->path_attuned = iarg;

break;

case CFAPI_OBJECT_PROP_PATH_REPELLED :

iarg = va_arg(args, int);

op->path_repelled = iarg;

break;

case CFAPI_OBJECT_PROP_PATH_DENIED :

iarg = va_arg(args, int);

op->path_denied = iarg;

break;

case CFAPI_OBJECT_PROP_MATERIAL :

iarg = va_arg(args, int);

op->material = iarg;

break;

case CFAPI_OBJECT_PROP_MATERIAL_NAME :

break;

case CFAPI_OBJECT_PROP_MAGIC :

iarg = va_arg(args, int);

op->magic = iarg;

break;

case CFAPI_OBJECT_PROP_VALUE :

iarg = va_arg(args, int);

op->value = iarg;

break;

case CFAPI_OBJECT_PROP_LEVEL :

iarg = va_arg(args, int);

op->level = iarg;

break;

case CFAPI_OBJECT_PROP_LAST_HEAL :

iarg = va_arg(args, int);

op->last_heal = iarg;

break;

case CFAPI_OBJECT_PROP_LAST_SP :

iarg = va_arg(args, int);

op->last_sp = iarg;

break;

case CFAPI_OBJECT_PROP_LAST_GRACE :

iarg = va_arg(args, int);

op->last_grace = iarg;

break;

case CFAPI_OBJECT_PROP_LAST_EAT :

iarg = va_arg(args, int);

op->last_eat = iarg;

break;

case CFAPI_OBJECT_PROP_INVISIBLE_TIME :

iarg = va_arg(args, int);

op->invisible = iarg;

break;

case CFAPI_OBJECT_PROP_PICK_UP :

iarg = va_arg(args, int);

op->pick_up = iarg;

break;

case CFAPI_OBJECT_PROP_ITEM_POWER :

iarg = va_arg(args, int);

op->item_power = iarg;

break;

case CFAPI_OBJECT_PROP_GEN_SP_ARMOUR :

iarg = va_arg(args, int);

op->gen_sp_armour = iarg;

break;

case CFAPI_OBJECT_PROP_WEIGHT :

iarg = va_arg(args, int);

if (op->weight != iarg) {

object* tmp;

player *pl;

op->weight = iarg;

if (op->env != NULL)

if (op->env != NULL) {

{

tmp = is_player_inv(op->env);

if (!tmp)

if (!tmp) {

{

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

if (pl->ob->container == op->env) break;

if (pl->ob->container == op->env)

if (pl) tmp=pl->ob;

break;

else tmp=NULL;

if (pl)

}

tmp = pl->ob;

else {

else

tmp = NULL;

} else {

sum_weight(tmp);

fix_player(tmp);

}

Line 2060

Line 2193

}

break;

case CFAPI_OBJECT_PROP_WEIGHT_LIMIT :

iarg = va_arg(args, int);

op->weight_limit = iarg;

break;

case CFAPI_OBJECT_PROP_GLOW_RADIUS :

iarg = va_arg(args, int);

op->glow_radius = iarg;

break;

case CFAPI_OBJECT_PROP_PERM_EXP :

larg = va_arg(args, long);

op->perm_exp = larg;

break;

case CFAPI_OBJECT_PROP_ENEMY :

oparg = va_arg(args, object*);

op->enemy = oparg;

break;

case CFAPI_OBJECT_PROP_RUN_AWAY :

iarg = va_arg(args, int);

op->run_away = iarg;

break;

case CFAPI_OBJECT_PROP_CHOSEN_SKILL :

oparg = va_arg(args, object*);

op->chosen_skill = oparg;

break;

case CFAPI_OBJECT_PROP_HIDDEN :

iarg = va_arg(args, int);

op->hide = iarg;

break;

case CFAPI_OBJECT_PROP_MOVE_STATUS :

iarg = va_arg(args, int);

op->move_status = iarg;

break;

case CFAPI_OBJECT_PROP_MOVE_TYPE :

iarg = va_arg(args, int);

op->attack_movement = iarg;

break;

case CFAPI_OBJECT_PROP_SPELL_ITEM :

oparg = va_arg(args, object*);

op->spellitem = oparg;

break;

case CFAPI_OBJECT_PROP_EXP_MULTIPLIER :

darg = va_arg(args, double);

op->expmul = darg;

break;

case CFAPI_OBJECT_PROP_CUSTOM_NAME :

sarg = va_arg(args, char*);

FREE_AND_COPY(op->custom_name, sarg);

send_changed_object(op);

break;

case CFAPI_OBJECT_PROP_ANIM_SPEED :

iarg = va_arg(args, int);

op->anim_speed = iarg;

break;

case CFAPI_OBJECT_PROP_FRIENDLY :

iarg = va_arg(args, int);

if ((iarg == 1) && (is_friendly(op) == 0))

if (iarg == 1 && is_friendly(op) == 0)

add_friendly_object(op);

else if ((iarg == 0) && (is_friendly(op) == 1))

else if (iarg == 0 && is_friendly(op) == 1)

remove_friendly_object(op);

break;

case CFAPI_OBJECT_PROP_LUCK :

iarg = va_arg(args, int);

op->stats.luck = iarg;

break;

case CFAPI_OBJECT_PROP_EXP :

{

char* skillname;

Line 2134

Line 2283

change_exp(op, larg, skillname, iarg);

}

break;

case CFAPI_OBJECT_PROP_OWNER :

oparg = va_arg(args, object*);

set_owner(op, oparg);

break;

case CFAPI_OBJECT_PROP_CHEATER :

set_cheat(op);

break;

case CFAPI_OBJECT_PROP_FLAGS :

{

int iargbis;

Line 2152

Line 2304

CLEAR_FLAG(op, iarg);

}

break;

case CFAPI_OBJECT_PROP_STR:

iarg = va_arg(args, int);

op->stats.Str=iarg;

break;

case CFAPI_OBJECT_PROP_DEX:

iarg = va_arg(args, int);

op->stats.Dex=iarg;

break;

case CFAPI_OBJECT_PROP_CON:

iarg = va_arg(args, int);

op->stats.Con=iarg;

break;

case CFAPI_OBJECT_PROP_WIS:

iarg = va_arg(args, int);

op->stats.Wis=iarg;

break;

case CFAPI_OBJECT_PROP_INT:

iarg = va_arg(args, int);

op->stats.Int=iarg;

break;

case CFAPI_OBJECT_PROP_POW:

iarg = va_arg(args, int);

op->stats.Pow=iarg;

break;

case CFAPI_OBJECT_PROP_CHA:

iarg = va_arg(args, int);

op->stats.Cha=iarg;

break;

case CFAPI_OBJECT_PROP_WC:

iarg = va_arg(args, int);

op->stats.wc=iarg;

break;

case CFAPI_OBJECT_PROP_AC:

iarg = va_arg(args, int);

op->stats.ac=iarg;

break;

case CFAPI_OBJECT_PROP_HP:

iarg = va_arg(args, int);

op->stats.hp=iarg;

break;

case CFAPI_OBJECT_PROP_SP:

iarg = va_arg(args, int);

op->stats.sp=iarg;

break;

case CFAPI_OBJECT_PROP_GP:

iarg = va_arg(args, int);

op->stats.grace=iarg;

break;

case CFAPI_OBJECT_PROP_FP:

iarg = va_arg(args, int);

op->stats.food=iarg;

break;

case CFAPI_OBJECT_PROP_MAXHP:

iarg = va_arg(args, int);

op->stats.maxhp=iarg;

break;

case CFAPI_OBJECT_PROP_MAXSP:

iarg = va_arg(args, int);

op->stats.maxsp=iarg;

break;

case CFAPI_OBJECT_PROP_MAXGP:

iarg = va_arg(args, int);

op->stats.maxgrace=iarg;

break;

case CFAPI_OBJECT_PROP_DAM:

iarg = va_arg(args, int);

op->stats.dam=iarg;

break;

case CFAPI_OBJECT_PROP_FACE:

iarg = va_arg(args, int);

op->animation_id = iarg;

update_object(op, UP_OBJ_FACE);

break;

case CFAPI_OBJECT_ANIMATION:

iarg = va_arg(args, int);

if (iarg!=-1)

if (iarg != -1) {

{

SET_ANIMATION(op,iarg);

}

update_object(op, UP_OBJ_FACE);

break;

case CFAPI_PLAYER_PROP_MARKED_ITEM:

if (op->contr)

if (op->contr) {

{

oparg = va_arg(args, object*);

op->contr->mark = oparg;

if (oparg)

op->contr->mark_count = oparg->count;

}

break;

case CFAPI_PLAYER_PROP_PARTY:

if (op->contr)

if (op->contr) {

{

partyarg = va_arg(args, partylist*);

op->contr->party = partyarg;

}

break;

default:

*type = CFAPI_NONE;

break;

}

va_end(args);

*type = CFAPI_NONE;

Line 2440

Line 2612

va_end(args);

if (kind == 0)

if (kind == 0) {

{

*type = CFAPI_POBJECT;

return object_create_clone(op);

}

} else {

else

{

object* tmp;

tmp = get_object();

copy_object(op,tmp);

Line 2473

Line 2642

ival = va_arg(args, int);

rv = find_object(ival);

break;

case 1:

sval = va_arg(args, char*);

rv = find_object_name(sval);

break;

case 2:

op = va_arg(args, object*);

ival = va_arg(args, int);

ival2 = va_arg(args, int);

rv = find_obj_by_type_subtype(op, ival, ival2);

break;

case 3:

op = va_arg(args, object*);

rv = is_player_inv(op);

break;

default:

rv = NULL;

*type = CFAPI_NONE;

Line 2511

Line 2684

va_end(args);

return get_object();

break;

case 1: /* Named object. Nearly the old plugin behavior, but we don't add artifact suffixes */

{

char* sval;

Line 2519

Line 2693

op = get_archetype_by_object_name(sval);

if (strncmp(query_name(op),ARCH_SINGULARITY, ARCH_SINGULARITY_LEN)==0)

if (strncmp(query_name(op), ARCH_SINGULARITY, ARCH_SINGULARITY_LEN) == 0) {

{

free_object(op);

/* Try with archetype names... */

op = get_archetype(sval);

if (strncmp(query_name(op),ARCH_SINGULARITY, ARCH_SINGULARITY_LEN)==0)

if (strncmp(query_name(op), ARCH_SINGULARITY, ARCH_SINGULARITY_LEN) == 0) {

{

free_object(op);

*type = CFAPI_NONE;

va_end(args);

Line 2560

Line 2732

op = va_arg(args, object*);

itype = va_arg(args, int);

switch (itype)

switch (itype) {

{

case 0:

map = va_arg(args, mapstruct*);

orig = va_arg(args, object*);

Line 2571

Line 2742

rv = insert_ob_in_map_at(op, map, orig, flag,x,y);

*type = CFAPI_POBJECT;

break;

case 1:

map = va_arg(args, mapstruct*);

orig = va_arg(args, object*);

Line 2578

Line 2750

rv = insert_ob_in_map(op, map, orig, flag);

*type = CFAPI_POBJECT;

break;

case 2:

arch_string = va_arg(args, char*);

replace_insert_ob_in_map(arch_string, op);

*type = CFAPI_NONE;

break;

case 3:

orig = va_arg(args, object*);

rv = insert_ob_in_ob(op, orig);

if (orig->type == PLAYER)

if (orig->type == PLAYER) {

{

esrv_send_item(orig,op);

}

*type = CFAPI_POBJECT;

Line 2707

Line 2880

op2 = va_arg(args, object*);

checktype = va_arg(args, int);

if (checktype == 0)

if (checktype == 0) {

{

check_inv(op,op2);

*type = CFAPI_NONE;

}

} else {

else

{

ret = check_inv_recursive(op,op2);

*type = CFAPI_POBJECT;

}

Line 2941

Line 3111

*type = CFAPI_INT;

return &rv;

break;

case 1:

x = va_arg(args, int);

y = va_arg(args, int);

map = va_arg(args, mapstruct*);

va_end(args);

if ((x<0)||(y<0))

if (x < 0 || y < 0) {

{

x = map->enter_x;

y = map->enter_y;

}

/* originator = get_object();

originator = get_object();

EXIT_PATH(originator)=add_string(map->path);

EXIT_X(originator)=x;

EXIT_Y(originator)=y;

Line 2959

Line 3130

/*enter_exit(op,originator);*/

insert_ob_in_map_at(op, map, NULL, 0, x, y);

/*printf("A Transfer: X=%d, Y=%d, MAP=%s\n",x,y,op->map->name);

free_object(originator);*/

free_object(originator);

*type = CFAPI_INT;

return &rv;

break;

Line 2989

Line 3161

case 0: /* By name, either exact or from query_name */

str = va_arg(args, char*);

rv = present_arch_in_ob(find_archetype(str),op);

if (rv == NULL)

if (rv == NULL) {

{

object* tmp;

/* Search by query_name instead */

for(tmp = op->inv; tmp; tmp = tmp->below)

for (tmp = op->inv; tmp; tmp = tmp->below) {

{

if (!strncmp(query_name(tmp),str,strlen(str)))

rv = tmp;

if (!strncmp(tmp->name,str,strlen(str)))

rv = tmp;

if (rv != NULL) break;

if (rv != NULL)

break;

}

break;

default:

rv = NULL;

break;

}

va_end(args);

if (rv == NULL)

if (rv == NULL) {

{

*type = CFAPI_NONE;

}

return rv;

Line 3027

Line 3198

author = va_arg(args, object*);

va_end(args);

if (QUERY_FLAG(op, FLAG_NO_DROP)) return NULL;

if (QUERY_FLAG(op, FLAG_NO_DROP))

return NULL;

drop(author,op);

if (author->type==PLAYER)

if (author->type == PLAYER) {

{

author->contr->count=0;

author->contr->socket.update_look=1;

}

Line 3084

Line 3255

msg = va_arg(args, char*);

va_end(args);

if ((!op) || (!msg))

if (!op || !msg)

return NULL;

sprintf(buf, "%s says: ",op->name);

strncat(buf, msg, MAX_BUF - strlen(buf)-1);

Line 3151

Line 3322

x = va_arg(args,int);

y = va_arg(args,int);

if (!out_of_map( map,x,y ))

if (!out_of_map(map, x, y)) {

{

int k;

object *tmp;

k = find_first_free_spot(who,map,x,y);

if (k==-1)

if (k == -1) {

{

result = 1;

return &result;

}

Line 3211

Line 3380

va_start(args, type);

arch = va_arg(args, archetype*);

prop = va_arg(args, int);

switch (prop)

switch (prop) {

{

case CFAPI_ARCH_PROP_NAME:

*type = CFAPI_STRING;

rv = (void*)arch->name;

break;

case CFAPI_ARCH_PROP_NEXT:

*type = CFAPI_PARCH;

rv = arch->next;

break;

case CFAPI_ARCH_PROP_HEAD:

*type = CFAPI_PARCH;

rv = arch->head;

break;

case CFAPI_ARCH_PROP_MORE:

*type = CFAPI_PARCH;

rv = arch->more;

break;

case CFAPI_ARCH_PROP_CLONE:

*type = CFAPI_POBJECT;

rv = &arch->clone;

break;

default:

*type = CFAPI_NONE;

rv = NULL;

Line 3261

Line 3434

*type = CFAPI_STRING;

rv = (void*)party->partyname;

break;

case CFAPI_PARTY_PROP_NEXT:

*type = CFAPI_PPARTY;

rv = (party?party->next:get_firstparty());

break;

case CFAPI_PARTY_PROP_PASSWORD:

*type = CFAPI_STRING;

rv = (void*)party->passwd;

break;

case CFAPI_PARTY_PROP_PLAYER:

*type = CFAPI_PPLAYER;

obarg = va_arg(args, object*);

pl = ( obarg ? obarg->contr : first_player );

rv = NULL;

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

if (pl->ob->contr->party == party)

if (pl->ob->contr->party == party) {

{

rv = (void*)pl;

break;

}

break;

default:

*type = CFAPI_NONE;

rv = NULL;

Line 3301

Line 3477

va_start(args, type);

reg = va_arg(args, region*);

prop = va_arg(args, int);

switch (prop)

switch (prop) {

{

case CFAPI_REGION_PROP_NAME:

*type = CFAPI_STRING;

rv = (void*)reg->name;

break;

case CFAPI_REGION_PROP_NEXT:

*type = CFAPI_PREGION;

rv = (reg?reg->next:first_region);

break;

case CFAPI_REGION_PROP_PARENT:

*type = CFAPI_PREGION;

rv = (void*)reg->parent;

break;

case CFAPI_REGION_PROP_LONGNAME:

*type = CFAPI_STRING;

rv = (void*)reg->longname;

break;

case CFAPI_REGION_PROP_MESSAGE:

*type = CFAPI_STRING;

rv = (void*)reg->msg;

break;

default:

*type = CFAPI_NONE;

rv = NULL;

Line 3351

Line 3531

if (plugins_list == NULL)

return NULL;

for(cp=plugins_list; cp != NULL; cp=cp->next)

for (cp = plugins_list; cp != NULL; cp = cp->next) {

{

rtn_cmd = cp->propfunc(&i, "command?");

return rtn_cmd;

}

Line 3383

Line 3562

return -1;

result = -1;

while((currentfile = readdir(plugdir)) != NULL)

while ((currentfile = readdir(plugdir)) != NULL) {

{

l = strlen(currentfile->d_name);

if (l > strlen(PLUGIN_SUFFIX))

if (l > strlen(PLUGIN_SUFFIX)) {

{

if (strcmp(currentfile->d_name+l-strlen(PLUGIN_SUFFIX), PLUGIN_SUFFIX) == 0) {

if (strcmp(currentfile->d_name+l-strlen(PLUGIN_SUFFIX), PLUGIN_SUFFIX) == 0)

{

strcpy(buf2,buf);

strcat(buf2,currentfile->d_name);

LOG(llevInfo," -> Loading plugin : %s\n",currentfile->d_name);

Legend:

line(s) removed in v.1.61
line(s) changed
	line(s) added in v.1.62

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