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

Comparing deliantra/server/plugins/cfperl/cfperl.xs (file contents):
Revision 1.45 by root, Fri Mar 31 20:59:17 2006 UTC vs.
Revision 1.55 by root, Mon Jun 26 15:40:15 2006 UTC

1/*****************************************************************************/ 1/*****************************************************************************/
2/* CrossFire, A Multiplayer game for the X Window System */ 2/* CrossFire, A Multiplayer game for the X Window System */
3/* */
4/*****************************************************************************/ 3/*****************************************************************************/
5 4
6/* 5/*
7 * This code is placed under the GNU General Public Licence (GPL) 6 * This code is placed under the GNU General Public Licence (GPL)
8 * 7 *
29#include <XSUB.h> 28#include <XSUB.h>
30 29
31#undef save_long // clashes with libproto.h 30#undef save_long // clashes with libproto.h
32 31
33#define PLUGIN_NAME "perl" 32#define PLUGIN_NAME "perl"
34#define PLUGIN_VERSION "cfperl 0.2" 33#define PLUGIN_VERSION "cfperl 0.3"
35 34
36#ifndef __CEXTRACT__ 35#ifndef __CEXTRACT__
37#include <plugin.h> 36#include <plugin.h>
38#endif 37#endif
39 38
78} CFPContext; 77} CFPContext;
79 78
80static HV *obj_cache; 79static HV *obj_cache;
81static PerlInterpreter *perl; 80static PerlInterpreter *perl;
82 81
82#define PUSHcfapi(type,value) PUSHs (sv_2mortal (newSVcfapi (CFAPI_ ## type, (value))))
83#define PUSHcfapi(type,ctype) PUSHs (sv_2mortal (newSVcfapi ((type), va_arg (args, ctype)))) 83#define PUSHcfapi_va(type,ctype) PUSHcfapi (type, va_arg (args, ctype))
84#define PUSH_OB PUSHcfapi(CFAPI_POBJECT, object *) 84#define PUSH_OB PUSHcfapi_va(POBJECT, object *)
85#define PUSH_PL PUSHcfapi(CFAPI_PPLAYER, player *) 85#define PUSH_PL PUSHcfapi_va(PPLAYER, player *)
86#define PUSH_MAP PUSHcfapi(CFAPI_PMAP, mapstruct *) 86#define PUSH_MAP PUSHcfapi_va(PMAP, mapstruct *)
87#define PUSH_PV PUSHcfapi(CFAPI_STRING, const char *) 87#define PUSH_PV PUSHcfapi_va(STRING, const char *)
88#define PUSH_IV PUSHcfapi(CFAPI_INT, int) 88#define PUSH_IV PUSHs (sv_2mortal (newSViv (va_arg (args, int))))
89 89
90////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 90//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
91 91
92// garbage collect some perl objects, if possible 92// garbage collect some perl objects, if possible
93// all objects no longer referenced and empty are 93// all objects no longer referenced and empty are
229 case CFAPI_LONG: 229 case CFAPI_LONG:
230 sv = newSVnv ((double)*va_arg (args, sint64 *)); /* oh, the humanity! */ 230 sv = newSVnv ((double)*va_arg (args, sint64 *)); /* oh, the humanity! */
231 break; 231 break;
232 232
233 case CFAPI_DOUBLE: 233 case CFAPI_DOUBLE:
234 sv = newSViv (*va_arg (args, double *)); 234 sv = newSVnv (*va_arg (args, double *));
235 break; 235 break;
236 236
237 case CFAPI_STRING: 237 case CFAPI_STRING:
238 { 238 {
239 char *str = va_arg (args, char *); 239 char *str = va_arg (args, char *);
246 object *obj = va_arg (args, object *); 246 object *obj = va_arg (args, object *);
247 247
248 if (!obj) 248 if (!obj)
249 sv = &PL_sv_undef; 249 sv = &PL_sv_undef;
250 else 250 else
251 switch (*(int *)cf_object_get_property (obj, CFAPI_OBJECT_PROP_TYPE)) 251 switch (obj->type)
252 { 252 {
253 case MAP: 253 case MAP:
254 sv = newSVptr_cached (obj, "cf::object::map"); 254 sv = newSVptr_cached (obj, "cf::object::map");
255 break; 255 break;
256 256
427 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener); 427 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);
428 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener); 428 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);
429 registerGlobalEvent (NULL, EVENT_FREE_OB, PLUGIN_NAME, globalEventListener); 429 registerGlobalEvent (NULL, EVENT_FREE_OB, PLUGIN_NAME, globalEventListener);
430 registerGlobalEvent (NULL, EVENT_PLAYER_LOAD, PLUGIN_NAME, globalEventListener); 430 registerGlobalEvent (NULL, EVENT_PLAYER_LOAD, PLUGIN_NAME, globalEventListener);
431 registerGlobalEvent (NULL, EVENT_PLAYER_SAVE, PLUGIN_NAME, globalEventListener); 431 registerGlobalEvent (NULL, EVENT_PLAYER_SAVE, PLUGIN_NAME, globalEventListener);
432 registerGlobalEvent (NULL, EVENT_EXTCMD, PLUGIN_NAME, globalEventListener);
432 433
433 char *argv[] = { 434 char *argv[] = {
434 "", 435 "",
435 "-e" 436 "-e"
436 "BEGIN {" 437 "BEGIN {"
442 }; 443 };
443 444
444 perl = perl_alloc (); 445 perl = perl_alloc ();
445 perl_construct (perl); 446 perl_construct (perl);
446 447
448 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
449
447 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl)) 450 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) || perl_run (perl))
448 { 451 {
449 printf ("unable to initialize perl-interpreter, continuing without.\n"); 452 printf ("unable to initialize perl-interpreter, continuing without.\n");
450 453
451 perl_destruct (perl); 454 perl_destruct (perl);
542 case EVENT_KICK: 545 case EVENT_KICK:
543 PUSH_OB; 546 PUSH_OB;
544 PUSH_PV; 547 PUSH_PV;
545 break; 548 break;
546 549
550 case EVENT_EXTCMD:
551 PUSH_PL;
552 {
553 char *buf = va_arg (args, char *);
554 int len = va_arg (args, int);
555 PUSHs (sv_2mortal (newSVpvn (buf, len)));
556 }
557 break;
558
547 case EVENT_CLOCK: 559 case EVENT_CLOCK:
548 clean_obj_cache (); 560 clean_obj_cache ();
549 break; 561 break;
550 562
551 case EVENT_TELL: 563 case EVENT_TELL:
557 PUTBACK; 569 PUTBACK;
558 int count = call_pv ("cf::inject_global_event", G_SCALAR | G_EVAL); 570 int count = call_pv ("cf::inject_global_event", G_SCALAR | G_EVAL);
559 SPAGAIN; 571 SPAGAIN;
560 572
561 if (SvTRUE (ERRSV)) 573 if (SvTRUE (ERRSV))
562 LOG (llevError, "event '%d' callback evaluation error: %s", event_code, SvPV_nolen (ERRSV)); 574 LOG (llevError, "global event '%d' callback evaluation error: %s", event_code, SvPV_nolen (ERRSV));
563 575
564 rv = count > 0 ? POPi : 0; 576 rv = count > 0 ? POPi : 0;
565 577
566 PUTBACK; 578 PUTBACK;
567 FREETMPS; 579 FREETMPS;
572} 584}
573 585
574void * 586void *
575eventListener (int *type, ...) 587eventListener (int *type, ...)
576{ 588{
577 static int rv = 0; 589 static int rv;
578 va_list args; 590 va_list args;
579 char *buf; 591 int event_code;
580 CFPContext context; 592 object *who, *activator, *third, *event;
593 char *message, *extension, *options;
581 594
582 if (!perl) 595 if (!perl)
583 return; 596 return;
584 597
585 memset (&context, 0, sizeof (context));
586
587 va_start (args, type); 598 va_start (args, type);
588
589 context.who = va_arg (args, object *); 599 who = va_arg (args, object *);
590 context.event_code = va_arg (args, int); 600 event_code = va_arg (args, int);
591 context.activator = va_arg (args, object *); 601 activator = va_arg (args, object *);
592 context.third = va_arg (args, object *); 602 third = va_arg (args, object *);
593
594 buf = va_arg (args, char *); 603 message = va_arg (args, char *);
595 if (buf != 0) 604 va_arg (args, int); // fix yourself
596 strncpy (context.message, buf, sizeof (context.message)); 605 extension = va_arg (args, char *);
597 606 options = va_arg (args, char *);
598 context.fix = va_arg (args, int);
599 strncpy (context.extension, va_arg (args, char *), sizeof (context.extension));
600 strncpy (context.options, va_arg (args, char *), sizeof (context.options));
601 context.event = va_arg (args, object *); 607 event = va_arg (args, object *);
602 va_end (args); 608 va_end (args);
603 609
604 { 610 {
605 dSP; 611 dSP;
606 612
607 ENTER; 613 ENTER;
608 SAVETMPS; 614 SAVETMPS;
609 615
610 PUSHMARK (SP); 616 PUSHMARK (SP);
611
612 EXTEND (SP, 10); 617 EXTEND (SP, 10);
613 618
614 HV *hv = newHV (); 619 PUSHcfapi (STRING, extension);
615#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context.expr), 0) 620 PUSHs (sv_2mortal (newSViv (event_code)));
616 hv_context (CFAPI_POBJECT, ,who);
617 hv_context (CFAPI_POBJECT, ,activator);
618 hv_context (CFAPI_POBJECT, ,third);
619 hv_context (CFAPI_POBJECT, ,event);
620 hv_context (CFAPI_PMAP, ,map);
621 hv_context (CFAPI_STRING , ,message);
622 hv_context (CFAPI_INT ,&,fix);
623 hv_context (CFAPI_INT ,&,event_code);
624 hv_context (CFAPI_STRING , ,options);
625 hv_context (CFAPI_STRING , ,extension);
626 621
627 PUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 622 PUSHcfapi (POBJECT, event);
623 PUSHcfapi (POBJECT, who);
624
625 switch (event_code)
626 {
627 case EVENT_STOP: // $ob (e.g. arrow)
628 case EVENT_TIME: // $ob
629 case EVENT_TIMER: // $ob
630 break;
631
632 case EVENT_APPLY: // $ob, $who
633 case EVENT_DROP: // $ob, $who
634 case EVENT_CLOSE: // $ob, $who
635 case EVENT_DEATH: // $ob[, $killer]
636 case EVENT_MOVE: // $ob, $enemy
637 case EVENT_THROW: // $ob, $thrower
638 PUSHcfapi (POBJECT, activator);
639 break;
640
641 case EVENT_ATTACK: // $ob, $who, $victim (?? please god enlighten me)
642 PUSHcfapi (POBJECT, activator);
643 PUSHcfapi (POBJECT, third);
644 break;
645
646 case EVENT_TRIGGER: // $ob, $originator, [$victim], [$msg]
647 PUSHcfapi (POBJECT, activator);
648 PUSHcfapi (POBJECT, third);
649 PUSHcfapi (POBJECT, message);
650 break;
651
652 case EVENT_SAY: // $ob, $who, $msg
653 PUSHcfapi (POBJECT, activator);
654 PUSHcfapi (STRING, message);
655 break;
656
657 default:
658 LOG (llevError, "perl plugin called for unsupported event type %d", event_code);
659 break;
660 }
628 661
629 PUTBACK; 662 PUTBACK;
630 int count = call_pv ("cf::inject_event", G_SCALAR | G_EVAL); 663 int count = call_pv ("cf::inject_event", G_SCALAR | G_EVAL);
631 SPAGAIN; 664 SPAGAIN;
632 665
633 if (SvTRUE (ERRSV)) 666 if (SvTRUE (ERRSV))
634 LOG (llevError, "event '%d' callback evaluation error: %s", context.event_code, SvPV_nolen (ERRSV)); 667 LOG (llevError, "event '%d' callback evaluation error: %s", event_code, SvPV_nolen (ERRSV));
635 668
636 context.returnvalue = count > 0 ? POPi : 0; 669 rv = count > 0 ? POPi : 0;
637 670
638 PUTBACK; 671 PUTBACK;
639 FREETMPS; 672 FREETMPS;
640 LEAVE; 673 LEAVE;
641 } 674 }
642 675
643 rv = context.returnvalue;
644 return &rv; 676 return &rv;
645} 677}
646 678
647int 679int
648closePlugin () 680closePlugin ()
1068 const_iv (SK_SUMMONING) 1100 const_iv (SK_SUMMONING)
1069 const_iv (SK_PYROMANCY) 1101 const_iv (SK_PYROMANCY)
1070 const_iv (SK_EVOCATION) 1102 const_iv (SK_EVOCATION)
1071 const_iv (SK_SORCERY) 1103 const_iv (SK_SORCERY)
1072 const_iv (SK_TWO_HANDED_WEAPON) 1104 const_iv (SK_TWO_HANDED_WEAPON)
1105 const_iv (SK_SPARK_TOUCH)
1106 const_iv (SK_SHIVER)
1107 const_iv (SK_ACID_SPLASH)
1108 const_iv (SK_POISON_NAIL)
1073 1109
1074 const_iv (SOUND_NEW_PLAYER) 1110 const_iv (SOUND_NEW_PLAYER)
1075 const_iv (SOUND_FIRE_ARROW) 1111 const_iv (SOUND_FIRE_ARROW)
1076 const_iv (SOUND_LEARN_SPELL) 1112 const_iv (SOUND_LEARN_SPELL)
1077 const_iv (SOUND_FUMBLE_SPELL) 1113 const_iv (SOUND_FUMBLE_SPELL)
1093 const_iv (SOUND_CLOCK) 1129 const_iv (SOUND_CLOCK)
1094 const_iv (SOUND_TURN_HANDLE) 1130 const_iv (SOUND_TURN_HANDLE)
1095 const_iv (SOUND_FALL_HOLE) 1131 const_iv (SOUND_FALL_HOLE)
1096 const_iv (SOUND_DRINK_POISON) 1132 const_iv (SOUND_DRINK_POISON)
1097 const_iv (SOUND_CAST_SPELL_0) 1133 const_iv (SOUND_CAST_SPELL_0)
1134
1135 const_iv (MAP_FLUSH)
1136 const_iv (MAP_PLAYER_UNIQUE)
1137 const_iv (MAP_BLOCK)
1138 const_iv (MAP_STYLE)
1139 const_iv (MAP_OVERLAY)
1140
1141 const_iv (MAP_IN_MEMORY)
1142 const_iv (MAP_SWAPPED)
1143 const_iv (MAP_LOADING)
1144 const_iv (MAP_SAVING)
1098 }; 1145 };
1099 1146
1100 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1147 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1101 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1148 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1102 1149
1139 const_event (REMOVE) 1186 const_event (REMOVE)
1140 const_event (SHOUT) 1187 const_event (SHOUT)
1141 const_event (TELL) 1188 const_event (TELL)
1142 const_event (MUZZLE) 1189 const_event (MUZZLE)
1143 const_event (KICK) 1190 const_event (KICK)
1191 const_event (EXTCMD)
1144 //const_event (FREE_OB) 1192 //const_event (FREE_OB)
1145 }; 1193 };
1146 1194
1147 AV *av = get_av ("cf::EVENT", 1); 1195 AV *av = get_av ("cf::EVENT", 1);
1148 1196
1289void 1337void
1290LOG (int level, char *msg) 1338LOG (int level, char *msg)
1291 PROTOTYPE: $$ 1339 PROTOTYPE: $$
1292 C_ARGS: level, "%s", msg 1340 C_ARGS: level, "%s", msg
1293 1341
1342char *path_combine (char *base, char *path)
1343 PROTOTYPE: $$
1344
1345char *path_combine_and_normalize (char *base, char *path)
1346 PROTOTYPE: $$
1347
1294char * 1348char *
1295cf_get_maps_directory (char *path) 1349cf_get_maps_directory (char *path)
1296 PROTOTYPE: $ 1350 PROTOTYPE: $
1297 ALIAS: maps_directory = 0 1351 ALIAS: maps_directory = 0
1298 1352
1466 1520
1467void cf_object_update (object *op, int flags) 1521void cf_object_update (object *op, int flags)
1468 1522
1469void cf_object_pickup (object *op, object *what) 1523void cf_object_pickup (object *op, object *what)
1470 1524
1471char *cf_object_get_key (object *op, char *keyname)
1472 ALIAS: key = 0
1473
1474void cf_object_set_key (object *op, char *keyname, char *value)
1475
1476object *cf_create_object_by_name (const char *name) 1525object *cf_create_object_by_name (const char *name)
1477 1526
1478void change_exp (object *op, double exp, const char *skill_name = 0, int flag = 0) 1527void change_exp (object *op, double exp, const char *skill_name = 0, int flag = 0)
1479 1528
1480void player_lvl_adj (object *who, object *skill = 0) 1529void player_lvl_adj (object *who, object *skill = 0)
1481 1530
1531int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
1482 1532
1483MODULE = cf PACKAGE = cf::object PREFIX = cf_ 1533MODULE = cf PACKAGE = cf::object PREFIX = cf_
1484 1534
1485void cf_fix_object (object *pl) 1535void cf_fix_object (object *pl)
1486 ALIAS: fix = 0 1536 ALIAS: fix = 0
1502 CODE: 1552 CODE:
1503{ 1553{
1504 int unused_type; 1554 int unused_type;
1505 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y); 1555 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
1506} 1556}
1557
1558# syntatic sugar for easier use in event callbacks.
1559const char *options (object *op)
1560 CODE:
1561 RETVAL = op->name;
1562 OUTPUT:
1563 RETVAL
1507 1564
1508const char *get_ob_key_value (object *op, const char *key) 1565const char *get_ob_key_value (object *op, const char *key)
1509 1566
1510bool set_ob_key_value (object *op, const char *key, const char *value = 0, int add_key = 1) 1567bool set_ob_key_value (object *op, const char *key, const char *value = 0, int add_key = 1)
1511 1568
1548 1605
1549MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_ 1606MODULE = cf PACKAGE = cf::object::player PREFIX = cf_player_
1550 1607
1551player *player (object *op) 1608player *player (object *op)
1552 CODE: 1609 CODE:
1553 RETVAL = cf_player_find (cf_query_name (op)); 1610 RETVAL = op->contr;
1554 OUTPUT: RETVAL 1611 OUTPUT: RETVAL
1555 1612
1556void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE) 1613void cf_player_message (object *obj, char *txt, int flags = NDI_ORANGE | NDI_UNIQUE)
1557 1614
1558object *cf_player_send_inventory (object *op) 1615object *cf_player_send_inventory (object *op)
1575 1632
1576void cf_player_set_party (object *op, partylist *party) 1633void cf_player_set_party (object *op, partylist *party)
1577 1634
1578void change_skill (object *op, double exp, char *skill_name = 0, int flag = 0) 1635void change_skill (object *op, double exp, char *skill_name = 0, int flag = 0)
1579 1636
1637void kill_player (object *op)
1638
1580MODULE = cf PACKAGE = cf::object::map PREFIX = cf_ 1639MODULE = cf PACKAGE = cf::object::map PREFIX = cf_
1581 1640
1582MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 1641MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
1583 1642
1584player *cf_player_find (char *name) 1643player *cf_player_find (char *name)
1603 1662
1604player *next (player *pl) 1663player *next (player *pl)
1605 CODE: 1664 CODE:
1606 RETVAL = pl->next; 1665 RETVAL = pl->next;
1607 OUTPUT: RETVAL 1666 OUTPUT: RETVAL
1667
1668bool
1669cell_visible (player *pl, int dx, int dy)
1670 CODE:
1671 RETVAL = FABS (dx) <= pl->socket.mapx / 2 && FABS (dy) <= pl->socket.mapy / 2
1672 && !pl->blocked_los [dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2];
1673 OUTPUT:
1674 RETVAL
1675
1676void
1677send (player *pl, SV *packet)
1678 CODE:
1679{
1680 STRLEN len;
1681 char *buf = SvPVbyte (packet, len);
1682
1683 Write_String_To_Socket (&pl->socket, buf, len);
1684}
1685
1686int
1687listening (player *pl, int new_value = -1)
1688 CODE:
1689 RETVAL = pl->listening;
1690 if (new_value >= 0)
1691 pl->listening = new_value;
1692 OUTPUT:
1693 RETVAL
1608 1694
1609void get_savebed (player *pl) 1695void get_savebed (player *pl)
1610 ALIAS: 1696 ALIAS:
1611 savebed = 0 1697 savebed = 0
1612 PPCODE: 1698 PPCODE:
1691 1777
1692mapstruct *cf_map_get_map (char *name) 1778mapstruct *cf_map_get_map (char *name)
1693 PROTOTYPE: $ 1779 PROTOTYPE: $
1694 ALIAS: map = 0 1780 ALIAS: map = 0
1695 1781
1782mapstruct *has_been_loaded (char *name)
1783 PROTOTYPE: $
1784
1696mapstruct *cf_map_get_first () 1785mapstruct *cf_map_get_first ()
1697 PROTOTYPE: 1786 PROTOTYPE:
1698 ALIAS: first = 0 1787 ALIAS: first = 0
1699 1788
1700# whoever "designed" the plug-in api should have wasted 1789# whoever "designed" the plug-in api should have wasted
1701# his/her time with staying away form the project - would have 1790# his/her time with staying away from the project - would have
1702# saved others a lot of time, without doubt. 1791# saved others a lot of time, without doubt.
1703void set_path (mapstruct *where, char *path) 1792void set_path (mapstruct *where, char *path)
1704 CODE: 1793 CODE:
1705 strcpy (where->path, path); 1794 strcpy (where->path, path);
1795
1796int in_memory (mapstruct *map)
1797 CODE:
1798 RETVAL = map->in_memory;
1799 OUTPUT:
1800 RETVAL
1706 1801
1707bool unique (mapstruct *map) 1802bool unique (mapstruct *map)
1708 CODE: 1803 CODE:
1709 RETVAL = map->unique; 1804 RETVAL = map->unique;
1710 OUTPUT: 1805 OUTPUT:
1719object *cf_map_insert_object (mapstruct *where, object* op, int x, int y) 1814object *cf_map_insert_object (mapstruct *where, object* op, int x, int y)
1720 1815
1721object* cf_map_present_arch_by_name (mapstruct *map, const char* str, int nx, int ny) 1816object* cf_map_present_arch_by_name (mapstruct *map, const char* str, int nx, int ny)
1722 C_ARGS: str, map, nx, ny 1817 C_ARGS: str, map, nx, ny
1723 1818
1724#int cf_map_get_flags (mapstruct* map, mapstruct** nmap, I16 x, I16 y, I16 *nx, I16 *ny)
1725
1726void 1819void
1820cf_map_normalise (mapstruct *map, int x, int y)
1821 PPCODE:
1822{
1823 mapstruct *nmap = 0;
1824 I16 nx = 0, ny = 0;
1825 int flags = cf_map_get_flags (map, &nmap, x, y, &nx, &ny);
1826
1827 EXTEND (SP, 4);
1828 PUSHs (sv_2mortal (newSViv (flags)));
1829
1830 if (GIMME_V == G_ARRAY)
1831 {
1832 PUSHs (sv_2mortal (newSVcfapi (CFAPI_PMAP, nmap)));
1833 PUSHs (sv_2mortal (newSViv (nx)));
1834 PUSHs (sv_2mortal (newSViv (ny)));
1835 }
1836}
1837
1838void
1727at (mapstruct *obj, unsigned int x, unsigned int y) 1839at (mapstruct *map, unsigned int x, unsigned int y)
1728 PROTOTYPE: $$$ 1840 PROTOTYPE: $$$
1729 INIT:
1730 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY;
1731 PPCODE: 1841 PPCODE:
1732{ 1842{
1733 object *o; 1843 object *o;
1734 1844 mapstruct *nmap = 0;
1845 I16 nx, ny;
1846
1847 cf_map_get_flags (map, &nmap, x, y, &nx, &ny);
1848
1849 if (nmap)
1735 for (o = GET_MAP_OB (obj, x, y); o; o = o->above) 1850 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above)
1736 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 1851 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1737} 1852}
1738 1853
1739SV * 1854SV *
1740bot_at (mapstruct *obj, unsigned int x, unsigned int y) 1855bot_at (mapstruct *obj, unsigned int x, unsigned int y)
1741 PROTOTYPE: $$$ 1856 PROTOTYPE: $$$

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines