ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/plugins.c
(Generate patch)

Comparing deliantra/server/server/plugins.c (file contents):
Revision 1.1.1.2 by elmex, Wed Feb 22 18:03:23 2006 UTC vs.
Revision 1.14 by elmex, Sun Aug 13 17:16:04 2006 UTC

1/* 1/*
2 * static char *rcsid_plugins_c = 2 * static char *rcsid_plugins_c =
3 * "$Id: plugins.c,v 1.1.1.2 2006/02/22 18:03:23 elmex Exp $"; 3 * "$Id: plugins.c,v 1.14 2006/08/13 17:16:04 elmex dead $";
4 */ 4 */
5 5
6/*****************************************************************************/ 6/*****************************************************************************/
7/* CrossFire, A Multiplayer game for X-windows */ 7/* CrossFire, A Multiplayer game for X-windows */
8/* */ 8/* */
… …
127 127
128/*****************************************************************************/ 128/*****************************************************************************/
129/* NEW PLUGIN STUFF STARTS HERE */ 129/* NEW PLUGIN STUFF STARTS HERE */
130/*****************************************************************************/ 130/*****************************************************************************/
131 131
132static void plugin_load_original_map(mapstruct *map)
133{
134 execute_global_event (EVENT_MAPLOAD, map);
135}
136
137static void plugin_load_temporary_map(mapstruct *map)
138{
139 execute_global_event (EVENT_MAPIN, map);
140}
141
142static void plugin_clean_temporary_map(mapstruct *map)
143{
144 execute_global_event (EVENT_MAPCLEAN, map);
145}
146
147static void plugin_object_free(object *ob)
148{
149 execute_global_event (EVENT_FREE_OB, ob);
150}
151
132#ifdef WIN32 152#ifdef WIN32
133static const char *plugins_dlerror(void) 153static const char *plugins_dlerror(void)
134{ 154{
135 static char buf[256]; 155 static char buf[256];
136 DWORD err; 156 DWORD err;
… …
212 crossfire_plugin* plugin; 232 crossfire_plugin* plugin;
213 int rv = 0; 233 int rv = 0;
214 for (tmp = op->inv; tmp != NULL; tmp = next) { 234 for (tmp = op->inv; tmp != NULL; tmp = next) {
215 next = tmp->below; 235 next = tmp->below;
216 if (tmp->type == EVENT_CONNECTOR && tmp->subtype == eventcode) { 236 if (tmp->type == EVENT_CONNECTOR && tmp->subtype == eventcode) {
237#if 0
217 LOG(llevDebug, "********** EVENT HANDLER **********\n"); 238 LOG(llevDebug, "********** EVENT HANDLER **********\n");
218 LOG(llevDebug, " - Who am I :%s\n", op->name); 239 LOG(llevDebug, " - Who am I :%s\n", op->name);
219 if (activator != NULL) 240 if (activator != NULL)
220 LOG(llevDebug, " - Activator :%s\n", activator->name); 241 LOG(llevDebug, " - Activator :%s\n", activator->name);
221 if (third != NULL) 242 if (third != NULL)
… …
225 LOG(llevDebug, " - Event plugin :%s\n", tmp->title); 246 LOG(llevDebug, " - Event plugin :%s\n", tmp->title);
226 if (tmp->slaying != NULL) 247 if (tmp->slaying != NULL)
227 LOG(llevDebug, " - Event hook :%s\n", tmp->slaying); 248 LOG(llevDebug, " - Event hook :%s\n", tmp->slaying);
228 if (tmp->name != NULL) 249 if (tmp->name != NULL)
229 LOG(llevDebug, " - Event options :%s\n", tmp->name); 250 LOG(llevDebug, " - Event options :%s\n", tmp->name);
251#endif
230 252
231 if (tmp->title == NULL) { 253 if (tmp->title == NULL) {
232 object *env = object_get_env_recursive(tmp); 254 object *env = object_get_env_recursive(tmp);
233 LOG(llevError, "Event object without title at %d/%d in map %s\n", env->x, env->y, env->map->name); 255 LOG(llevError, "Event object without title at %d/%d in map %s\n", env->x, env->y, env->map->name);
234 send_removed_object(tmp); 256 send_removed_object(tmp);
… …
242 free_object(tmp); 264 free_object(tmp);
243 } else { 265 } else {
244 plugin = plugins_find_plugin(tmp->title); 266 plugin = plugins_find_plugin(tmp->title);
245 if (plugin == NULL) { 267 if (plugin == NULL) {
246 object *env = object_get_env_recursive(tmp); 268 object *env = object_get_env_recursive(tmp);
247 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); 269 LOG(llevError, "The requested plugin doesn't exist: %s at %d/%d in map %s\n", tmp->title, env->x, env->y, env->map->name);
248 send_removed_object(tmp); 270 send_removed_object(tmp);
249 remove_ob(tmp); 271 remove_ob(tmp);
250 free_object(tmp); 272 free_object(tmp);
251 } else { 273 } else {
252 int rvt = 0; 274 int rvt = 0;
253 int *rv; 275 int *rv;
254 276
255 rv = plugin->eventfunc(&rvt, op, eventcode, activator, third, message, fix, tmp->slaying, tmp->name); 277 rv = plugin->eventfunc(&rvt, op, eventcode, activator, third, message, fix, tmp->slaying, tmp->name, tmp);
256 return *rv; 278 return *rv;
257 } 279 }
258 } 280 }
259 } 281 }
260 } 282 }
… …
264int execute_global_event(int eventcode, ...) 286int execute_global_event(int eventcode, ...)
265{ 287{
266 va_list args; 288 va_list args;
267 object* op; 289 object* op;
268 object* op2; 290 object* op2;
291 object* op3;
292 mapstruct *map;
269 player* pl; 293 player* pl;
270 char* buf; 294 char* buf;
271 int i, rt; 295 int i, rt, retval = 0, *tmpretval = NULL, fix;
272 crossfire_plugin* cp; 296 crossfire_plugin* cp;
273 if (plugins_list == NULL) 297 if (plugins_list == NULL)
274 return -1; 298 return -1;
275 299
276 va_start(args, eventcode); 300 va_start(args, eventcode);
277 301
278 switch (eventcode) { 302 switch (eventcode) {
279 case EVENT_BORN:
280 /*BORN: op*/
281 op = va_arg(args, object*);
282 for (cp = plugins_list; cp != NULL; cp = cp->next) {
283 if (cp->gevent[eventcode] != NULL)
284 cp->gevent[eventcode](&rt, eventcode, op);
285 }
286 break;
287 303
288 case EVENT_CLOCK: 304 case EVENT_CLOCK:
289 /*CLOCK: -*/ 305 case EVENT_CRASH:
306 case EVENT_TELL:
307 /* no additional arguments */
290 for (cp = plugins_list; cp != NULL; cp = cp->next) { 308 for (cp = plugins_list; cp != NULL; cp = cp->next) {
291 if (cp->gevent[eventcode] != NULL) 309 if (cp->gevent[eventcode] != NULL)
292 cp->gevent[eventcode](&rt, eventcode); 310 cp->gevent[eventcode](&rt, eventcode);
293 } 311 }
294 break; 312 break;
295 313
296 case EVENT_CRASH: 314 case EVENT_PLAYER_LOAD:
315 case EVENT_PLAYER_SAVE:
316 /* object, filename */
317 op = va_arg(args, object*);
318 buf = va_arg(args, char*);
297 for (cp = plugins_list; cp != NULL; cp = cp->next) { 319 for (cp = plugins_list; cp != NULL; cp = cp->next) {
298 if (cp->gevent[eventcode] != NULL) 320 if (cp->gevent[eventcode] != NULL)
299 cp->gevent[eventcode](&rt, eventcode); 321 cp->gevent[eventcode](&rt, eventcode, op, buf);
300 } 322 }
301 break; 323 break;
302 324
325 case EVENT_MAPLOAD:
326 case EVENT_MAPOUT:
327 case EVENT_MAPIN:
328 case EVENT_MAPCLEAN:
329 /* map argument */
330 map = va_arg(args, mapstruct*);
331 for (cp = plugins_list; cp != NULL; cp = cp->next) {
332 if (cp->gevent[eventcode] != NULL)
333 cp->gevent[eventcode](&rt, eventcode, map);
334 }
335 break;
336
337 case EVENT_REMOVE:
338 case EVENT_MAPENTER:
339 case EVENT_MAPLEAVE:
340 case EVENT_BORN:
303 case EVENT_PLAYER_DEATH: 341 case EVENT_PLAYER_DEATH:
304 /*PLAYER_DEATH: op*/ 342 case EVENT_FREE_OB:
343 /* op argument */
305 op = va_arg(args, object*); 344 op = va_arg(args, object*);
306 for (cp = plugins_list; cp != NULL; cp = cp->next) { 345 for (cp = plugins_list; cp != NULL; cp = cp->next) {
307 if (cp->gevent[eventcode] != NULL) 346 if (cp->gevent[eventcode] != NULL)
308 cp->gevent[eventcode](&rt, eventcode, op); 347 cp->gevent[eventcode](&rt, eventcode, op);
309 } 348 }
… …
337 if (cp->gevent[eventcode] != NULL) 376 if (cp->gevent[eventcode] != NULL)
338 cp->gevent[eventcode](&rt, eventcode, pl, buf); 377 cp->gevent[eventcode](&rt, eventcode, pl, buf);
339 } 378 }
340 break; 379 break;
341 380
342 case EVENT_MAPENTER:
343 /*MAPENTER: op*/
344 op = va_arg(args, object*);
345 for (cp = plugins_list; cp != NULL; cp = cp->next) {
346 if (cp->gevent[eventcode] != NULL)
347 cp->gevent[eventcode](&rt, eventcode, op);
348 }
349 break;
350
351 case EVENT_MAPLEAVE:
352 /*MAPLEAVE: op*/
353 op = va_arg(args, object*);
354 for (cp = plugins_list; cp != NULL; cp = cp->next) {
355 if (cp->gevent[eventcode] != NULL)
356 cp->gevent[eventcode](&rt, eventcode, op);
357 }
358 break;
359
360 case EVENT_MAPRESET: 381 case EVENT_MAPRESET:
361 /*MAPRESET: map->path*/ 382 /*MAPRESET: map->path*/
362 buf = va_arg(args, char*); 383 buf = va_arg(args, char*);
363 for (cp = plugins_list; cp != NULL; cp = cp->next) { 384 for (cp = plugins_list; cp != NULL; cp = cp->next) {
364 if (cp->gevent[eventcode] != NULL) 385 if (cp->gevent[eventcode] != NULL)
365 cp->gevent[eventcode](&rt, eventcode, buf); 386 cp->gevent[eventcode](&rt, eventcode, buf);
366 }
367 break;
368
369 case EVENT_REMOVE:
370 /*REMOVE: op*/
371 op = va_arg(args, object*);
372 for (cp = plugins_list; cp != NULL; cp = cp->next) {
373 if (cp->gevent[eventcode] != NULL)
374 cp->gevent[eventcode](&rt, eventcode, op);
375 } 387 }
376 break; 388 break;
377 389
378 case EVENT_SHOUT: 390 case EVENT_SHOUT:
379 /*SHOUT: op, parms, priority*/ 391 /*SHOUT: op, parms, priority*/
… …
384 if (cp->gevent[eventcode] != NULL) 396 if (cp->gevent[eventcode] != NULL)
385 cp->gevent[eventcode](&rt, eventcode, op, buf, i); 397 cp->gevent[eventcode](&rt, eventcode, op, buf, i);
386 } 398 }
387 break; 399 break;
388 400
389 case EVENT_TELL:
390 for (cp = plugins_list; cp != NULL; cp = cp->next) {
391 if (cp->gevent[eventcode] != NULL)
392 cp->gevent[eventcode](&rt, eventcode);
393 }
394 break;
395
396 case EVENT_MUZZLE: 401 case EVENT_MUZZLE:
397 /*MUZZLE: op, parms*/ 402 /*MUZZLE: op, parms*/
398 op = va_arg(args, object*); 403 op = va_arg(args, object*);
399 buf = va_arg(args, char*); 404 buf = va_arg(args, char*);
400 for (cp = plugins_list; cp != NULL; cp = cp->next) { 405 for (cp = plugins_list; cp != NULL; cp = cp->next) {
… …
410 for (cp = plugins_list; cp != NULL; cp = cp->next) { 415 for (cp = plugins_list; cp != NULL; cp = cp->next) {
411 if (cp->gevent[eventcode] != NULL) 416 if (cp->gevent[eventcode] != NULL)
412 cp->gevent[eventcode](&rt, eventcode, op, buf); 417 cp->gevent[eventcode](&rt, eventcode, op, buf);
413 } 418 }
414 break; 419 break;
420
421 case EVENT_FIND_UNARMED_SKILL:
422 op = va_arg(args, object*);
423 for (cp = plugins_list; cp != NULL; cp = cp->next) {
424 if (cp->gevent[eventcode] != NULL)
425 if ((tmpretval = cp->gevent[eventcode](&rt, eventcode, op)) && *tmpretval > 0) {
426 retval = *tmpretval;
427 }
428 }
429 break;
430
431 case EVENT_PLAYER_USE_SKILL:
432 case EVENT_MONSTER_USE_SKILL:
433 op = va_arg(args, object*);
434 op2 = va_arg(args, object*);
435 op3 = va_arg(args, object*);
436 fix = va_arg(args, int);
437 buf = va_arg(args, char*);
438 for (cp = plugins_list; cp != NULL; cp = cp->next) {
439 if (cp->gevent[eventcode] != NULL)
440 if ((tmpretval = cp->gevent[eventcode](&rt, eventcode, op, op2, op3, fix, buf)) && *tmpretval != 0) {
441 retval = *tmpretval;
442 }
443 }
444 break;
445
446 case EVENT_CAST_SPELL:
447 op = va_arg(args, object*);
448 op2 = va_arg(args, object*);
449 op3 = va_arg(args, object*);
450 fix = va_arg(args, int);
451 buf = va_arg(args, char*);
452 for (cp = plugins_list; cp != NULL; cp = cp->next) {
453 if (cp->gevent[eventcode] != NULL)
454 if ((tmpretval = cp->gevent[eventcode](&rt, eventcode, op, op2, op3, fix, buf)) && *tmpretval != 0) {
455 retval = *tmpretval;
456 break; /* The first who did something wins! */
457 }
458 }
459 break;
460
461 case EVENT_EXTCMD:
462 /*KICK: op, parms*/
463 pl = va_arg (args, player *);
464 buf = va_arg (args, char *);
465 i = va_arg (args, int);
466 for (cp = plugins_list; cp != NULL; cp = cp->next) {
467 if (cp->gevent[eventcode] != NULL)
468 cp->gevent[eventcode](&rt, eventcode, pl, buf, i, buf);
469 }
470 break;
415 } 471 }
416 va_end(args); 472 va_end(args);
473
417 return 0; 474 return retval;
418} 475}
419 476
420int plugins_init_plugin(const char* libfile) 477int plugins_init_plugin(const char* libfile)
421{ 478{
422 LIBPTRTYPE ptr; 479 LIBPTRTYPE ptr;
… …
426 f_plug_postinit postfunc; 483 f_plug_postinit postfunc;
427 f_plug_postinit closefunc; 484 f_plug_postinit closefunc;
428 int i; 485 int i;
429 crossfire_plugin* cp; 486 crossfire_plugin* cp;
430 crossfire_plugin* ccp; 487 crossfire_plugin* ccp;
488
489 load_original_map_callback = plugin_load_original_map;
490 load_temporary_map_callback = plugin_load_temporary_map;
491 clean_temporary_map_callback = plugin_clean_temporary_map;
492 object_free_callback = plugin_object_free;
431 493
432 /* Open the plugin lib and load the required functions */ 494 /* Open the plugin lib and load the required functions */
433 ptr = plugins_dlopen(libfile); 495 ptr = plugins_dlopen(libfile);
434 if (ptr == NULL) { 496 if (ptr == NULL) {
435 LOG(llevError, "Error trying to load %s: %s\n", libfile, plugins_dlerror()); 497 LOG(llevError, "Error trying to load %s: %s\n", libfile, plugins_dlerror());
… …
1397 rv = op->map; 1459 rv = op->map;
1398 *type = CFAPI_PMAP; 1460 *type = CFAPI_PMAP;
1399 break; 1461 break;
1400 1462
1401 case CFAPI_OBJECT_PROP_COUNT: 1463 case CFAPI_OBJECT_PROP_COUNT:
1402 rv = &op->count; 1464 ri = op->count; rv = &ri;
1403 *type = CFAPI_INT; 1465 *type = CFAPI_INT;
1404 break; 1466 break;
1405 1467
1406 case CFAPI_OBJECT_PROP_REFCOUNT: 1468 case CFAPI_OBJECT_PROP_REFCOUNT:
1407 rv = &op->refcount; 1469 ri = op->refcount; rv = &ri;
1408 *type = CFAPI_INT; 1470 *type = CFAPI_INT;
1409 break; 1471 break;
1410 1472
1411 case CFAPI_OBJECT_PROP_NAME: 1473 case CFAPI_OBJECT_PROP_NAME:
1412 rv = query_name(op); 1474 rv = query_name(op);
… …
1471 rv = &op->speed_left; 1533 rv = &op->speed_left;
1472 *type = CFAPI_DOUBLE; 1534 *type = CFAPI_DOUBLE;
1473 break; 1535 break;
1474 1536
1475 case CFAPI_OBJECT_PROP_NROF: 1537 case CFAPI_OBJECT_PROP_NROF:
1476 rv = &op->nrof; 1538 ri = op->nrof; rv = &ri;
1477 *type = CFAPI_INT; 1539 *type = CFAPI_INT;
1478 break; 1540 break;
1479 1541
1480 case CFAPI_OBJECT_PROP_DIRECTION: 1542 case CFAPI_OBJECT_PROP_DIRECTION:
1481 rv = &op->direction; 1543 ri = op->direction; rv = &ri;
1482 *type = CFAPI_INT; 1544 *type = CFAPI_INT;
1483 break; 1545 break;
1484 1546
1485 case CFAPI_OBJECT_PROP_FACING: 1547 case CFAPI_OBJECT_PROP_FACING:
1486 rv = &op->facing; 1548 ri = op->facing; rv = &ri;
1487 *type = CFAPI_INT; 1549 *type = CFAPI_INT;
1488 break; 1550 break;
1489 1551
1490 case CFAPI_OBJECT_PROP_TYPE: 1552 case CFAPI_OBJECT_PROP_TYPE:
1491 rv = &op->type; 1553 ri = op->type; rv = &ri;
1492 *type = CFAPI_INT; 1554 *type = CFAPI_INT;
1493 break; 1555 break;
1494 1556
1495 case CFAPI_OBJECT_PROP_SUBTYPE: 1557 case CFAPI_OBJECT_PROP_SUBTYPE:
1496 rv = &op->subtype; 1558 ri = op->subtype; rv = &ri;
1497 *type = CFAPI_INT; 1559 *type = CFAPI_INT;
1498 break; 1560 break;
1499 1561
1500 case CFAPI_OBJECT_PROP_CLIENT_TYPE: 1562 case CFAPI_OBJECT_PROP_CLIENT_TYPE:
1501 rv = &op->client_type; 1563 ri = op->client_type; rv = &ri;
1502 *type = CFAPI_INT; 1564 *type = CFAPI_INT;
1503 break; 1565 break;
1504 1566
1505 case CFAPI_OBJECT_PROP_RESIST: 1567 case CFAPI_OBJECT_PROP_RESIST:
1506 { 1568 {
1507 int idx; 1569 int idx;
1508 idx = va_arg(args, int); 1570 idx = va_arg(args, int);
1509 rv = &op->resist[idx]; 1571 ri = op->resist[idx]; rv = &ri;
1510 } 1572 }
1511 *type = CFAPI_INT16; 1573 *type = CFAPI_INT;
1512 break; 1574 break;
1513 1575
1514 case CFAPI_OBJECT_PROP_ATTACK_TYPE: 1576 case CFAPI_OBJECT_PROP_ATTACK_TYPE:
1515 rv = &op->attacktype; 1577 ri = op->attacktype; rv = &ri;
1516 *type = CFAPI_INT; 1578 *type = CFAPI_INT;
1517 break; 1579 break;
1518 1580
1519 case CFAPI_OBJECT_PROP_PATH_ATTUNED: 1581 case CFAPI_OBJECT_PROP_PATH_ATTUNED:
1520 rv = &op->path_attuned; 1582 ri = op->path_attuned; rv = &ri;
1521 *type = CFAPI_INT; 1583 *type = CFAPI_INT;
1522 break; 1584 break;
1523 1585
1524 case CFAPI_OBJECT_PROP_PATH_REPELLED: 1586 case CFAPI_OBJECT_PROP_PATH_REPELLED:
1525 rv = &op->path_repelled; 1587 ri = op->path_repelled; rv = &ri;
1526 *type = CFAPI_INT; 1588 *type = CFAPI_INT;
1527 break; 1589 break;
1528 1590
1529 case CFAPI_OBJECT_PROP_PATH_DENIED: 1591 case CFAPI_OBJECT_PROP_PATH_DENIED:
1530 rv = &op->path_denied; 1592 ri = op->path_denied; rv = &ri;
1531 *type = CFAPI_INT; 1593 *type = CFAPI_INT;
1532 break; 1594 break;
1533 1595
1534 case CFAPI_OBJECT_PROP_MATERIAL: 1596 case CFAPI_OBJECT_PROP_MATERIAL:
1535 rv = &op->material; 1597 ri = op->material; rv = &ri;
1536 *type = CFAPI_INT; 1598 *type = CFAPI_INT;
1537 break; 1599 break;
1538 1600
1539 case CFAPI_OBJECT_PROP_MATERIAL_NAME: 1601 case CFAPI_OBJECT_PROP_MATERIAL_NAME:
1540 rv = (char*)op->materialname; 1602 rv = (char*)op->materialname;
1541 *type = CFAPI_STRING; 1603 *type = CFAPI_STRING;
1542 break; 1604 break;
1543 1605
1544 case CFAPI_OBJECT_PROP_MAGIC: 1606 case CFAPI_OBJECT_PROP_MAGIC:
1545 rv = &op->magic; 1607 ri = op->magic; rv = &ri;
1546 *type = CFAPI_INT; 1608 *type = CFAPI_INT;
1547 break; 1609 break;
1548 1610
1549 case CFAPI_OBJECT_PROP_VALUE: 1611 case CFAPI_OBJECT_PROP_VALUE:
1550 rv = &op->value; 1612 ri = op->value; rv = &ri;
1551 *type = CFAPI_INT; 1613 *type = CFAPI_INT;
1552 break; 1614 break;
1553 1615
1554 case CFAPI_OBJECT_PROP_LEVEL: 1616 case CFAPI_OBJECT_PROP_LEVEL:
1555 rv = &op->level; 1617 ri = op->level; rv = &ri;
1556 *type = CFAPI_INT; 1618 *type = CFAPI_INT;
1557 break; 1619 break;
1558 1620
1559 case CFAPI_OBJECT_PROP_LAST_HEAL: 1621 case CFAPI_OBJECT_PROP_LAST_HEAL:
1560 rv = &op->last_heal; 1622 ri = op->last_heal; rv = &ri;
1561 *type = CFAPI_INT; 1623 *type = CFAPI_INT;
1562 break; 1624 break;
1563 1625
1564 case CFAPI_OBJECT_PROP_LAST_SP: 1626 case CFAPI_OBJECT_PROP_LAST_SP:
1565 rv = &op->last_sp; 1627 ri = op->last_sp; rv = &ri;
1566 *type = CFAPI_INT; 1628 *type = CFAPI_INT;
1567 break; 1629 break;
1568 1630
1569 case CFAPI_OBJECT_PROP_LAST_GRACE: 1631 case CFAPI_OBJECT_PROP_LAST_GRACE:
1570 rv = &op->last_grace; 1632 ri = op->last_grace; rv = &ri;
1571 *type = CFAPI_INT; 1633 *type = CFAPI_INT;
1572 break; 1634 break;
1573 1635
1574 case CFAPI_OBJECT_PROP_LAST_EAT: 1636 case CFAPI_OBJECT_PROP_LAST_EAT:
1575 rv = &op->last_eat; 1637 ri = op->last_eat; rv = &ri;
1576 *type = CFAPI_INT; 1638 *type = CFAPI_INT;
1577 break; 1639 break;
1578 1640
1579 case CFAPI_OBJECT_PROP_INVISIBLE_TIME: 1641 case CFAPI_OBJECT_PROP_INVISIBLE_TIME:
1580 rv = &op->invisible; 1642 ri = op->invisible; rv = &ri;
1581 *type = CFAPI_INT; 1643 *type = CFAPI_INT;
1582 break; 1644 break;
1583 1645
1584 case CFAPI_OBJECT_PROP_PICK_UP: 1646 case CFAPI_OBJECT_PROP_PICK_UP:
1585 rv = &op->pick_up; 1647 ri = op->pick_up; rv = &ri;
1586 *type = CFAPI_INT; 1648 *type = CFAPI_INT;
1587 break; 1649 break;
1588 1650
1589 case CFAPI_OBJECT_PROP_ITEM_POWER: 1651 case CFAPI_OBJECT_PROP_ITEM_POWER:
1590 rv = &op->item_power; 1652 ri = op->item_power; rv = &ri;
1591 *type = CFAPI_INT; 1653 *type = CFAPI_INT;
1592 break; 1654 break;
1593 1655
1594 case CFAPI_OBJECT_PROP_GEN_SP_ARMOUR: 1656 case CFAPI_OBJECT_PROP_GEN_SP_ARMOUR:
1595 rv = &op->gen_sp_armour; 1657 ri = op->gen_sp_armour; rv = &ri;
1596 *type = CFAPI_INT; 1658 *type = CFAPI_INT;
1597 break; 1659 break;
1598 1660
1599 case CFAPI_OBJECT_PROP_WEIGHT: 1661 case CFAPI_OBJECT_PROP_WEIGHT:
1600 rv = &op->weight; 1662 ri = op->weight; rv = &ri;
1601 *type = CFAPI_INT; 1663 *type = CFAPI_INT;
1602 break; 1664 break;
1603 1665
1604 case CFAPI_OBJECT_PROP_WEIGHT_LIMIT: 1666 case CFAPI_OBJECT_PROP_WEIGHT_LIMIT:
1605 rv = &op->weight_limit; 1667 ri = op->weight_limit; rv = &ri;
1606 *type = CFAPI_INT; 1668 *type = CFAPI_INT;
1607 break; 1669 break;
1608 1670
1609 case CFAPI_OBJECT_PROP_CARRYING: 1671 case CFAPI_OBJECT_PROP_CARRYING:
1610 rv = &op->carrying; 1672 ri = op->carrying; rv = &ri;
1611 *type = CFAPI_INT; 1673 *type = CFAPI_INT;
1612 break; 1674 break;
1613 1675
1614 case CFAPI_OBJECT_PROP_GLOW_RADIUS: 1676 case CFAPI_OBJECT_PROP_GLOW_RADIUS:
1615 rv = &op->glow_radius; 1677 ri = op->glow_radius; rv = &ri;
1616 *type = CFAPI_INT; 1678 *type = CFAPI_INT;
1617 break; 1679 break;
1618 1680
1619 case CFAPI_OBJECT_PROP_PERM_EXP: 1681 case CFAPI_OBJECT_PROP_PERM_EXP:
1620 rv = &op->perm_exp; 1682 rv = &op->perm_exp;
… …
1635 rv = op->attacked_by; 1697 rv = op->attacked_by;
1636 *type = CFAPI_POBJECT; 1698 *type = CFAPI_POBJECT;
1637 break; 1699 break;
1638 1700
1639 case CFAPI_OBJECT_PROP_RUN_AWAY: 1701 case CFAPI_OBJECT_PROP_RUN_AWAY:
1640 rv = &op->run_away; 1702 ri = op->run_away; rv = &ri;
1641 *type = CFAPI_INT; 1703 *type = CFAPI_INT;
1642 break; 1704 break;
1643 1705
1644 case CFAPI_OBJECT_PROP_CHOSEN_SKILL: 1706 case CFAPI_OBJECT_PROP_CHOSEN_SKILL:
1645 rv = op->chosen_skill; 1707 rv = op->chosen_skill;
1646 *type = CFAPI_POBJECT; 1708 *type = CFAPI_POBJECT;
1647 break; 1709 break;
1648 1710
1649 case CFAPI_OBJECT_PROP_HIDDEN: 1711 case CFAPI_OBJECT_PROP_HIDDEN:
1650 rv = &op->hide; 1712 ri = op->hide; rv = &ri;
1651 *type = CFAPI_INT; 1713 *type = CFAPI_INT;
1652 break; 1714 break;
1653 1715
1654 case CFAPI_OBJECT_PROP_MOVE_STATUS: 1716 case CFAPI_OBJECT_PROP_MOVE_STATUS:
1655 rv = &op->move_status; 1717 ri = op->move_status; rv = &ri;
1656 *type = CFAPI_INT; 1718 *type = CFAPI_INT;
1657 break; 1719 break;
1658 1720
1659 case CFAPI_OBJECT_PROP_MOVE_TYPE: 1721 case CFAPI_OBJECT_PROP_MOVE_TYPE:
1660 rv = &op->attack_movement; 1722 ri = op->attack_movement; rv = &ri;
1661 *type = CFAPI_INT; 1723 *type = CFAPI_INT;
1662 break; 1724 break;
1663 1725
1664 case CFAPI_OBJECT_PROP_SPELL_ITEM: 1726 case CFAPI_OBJECT_PROP_SPELL_ITEM:
1665 rv = op->spellitem; 1727 rv = op->spellitem;
… …
1685 rv = (char*)op->custom_name; 1747 rv = (char*)op->custom_name;
1686 *type = CFAPI_STRING; 1748 *type = CFAPI_STRING;
1687 break; 1749 break;
1688 1750
1689 case CFAPI_OBJECT_PROP_ANIM_SPEED: 1751 case CFAPI_OBJECT_PROP_ANIM_SPEED:
1690 rv = &op->anim_speed; 1752 ri = op->anim_speed; rv = &ri;
1691 *type = CFAPI_INT; 1753 *type = CFAPI_INT;
1692 break; 1754 break;
1693 1755
1694 case CFAPI_OBJECT_PROP_FRIENDLY: 1756 case CFAPI_OBJECT_PROP_FRIENDLY:
1695 ri = is_friendly(op); 1757 ri = is_friendly(op);
… …
1716 rv = &ri; 1778 rv = &ri;
1717 *type = CFAPI_INT; 1779 *type = CFAPI_INT;
1718 break; 1780 break;
1719 1781
1720 case CFAPI_OBJECT_PROP_LUCK: 1782 case CFAPI_OBJECT_PROP_LUCK:
1721 rv = &op->stats.luck; 1783 ri = op->stats.luck; rv = &ri;
1722 *type = CFAPI_INT; 1784 *type = CFAPI_INT;
1723 break; 1785 break;
1724 1786
1725 case CFAPI_OBJECT_PROP_EXP: 1787 case CFAPI_OBJECT_PROP_EXP:
1726 rv = &op->stats.exp; 1788 rv = &op->stats.exp;
… …
1763 *type = CFAPI_POBJECT; 1825 *type = CFAPI_POBJECT;
1764 break; 1826 break;
1765 1827
1766 case CFAPI_OBJECT_PROP_CHEATER: 1828 case CFAPI_OBJECT_PROP_CHEATER:
1767 ri = (QUERY_FLAG(op, FLAG_WAS_WIZ)); 1829 ri = (QUERY_FLAG(op, FLAG_WAS_WIZ));
1830 rv = &ri;
1768 *type = CFAPI_INT; 1831 *type = CFAPI_INT;
1769 break; 1832 break;
1770 1833
1771 case CFAPI_OBJECT_PROP_MERGEABLE: 1834 case CFAPI_OBJECT_PROP_MERGEABLE:
1772 { 1835 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines