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.22 by root, Fri Feb 10 07:37:13 2006 UTC vs.
Revision 1.32 by root, Tue Mar 7 13:59:57 2006 UTC

… …
29#include <XSUB.h> 29#include <XSUB.h>
30 30
31#undef save_long // clashes with libproto.h 31#undef save_long // clashes with libproto.h
32 32
33#define PLUGIN_NAME "perl" 33#define PLUGIN_NAME "perl"
34#define PLUGIN_VERSION "cfperl 0.1" 34#define PLUGIN_VERSION "cfperl 0.2"
35 35
36#ifndef __CEXTRACT__ 36#ifndef __CEXTRACT__
37#include <plugin.h> 37#include <plugin.h>
38#endif 38#endif
39 39
… …
58static f_plug_api systemDirectory; 58static f_plug_api systemDirectory;
59static f_plug_api object_set_property; 59static f_plug_api object_set_property;
60static f_plug_api map_get_map; 60static f_plug_api map_get_map;
61static f_plug_api object_insert; 61static f_plug_api object_insert;
62 62
63/* this is a stupid way to do things, and awkward to use for plug-in authors */
63typedef struct 64typedef struct
64{ 65{
65 object* who; 66 object* who;
66 object* activator; 67 object* activator;
67 object* third; 68 object* third;
69 mapstruct* map;
68 char message[1024]; 70 char message[1024];
69 int fix; 71 int fix; // seems to be python-only, and should not be part of the API
70 int event_code; 72 int event_code;
71 char extension[1024]; // name field, should invoke specific perl extension 73 char extension[1024]; // name field, should invoke specific perl extension
72 char options[1024]; // slaying field of event_connectors 74 char options[1024]; // slaying field of event_connectors
73 int returnvalue; 75 int returnvalue;
74} CFPContext; 76} CFPContext;
75
76//static int current_command = -999;
77 77
78static HV *obj_cache; 78static HV *obj_cache;
79static PerlInterpreter *perl; 79static PerlInterpreter *perl;
80 80
81////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 81//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
… …
126 sv = newSV (0); 126 sv = newSV (0);
127 sv_magic (sv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 127 sv_magic (sv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
128 return sv_bless (newRV_noinc (sv), gv_stashpv (klass, 1)); 128 return sv_bless (newRV_noinc (sv), gv_stashpv (klass, 1));
129} 129}
130 130
131static void
132SVptr_cache_set (void *ptr, SV *sv)
133{
134 hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0);
135}
136
137static SV *
138SVptr_cache_get (void *ptr)
139{
140 SV **he = hv_fetch (obj_cache, (char *)&ptr, sizeof (ptr), 0);
141
142 return he ? *he : 0;
143}
144
131static SV * 145static SV *
132newSVptr_cached (void *ptr, const char *klass) 146newSVptr_cached (void *ptr, const char *klass)
133{ 147{
134 SV *sv, **he; 148 SV *sv;
135 149
136 if (!ptr) 150 if (!ptr)
137 return &PL_sv_undef; 151 return &PL_sv_undef;
138 152
139 he = hv_fetch (obj_cache, (char *)&ptr, sizeof (ptr), 0); 153 sv = SVptr_cache_get (ptr);
140 154
141 if (he) 155 if (!sv)
142 sv = *he;
143 else
144 { 156 {
145 HV *hv = newHV (); 157 HV *hv = newHV ();
146 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 158 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
147 sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 159 sv = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
148 hv_store (obj_cache, (char *)&ptr, sizeof (ptr), sv, 0); 160
161 SVptr_cache_set (ptr, sv);
149 } 162 }
150 163
151 return newSVsv (sv); 164 return newSVsv (sv);
152} 165}
153 166
… …
192 va_list args; 205 va_list args;
193 va_start (args, type); 206 va_start (args, type);
194 207
195 switch (type) 208 switch (type)
196 { 209 {
210#if 0
211 case CFAPI_INT16:
212 sv = newSViv (*va_arg (args, sint16_t *));
213 break;
214#endif
215
197 case CFAPI_INT: 216 case CFAPI_INT:
198 sv = newSViv (*va_arg (args, int *)); 217 sv = newSViv (*va_arg (args, int *));
199 break; 218 break;
200 219
201 case CFAPI_LONG: 220 case CFAPI_LONG:
… …
281 HV *hv = newHV (); 300 HV *hv = newHV ();
282#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0) 301#define hv_context(type,addr,expr) hv_store (hv, #expr, sizeof (#expr) - 1, newSVcfapi (type, addr context->expr), 0)
283 hv_context (CFAPI_POBJECT, ,who); 302 hv_context (CFAPI_POBJECT, ,who);
284 hv_context (CFAPI_POBJECT, ,activator); 303 hv_context (CFAPI_POBJECT, ,activator);
285 hv_context (CFAPI_POBJECT, ,third); 304 hv_context (CFAPI_POBJECT, ,third);
305 hv_context (CFAPI_PMAP, ,map);
286 hv_context (CFAPI_STRING , ,message); 306 hv_context (CFAPI_STRING , ,message);
287 hv_context (CFAPI_INT ,&,fix); 307 hv_context (CFAPI_INT ,&,fix);
288 hv_context (CFAPI_INT ,&,event_code); 308 hv_context (CFAPI_INT ,&,event_code);
289 hv_context (CFAPI_STRING , ,options); 309 hv_context (CFAPI_STRING , ,options);
290 hv_context (CFAPI_STRING , ,extension); 310 hv_context (CFAPI_STRING , ,extension);
… …
426 registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener); 446 registerGlobalEvent (NULL, EVENT_LOGIN, PLUGIN_NAME, globalEventListener);
427 registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener); 447 registerGlobalEvent (NULL, EVENT_LOGOUT, PLUGIN_NAME, globalEventListener);
428 registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener); 448 registerGlobalEvent (NULL, EVENT_MAPENTER, PLUGIN_NAME, globalEventListener);
429 registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener); 449 registerGlobalEvent (NULL, EVENT_MAPLEAVE, PLUGIN_NAME, globalEventListener);
430 registerGlobalEvent (NULL, EVENT_MAPRESET, PLUGIN_NAME, globalEventListener); 450 registerGlobalEvent (NULL, EVENT_MAPRESET, PLUGIN_NAME, globalEventListener);
451 registerGlobalEvent (NULL, EVENT_MAPLOAD, PLUGIN_NAME, globalEventListener);
452 registerGlobalEvent (NULL, EVENT_MAPOUT, PLUGIN_NAME, globalEventListener);
453 registerGlobalEvent (NULL, EVENT_MAPIN, PLUGIN_NAME, globalEventListener);
454 registerGlobalEvent (NULL, EVENT_MAPCLEAN, PLUGIN_NAME, globalEventListener);
431 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener); 455 registerGlobalEvent (NULL, EVENT_REMOVE, PLUGIN_NAME, globalEventListener);
432 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener); 456 registerGlobalEvent (NULL, EVENT_SHOUT, PLUGIN_NAME, globalEventListener);
433 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener); 457 registerGlobalEvent (NULL, EVENT_TELL, PLUGIN_NAME, globalEventListener);
434 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener); 458 registerGlobalEvent (NULL, EVENT_MUZZLE, PLUGIN_NAME, globalEventListener);
435 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener); 459 registerGlobalEvent (NULL, EVENT_KICK, PLUGIN_NAME, globalEventListener);
… …
487 { 511 {
488 case EVENT_CRASH: 512 case EVENT_CRASH:
489 printf ("Unimplemented for now\n"); 513 printf ("Unimplemented for now\n");
490 break; 514 break;
491 515
516 case EVENT_MAPLOAD:
517 case EVENT_MAPOUT:
518 case EVENT_MAPIN:
519 case EVENT_MAPCLEAN:
520 context.map = va_arg (args, mapstruct *);
521 break;
522
492 case EVENT_MAPENTER: 523 case EVENT_MAPENTER:
493 case EVENT_MAPLEAVE: 524 case EVENT_MAPLEAVE:
494 case EVENT_FREE_OB: 525 case EVENT_FREE_OB:
495 case EVENT_BORN: 526 case EVENT_BORN:
496 case EVENT_REMOVE: 527 case EVENT_REMOVE:
… …
530 561
531 case EVENT_TELL: 562 case EVENT_TELL:
532 break; 563 break;
533 564
534 case EVENT_MAPRESET: 565 case EVENT_MAPRESET:
566 /* stupid, should be the map itself, not "message"??? */
535 buf = va_arg (args, char *); 567 buf = va_arg (args, char *);
536 if (buf != 0) 568 if (buf != 0)
537 strncpy (context.message, buf, sizeof (context.message)); 569 strncpy (context.message, buf, sizeof (context.message));
538 break; 570 break;
539 } 571 }
… …
750 const_iv (ST_BD_REMOVE) 782 const_iv (ST_BD_REMOVE)
751 const_iv (ST_MAT_FLOOR) 783 const_iv (ST_MAT_FLOOR)
752 const_iv (ST_MAT_WALL) 784 const_iv (ST_MAT_WALL)
753 const_iv (ST_MAT_ITEM) 785 const_iv (ST_MAT_ITEM)
754 786
787 const_iv (AT_PHYSICAL)
788 const_iv (AT_MAGIC)
789 const_iv (AT_FIRE)
790 const_iv (AT_ELECTRICITY)
791 const_iv (AT_COLD)
792 const_iv (AT_CONFUSION)
793 const_iv (AT_ACID)
794 const_iv (AT_DRAIN)
795 const_iv (AT_WEAPONMAGIC)
796 const_iv (AT_GHOSTHIT)
797 const_iv (AT_POISON)
798 const_iv (AT_SLOW)
799 const_iv (AT_PARALYZE)
800 const_iv (AT_TURN_UNDEAD)
801 const_iv (AT_FEAR)
802 const_iv (AT_CANCELLATION)
803 const_iv (AT_DEPLETE)
804 const_iv (AT_DEATH)
805 const_iv (AT_CHAOS)
806 const_iv (AT_COUNTERSPELL)
807 const_iv (AT_GODPOWER)
808 const_iv (AT_HOLYWORD)
809 const_iv (AT_BLIND)
810 const_iv (AT_INTERNAL)
811 const_iv (AT_LIFE_STEALING)
812 const_iv (AT_DISEASE)
813
755 const_iv (QUEST_IN_PROGRESS) 814 const_iv (QUEST_IN_PROGRESS)
756 const_iv (QUEST_DONE_QUEST) 815 const_iv (QUEST_DONE_QUEST)
757 const_iv (QUEST_DONE_TASK) 816 const_iv (QUEST_DONE_TASK)
758 const_iv (QUEST_START_QUEST) 817 const_iv (QUEST_START_QUEST)
759 const_iv (QUEST_END_QUEST) 818 const_iv (QUEST_END_QUEST)
… …
926 const_iv (WILL_APPLY_HANDLE) 985 const_iv (WILL_APPLY_HANDLE)
927 const_iv (WILL_APPLY_TREASURE) 986 const_iv (WILL_APPLY_TREASURE)
928 const_iv (WILL_APPLY_EARTHWALL) 987 const_iv (WILL_APPLY_EARTHWALL)
929 const_iv (WILL_APPLY_DOOR) 988 const_iv (WILL_APPLY_DOOR)
930 const_iv (WILL_APPLY_FOOD) 989 const_iv (WILL_APPLY_FOOD)
990
991 const_iv (SAVE_MODE)
992 const_iv (SAVE_DIR_MODE)
931 }; 993 };
932 994
933 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 995 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
934 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 996 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
935 997
… …
961 const_event (LOGIN) 1023 const_event (LOGIN)
962 const_event (LOGOUT) 1024 const_event (LOGOUT)
963 const_event (MAPENTER) 1025 const_event (MAPENTER)
964 const_event (MAPLEAVE) 1026 const_event (MAPLEAVE)
965 const_event (MAPRESET) 1027 const_event (MAPRESET)
1028 const_event (MAPLOAD)
1029 const_event (MAPOUT)
1030 const_event (MAPIN)
1031 const_event (MAPCLEAN)
966 const_event (REMOVE) 1032 const_event (REMOVE)
967 const_event (SHOUT) 1033 const_event (SHOUT)
968 const_event (TELL) 1034 const_event (TELL)
969 const_event (MUZZLE) 1035 const_event (MUZZLE)
970 const_event (KICK) 1036 const_event (KICK)
… …
1170 int unused_type; 1236 int unused_type;
1171 object_set_property (&unused_type, obj, idx, (double)SvNV (newval)); 1237 object_set_property (&unused_type, obj, idx, (double)SvNV (newval));
1172 } 1238 }
1173 break; 1239 break;
1174 case CFAPI_STRING: 1240 case CFAPI_STRING:
1175 cf_object_set_string_property (obj, idx, SvPV_nolen (newval)); 1241 cf_object_set_string_property (obj, idx, SvOK (newval) ? SvPV_nolen (newval) : 0);
1242 break;
1243 case CFAPI_POBJECT:
1244 {
1245 int unused_type;
1246 object_set_property (&unused_type, obj, idx, (object *)SvPTR_ornull (newval, "cf::object"));
1247 }
1176 break; 1248 break;
1177 default: 1249 default:
1178 croak ("unhandled type '%d' in set_property '%d'", type, idx); 1250 croak ("unhandled type '%d' in set_property '%d'", type, idx);
1179 } 1251 }
1180 1252
1253# missing properties
1254
1255void
1256set_attacktype (object *obj, U32 attacktype)
1257 CODE:
1258 obj->attacktype = attacktype;
1259
1260U32
1261get_attacktype (object *obj)
1262 ALIAS:
1263 attacktype = 0
1264 CODE:
1265 RETVAL = obj->attacktype;
1266 OUTPUT: RETVAL
1267
1268void
1269set_food (object *obj, int food)
1270 CODE:
1271 obj->stats.food = food;
1272
1273int
1274get_food (object *obj)
1275 ALIAS:
1276 food = 0
1277 CODE:
1278 RETVAL = obj->stats.food;
1279 OUTPUT: RETVAL
1280
1181void 1281void
1182inv (object *obj) 1282inv (object *obj)
1183 PROTOTYPE: $ 1283 PROTOTYPE: $
1184 PPCODE: 1284 PPCODE:
1185{ 1285{
… …
1216 1316
1217int cf_object_pay_item (object *op, object *buyer) 1317int cf_object_pay_item (object *op, object *buyer)
1218 1318
1219int cf_object_pay_amount (object *op, double amount) 1319int cf_object_pay_amount (object *op, double amount)
1220 1320
1221int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *sp_, char *flags) 1321int cf_object_cast_spell (object *caster, object *ctoo, int dir, object *spell_ob, char *stringarg = 0)
1222 1322
1223int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *flags) 1323int cf_object_cast_ability (object *caster, object *ctoo, int dir, object *sp_, char *stringarg = 0)
1224 1324
1225void cf_object_learn_spell (object *op, object *sp) 1325void cf_object_learn_spell (object *op, object *sp)
1226 1326
1227void cf_object_forget_spell (object *op, object *sp) 1327void cf_object_forget_spell (object *op, object *sp)
1228 1328
… …
1264char *cf_object_get_key (object *op, char *keyname) 1364char *cf_object_get_key (object *op, char *keyname)
1265 ALIAS: key = 0 1365 ALIAS: key = 0
1266 1366
1267void cf_object_set_key (object *op, char *keyname, char *value) 1367void cf_object_set_key (object *op, char *keyname, char *value)
1268 1368
1369object *cf_create_object_by_name (const char *name)
1370
1269MODULE = cf PACKAGE = cf::object PREFIX = cf_ 1371MODULE = cf PACKAGE = cf::object PREFIX = cf_
1270 1372
1271void cf_fix_object (object *pl) 1373void cf_fix_object (object *pl)
1272 ALIAS: fix = 0 1374 ALIAS: fix = 0
1273 1375
1274object *cf_insert_ob_in_ob (object *ob, object *where) 1376object *cf_insert_ob_in_ob (object *ob, object *where)
1275 1377
1276object *create_object_by_name (const char *name = 0) 1378# no clean way to get an object from an archetype - stupid idiotic
1379# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
1380
1381object *new (const char *archetype = 0)
1277 PROTOTYPE: ;$ 1382 PROTOTYPE: ;$
1278 ALIAS:
1279 create_object = 0
1280 new = 0
1281 CODE: 1383 CODE:
1282 RETVAL = name ? cf_create_object_by_name (name) : cf_create_object (); 1384 RETVAL = archetype ? get_archetype (archetype) : cf_create_object ();
1283 OUTPUT: 1385 OUTPUT:
1284 RETVAL 1386 RETVAL
1285 1387
1286object *insert_ob_in_map_at (object *ob, mapstruct *where, object_ornull *orig, int flag, int x, int y) 1388object *insert_ob_in_map_at (object *ob, mapstruct *where, object_ornull *orig, int flag, int x, int y)
1287 PROTOTYPE: $$$$$$ 1389 PROTOTYPE: $$$$$$
… …
1442 INIT: 1544 INIT:
1443 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY; 1545 if (x >= MAP_WIDTH (obj) || y >= MAP_HEIGHT (obj)) XSRETURN_EMPTY;
1444 PPCODE: 1546 PPCODE:
1445{ 1547{
1446 object *o; 1548 object *o;
1549
1447 for (o = GET_MAP_OB (obj, x, y); o; o = o->above) 1550 for (o = GET_MAP_OB (obj, x, y); o; o = o->above)
1448 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 1551 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
1449} 1552}
1450 1553
1451SV * 1554SV *
… …
1474 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break; 1577 case 7: RETVAL = newSVuv ( GET_MAP_MOVE_OFF (obj, x, y)); break;
1475 } 1578 }
1476 OUTPUT: 1579 OUTPUT:
1477 RETVAL 1580 RETVAL
1478 1581
1582# "serialise" map perl data into a ref
1583void
1584_get_obs (mapstruct *map)
1585 PPCODE:
1586{
1587 object *o;
1588 int x, y;
1589 AV *obs = newAV ();
1590 int nonnull = 0;
1591
1592 for (y = 0; y < MAP_HEIGHT (map); y++)
1593 for (x = 0; x < MAP_WIDTH (map); x++)
1594 {
1595 AV *av = newAV ();
1596
1597 for (o = GET_MAP_OB (map, x, y); o; o = o->above)
1598 {
1599 SV *sv = SVptr_cache_get (o);
1600
1601 if (sv && HvFILL (SvRV (sv)))
1602 {
1603 nonnull = 1;
1604 sv = newSVsv (sv);
1605 }
1606 else
1607 sv = &PL_sv_undef;
1608
1609 av_push (av, sv);
1610 }
1611
1612 av_store (obs, x + y * MAP_HEIGHT (map), newRV_noinc ((SV *)av));
1613 }
1614
1615 if (nonnull)
1616 XPUSHs (sv_2mortal (newRV_noinc ((SV *)obs)));
1617 else
1618 SvREFCNT_dec (obs);
1619}
1620
1621# "deserialise" perl map data into the map
1622void
1623_set_obs (mapstruct *map, SV *sv)
1624 CODE:
1625{
1626 object *o;
1627 AV *av;
1628 int x, y;
1629 AV *obs = (AV *)SvRV (sv);
1630
1631 for (y = 0; y < MAP_HEIGHT (map); y++)
1632 for (x = 0; x < MAP_WIDTH (map); x++)
1633 {
1634 sv = *av_fetch (obs, x + y * MAP_HEIGHT (map), 1);
1635
1636 if (!SvROK (sv))
1637 continue;
1638
1639 av = (AV *)SvRV (sv);
1640
1641 for (o = GET_MAP_OB (map, x, y); o; o = o->above)
1642 {
1643 sv = av_shift (av);
1644
1645 if (SvROK (sv))
1646 {
1647 sv_magic ((SV *)SvRV (sv), 0, PERL_MAGIC_ext, (char *)o, 0);
1648 SVptr_cache_set (o, sv);
1649 }
1650 }
1651 }
1652}
1479 1653
1480MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_ 1654MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_
1481 1655
1482archetype *cf_archetype_get_first() 1656archetype *cf_archetype_get_first()
1483 PROTOTYPE: 1657 PROTOTYPE:

Diff Legend

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