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

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.14 by root, Sun Aug 27 13:02:04 2006 UTC vs.
Revision 1.23 by root, Mon Aug 28 16:52:51 2006 UTC

… …
59 59
60typedef double val64; 60typedef double val64;
61#define newSVval64 newSVnv 61#define newSVval64 newSVnv
62#define SvVAL64 SvNV 62#define SvVAL64 SvNV
63 63
64static f_plug_api gethook; 64static f_plug_api gethook = cfapi_get_hooks;
65static f_plug_api systemDirectory; 65static f_plug_api object_set_property = cfapi_object_set_property;
66static f_plug_api object_set_property; 66static f_plug_api map_get_map = cfapi_map_get_map;
67static f_plug_api map_get_map; 67static f_plug_api object_insert = cfapi_object_insert;
68static f_plug_api object_insert;
69 68
70/* this is a stupid way to do things, and awkward to use for plug-in authors */ 69/* this is a stupid way to do things, and awkward to use for plug-in authors */
71typedef struct 70typedef struct
72{ 71{
73 object* who; 72 object* who;
… …
108 107
109 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0); 108 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
110 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 109 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
111} 110}
112 111
113template<class extendable> 112template<class attachable>
114SV * 113SV *
115newSVextendable (extendable *obj, const char *klass) 114newSVattachable (attachable *obj, const char *klass)
116{ 115{
117 if (!obj) 116 if (!obj)
118 return &PL_sv_undef; 117 return &PL_sv_undef;
119 118
120 if (!obj->self) 119 if (!obj->self)
… …
227 break; 226 break;
228 227
229 case DT_OBJECT: 228 case DT_OBJECT:
230 { 229 {
231 object *obj = va_arg (ap, object *); 230 object *obj = va_arg (ap, object *);
232 sv = newSVextendable (obj, obj && obj->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap"); 231 sv = newSVattachable (obj, obj && obj->type == PLAYER ? "cf::object::player::wrap" : "cf::object::wrap");
233 } 232 }
234 break; 233 break;
235 234
236 case DT_MAP: 235 case DT_MAP:
237 // va_arg (object *) when void * is passed is an XSI extension 236 // va_arg (object *) when void * is passed is an XSI extension
238 sv = newSVextendable (va_arg (ap, mapstruct *), "cf::map::wrap"); 237 sv = newSVattachable (va_arg (ap, mapstruct *), "cf::map::wrap");
239 break; 238 break;
240 239
241 case DT_PLAYER: 240 case DT_PLAYER:
242 sv = newSVextendable (va_arg (ap, player *), "cf::player::wrap"); 241 sv = newSVattachable (va_arg (ap, player *), "cf::player::wrap");
243 break; 242 break;
244 243
245 case DT_ARCH: 244 case DT_ARCH:
246 sv = newSVptr (va_arg (ap, archetype *), "cf::arch::wrap"); 245 sv = newSVptr (va_arg (ap, archetype *), "cf::arch::wrap");
247 break; 246 break;
… …
304} 303}
305 304
306////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 305//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
307 306
308SV * 307SV *
309registry_of (extendable_base *ext) 308registry_of (attachable_base *ext)
310{ 309{
311 if (!ext->cb) 310 if (!ext->cb)
312 ext->cb = newAV (); 311 ext->cb = newAV ();
313 312
314 return newRV_inc ((SV *)ext->cb); 313 return newRV_inc ((SV *)ext->cb);
315} 314}
316 315
317void extendable_base::clear () 316void attachable_base::clear ()
318{ 317{
319 //if (self) fprintf (stderr, "free_ob_self %p %s (%p,%p)\n", this, ((object *)this)->name, self, cb);//D 318 if (self)
319 {
320 if (cb)
321 if (SvROK (*av_fetch ((AV *)cb, EVENT_OBJECT_DESTROY, 1)))
322 INVOKE_OBJECT (DESTROY, static_cast<object *>(this));
323 else if (SvROK (*av_fetch ((AV *)cb, EVENT_MAP_DESTROY, 1)))
324 INVOKE_MAP (DESTROY, static_cast<mapstruct *>(this));
320 325
326 // disconnect Perl from C, to avoid crashes
327 sv_unmagic (SvRV ((SV *)self), PERL_MAGIC_ext);
328
329 // clear the perl hash, might or might not be a good idea
330 hv_clear ((HV *)SvRV ((SV *)self));
331
321 if (self) SvREFCNT_dec (self); 332 SvREFCNT_dec (self);
333 self = 0;
334 }
335
336 if (cb)
337 {
322 if (cb) SvREFCNT_dec (cb); 338 SvREFCNT_dec (cb);
339 cb = 0;
340 }
323 341
342 if (attach)
343 {
324 if (attach) free_string (attach); 344 free_string (attach);
325
326 self = 0;
327 cb = 0;
328 attach = 0; 345 attach = 0;
346 }
329} 347}
330 348
331void extendable_base::optimise () 349void attachable_base::optimise ()
332{ 350{
333 if (!self) 351 if (!self)
334 return; 352 return;
335 353
336 HV *hv = (HV *)SvRV ((SV *)self); 354 HV *hv = (HV *)SvRV ((SV *)self);
… …
342 SvREFCNT_dec ((SV *)self); 360 SvREFCNT_dec ((SV *)self);
343 self = 0; 361 self = 0;
344 } 362 }
345} 363}
346 364
347void 365void attachable_base::instantiate (data_type type, void *obj)
348object::instantiate_ ()
349{ 366{
350 dSP; 367 dSP;
351 ENTER; 368 ENTER;
352 SAVETMPS; 369 SAVETMPS;
353 PUSHMARK (SP); 370 PUSHMARK (SP);
354 EXTEND (SP, 2); 371 EXTEND (SP, 2);
355 PUSHs (sv_2mortal (newSVdt (DT_OBJECT, static_cast<object *>(this)))); 372 PUSHs (sv_2mortal (newSVdt (type, obj)));
356 PUSHs (sv_2mortal (newSVpv (attach, 0))); 373 PUSHs (sv_2mortal (newSVpv (attach, 0)));
374
375 free_string (attach);
376 attach = 0;
377
357 PUTBACK; 378 PUTBACK;
358 call_pv ("cf::instantiate", G_DISCARD | G_VOID | G_EVAL); 379 call_pv ("cf::instantiate", G_DISCARD | G_VOID | G_EVAL);
359 FREETMPS; 380 FREETMPS;
360 LEAVE; 381 LEAVE;
382
383 switch (type)
384 {
385 case DT_OBJECT: INVOKE_OBJECT (INSTANTIATE, obj); break;
386 case DT_MAP: INVOKE_MAP (INSTANTIATE, obj); break;
387 }
361} 388}
362 389
363///////////////////////////////////////////////////////////////////////////// 390/////////////////////////////////////////////////////////////////////////////
364 391
365object_freezer::object_freezer (const char *filename)
366: filename (filename)
367{
368 av = (AV *)newAV ();
369 idx = 0;
370 av_extend ((AV *)av, 1024);
371}
372
373object_freezer::~object_freezer ()
374{
375 dSP;
376 ENTER;
377 SAVETMPS;
378 PUSHMARK (SP);
379 XPUSHs (sv_2mortal (newSVpv (filename, 0)));
380 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
381 PUTBACK;
382 call_pv ("cf::object_freezer_save", G_VOID | G_DISCARD | G_EVAL);
383 FREETMPS;
384 LEAVE;
385}
386
387void object_freezer::put (extendable_base *ext)
388{
389 ext->optimise ();
390
391 if (ext->self)
392 av_store ((AV *)av, idx, SvREFCNT_inc ((SV *)ext->self));
393
394 ++idx;
395}
396
397object_thawer::object_thawer (const char *filename)
398{
399 av = 0;
400 idx = 0;
401
402 if (!filename)
403 return;
404
405 dSP;
406 ENTER;
407 SAVETMPS;
408 PUSHMARK (SP);
409 XPUSHs (sv_2mortal (newSVpv (filename, 0)));
410 PUTBACK;
411
412 if (0 < call_pv ("cf::object_thawer_load", G_SCALAR | G_EVAL))
413 {
414 SPAGAIN;
415 SV *sv = POPs;
416 if (SvROK (sv))
417 av = SvREFCNT_inc (SvRV (sv));
418 }
419
420 FREETMPS;
421 LEAVE;
422}
423
424void reattach (data_type type, void *obj) 392void reattach (data_type type, void *obj)
425{ 393{
394 //TODO only do this when the object has _attachment's
395
426 dSP; 396 dSP;
427 ENTER; 397 ENTER;
428 SAVETMPS; 398 SAVETMPS;
429 PUSHMARK (SP); 399 PUSHMARK (SP);
430 XPUSHs (sv_2mortal (newSVdt (type, obj))); 400 XPUSHs (sv_2mortal (newSVdt (type, obj)));
… …
440 case DT_MAP: INVOKE_MAP (REATTACH, obj); break; 410 case DT_MAP: INVOKE_MAP (REATTACH, obj); break;
441 } 411 }
442} 412}
443 413
444template<class subclass> 414template<class subclass>
445void reattach (extendable<subclass> *obj) 415void reattach (attachable<subclass> *obj)
446{ 416{
417 obj->optimise ();
418
447 if (obj->self) 419 if (obj->self)
448 reattach (subclass::get_dt (), (subclass *)obj); 420 reattach (subclass::get_dt (), (subclass *)obj);
449} 421}
450 422
423object_freezer::object_freezer (const char *filename)
424{
425 this->filename = (SV *)newSVpv (filename, 0);
426
427 char filename2 [4096];
428 snprintf (filename2, 4096, "%s~", filename);
429
430 fp = fopen (filename2, "w");
431
432 if (!fp)
433 LOG (llevError, "cannot open file '%s' for writing: %s\n", filename2, strerror (errno));
434
435 av = (AV *)newAV ();
436}
437
438object_freezer::~object_freezer ()
439{
440 if (fp)
441 {
442 fclose (fp);
443
444 dSP;
445 ENTER;
446 SAVETMPS;
447 PUSHMARK (SP);
448 XPUSHs (sv_2mortal ((SV *)filename));
449 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
450 PUTBACK;
451 call_pv ("cf::object_freezer_save", G_VOID | G_DISCARD | G_EVAL);
452 FREETMPS;
453 LEAVE;
454 }
455 else
456 SvREFCNT_dec ((SV *)filename);
457}
458
459void object_freezer::put (attachable_base *ext)
460{
461 ext->optimise ();
462
463 if (ext->self)
464 {
465 int idx = AvFILLp ((AV *)av) + 1;
466 av_store ((AV *)av, idx, SvREFCNT_inc ((SV *)ext->self));
467 fprintf (fp, "oid %d\n", idx);
468 }
469}
470
471object_thawer::object_thawer (FILE *fp, const char *filename)
472{
473 this->fp = fp;
474 av = 0;
475
476 if (!filename)
477 return;
478
479 dSP;
480 ENTER;
481 SAVETMPS;
482 PUSHMARK (SP);
483 XPUSHs (sv_2mortal (newSVpv (filename, 0)));
484 PUTBACK;
485
486 if (0 < call_pv ("cf::object_thawer_load", G_SCALAR | G_EVAL))
487 {
488 SPAGAIN;
489 SV *sv = POPs;
490 if (SvROK (sv))
491 av = SvREFCNT_inc (SvRV (sv));
492 }
493
494 FREETMPS;
495 LEAVE;
496}
497
451void object_thawer::get (data_type type, void *obj, extendable_base *ext) 498void object_thawer::get (data_type type, void *obj, attachable_base *ext, int oid)
452{ 499{
453 if (!av) 500 if (!av || oid < 0) // this is actually an error of sorts
454 return; 501 return;
455 502
456 // we have to "re-instantiate"/reattach to an object, so nuke ext->attach 503 // we have to "re-instantiate"/reattach to an object, so nuke ext->attach
457 ext->clear (); 504 ext->clear ();
458 505
459 SV **svp = av_fetch ((AV *)av, idx, 0); 506 SV **svp = av_fetch ((AV *)av, oid, 0);
460 507
461 ++idx;
462
463 if (!svp)
464 return;
465
466 if (SvROK (*svp)) 508 if (!svp || !SvROK (*svp))
467 { 509 {
468 ext->self = SvREFCNT_inc (*svp); 510 printf ("trying to thaw duplicate or never-issued oid %d, ignoring.\n", oid);
469 sv_magic (SvRV ((SV *)ext->self), 0, PERL_MAGIC_ext, (char *)obj, 0); 511 return;
470
471 reattach (type, obj);
472 } 512 }
513
514 ext->self = *svp; *svp = &PL_sv_undef;
515 sv_magic (SvRV ((SV *)ext->self), 0, PERL_MAGIC_ext, (char *)obj, 0);
516
517 reattach (type, obj);
473} 518}
474 519
475object_thawer::~object_thawer () 520object_thawer::~object_thawer ()
476{ 521{
477 if (av)
478 SvREFCNT_dec ((SV *)av); 522 if (av) SvREFCNT_dec ((AV *)av);
479} 523}
480 524
481///////////////////////////////////////////////////////////////////////////// 525/////////////////////////////////////////////////////////////////////////////
482 526
483extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr) 527extern "C" int cfperl_initPlugin (const char *iversion, f_plug_api gethooksptr)
484{ 528{
485 gethook = gethooksptr;
486 printf (PLUGIN_VERSION " init\n");
487
488 return 0; 529 return 0;
489} 530}
490 531
491static CommArray_s rtn_cmd; 532static CommArray_s rtn_cmd;
492 533
… …
572extern "C" int cfperl_postInitPlugin () 613extern "C" int cfperl_postInitPlugin ()
573{ 614{
574 int hooktype = 1; 615 int hooktype = 1;
575 int rtype = 0; 616 int rtype = 0;
576 617
577 printf (PLUGIN_VERSION " post init\n");
578
579 systemDirectory = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_system_directory");
580 object_set_property = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_object_set_property");
581 map_get_map = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_map_get_map");
582 object_insert = (void* (*)(int*, ...)) gethook (&rtype, hooktype, "cfapi_object_insert");
583
584 cf_init_plugin (gethook); 618 cf_init_plugin (gethook);
585 619
586 return 0; 620 return 0;
587} 621}
588 622
… …
636static event_klass klass_of[NUM_EVENT_TYPES] = { 670static event_klass klass_of[NUM_EVENT_TYPES] = {
637# define def(type,name) KLASS_ ## type, 671# define def(type,name) KLASS_ ## type,
638# include "eventinc.h" 672# include "eventinc.h"
639# undef def 673# undef def
640}; 674};
675
676#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
641 677
642static void 678static void
643gather_callbacks (AV *&callbacks, AV *registry, event_type event) 679gather_callbacks (AV *&callbacks, AV *registry, event_type event)
644{ 680{
645 // event must be in array 681 // event must be in array
… …
688 // 2a. per-type callback 724 // 2a. per-type callback
689 // 4. global callbacks 725 // 4. global callbacks
690 726
691 gather_callbacks (callbacks, cb_global, event); 727 gather_callbacks (callbacks, cb_global, event);
692 728
693 switch (klass_of [event]) 729 switch (KLASS_OF (event))
694 { 730 {
695 case KLASS_GLOBAL: 731 case KLASS_GLOBAL:
696 break; 732 break;
697 733
698 case KLASS_OBJECT: 734 case KLASS_OBJECT:
… …
764 EXTEND (SP, 3); 800 EXTEND (SP, 3);
765 801
766 PUSHs (sv_2mortal (newSViv (event))); // only used for debugging nowadays 802 PUSHs (sv_2mortal (newSViv (event))); // only used for debugging nowadays
767 PUSHs (sv_2mortal (newRV_noinc ((SV *)callbacks))); 803 PUSHs (sv_2mortal (newRV_noinc ((SV *)callbacks)));
768 804
769 switch (klass_of [event]) 805 switch (KLASS_OF (event))
770 { 806 {
771 case KLASS_OBJECT: PUSHs (sv_2mortal (newSVdt (DT_OBJECT, op))); break; 807 case KLASS_OBJECT: PUSHs (sv_2mortal (newSVdt (DT_OBJECT, op))); break;
772 case KLASS_PLAYER: PUSHs (sv_2mortal (newSVdt (DT_PLAYER, pl))); break; 808 case KLASS_PLAYER: PUSHs (sv_2mortal (newSVdt (DT_PLAYER, pl))); break;
773 case KLASS_MAP: PUSHs (sv_2mortal (newSVdt (DT_MAP, map))); break; 809 case KLASS_MAP: PUSHs (sv_2mortal (newSVdt (DT_MAP, map))); break;
774 } 810 }
… …
1521 PROTOTYPE: $$ 1557 PROTOTYPE: $$
1522 1558
1523char *path_combine_and_normalize (char *base, char *path) 1559char *path_combine_and_normalize (char *base, char *path)
1524 PROTOTYPE: $$ 1560 PROTOTYPE: $$
1525 1561
1526char * 1562const char *
1527cf_get_maps_directory (char *path) 1563get_maps_directory (char *path)
1528 PROTOTYPE: $ 1564 PROTOTYPE: $
1529 ALIAS: maps_directory = 0 1565 ALIAS: maps_directory = 0
1566 CODE:
1567 RETVAL = create_pathname (path);
1568 OUTPUT: RETVAL
1530 1569
1531void 1570void
1532sub_generation_inc () 1571sub_generation_inc ()
1533 CODE: 1572 CODE:
1534 PL_sub_generation++; 1573 PL_sub_generation++;
… …
1543 confdir = 3 1582 confdir = 3
1544 localdir = 4 1583 localdir = 4
1545 playerdir = 5 1584 playerdir = 5
1546 datadir = 6 1585 datadir = 6
1547 CODE: 1586 CODE:
1548{ 1587 switch (ix)
1549 int unused_type; 1588 {
1550 RETVAL = (char *)systemDirectory (&unused_type, ix); 1589 case 0: RETVAL = settings.mapdir ; break;
1551} 1590 case 1: RETVAL = settings.uniquedir; break;
1591 case 2: RETVAL = settings.tmpdir ; break;
1592 case 3: RETVAL = settings.confdir ; break;
1593 case 4: RETVAL = settings.localdir ; break;
1594 case 5: RETVAL = settings.playerdir; break;
1595 case 6: RETVAL = settings.datadir ; break;
1596 }
1552 OUTPUT: RETVAL 1597 OUTPUT: RETVAL
1553 1598
1554int 1599int
1555cf_find_animation (char *text) 1600cf_find_animation (char *text)
1556 PROTOTYPE: $ 1601 PROTOTYPE: $
1557 1602
1558int random_roll(int min, int max, object *op, int goodbad); 1603int random_roll(int min, int max, object *op, int goodbad);
1559 1604
1560const char *cost_string_from_value(uint64 cost, int approx = 0) 1605const char *cost_string_from_value(uint64 cost, int approx = 0)
1561 1606
1562int invoke (int event, SV *arg1, ...) 1607int invoke (int event, ...)
1563 CODE: 1608 CODE:
1564{ 1609 if (KLASS_OF (event) != KLASS_GLOBAL) croak ("event class must be GLOBAL");
1565 // parse first arg and call invoke_object etc as seen fit 1610 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); for (int i = 1; i < items; i++) av_push (av, ST (i));
1566 //TODO 1611 RETVAL = INVOKE_((event_type)event, ARG_AV (av));
1567 //cfperl_invoke (event, 1612 OUTPUT: RETVAL
1568}
1569 1613
1570int 1614int
1571exp_to_level (val64 exp) 1615exp_to_level (val64 exp)
1572 CODE: 1616 CODE:
1573{ 1617{
… …
1605 else 1649 else
1606 XSRETURN_UNDEF; 1650 XSRETURN_UNDEF;
1607 OUTPUT: RETVAL 1651 OUTPUT: RETVAL
1608 1652
1609MODULE = cf PACKAGE = cf::object PREFIX = cf_object_ 1653MODULE = cf PACKAGE = cf::object PREFIX = cf_object_
1654
1655int invoke (object *op, int event, ...)
1656 CODE:
1657 if (KLASS_OF (event) != KLASS_OBJECT) croak ("event class must be OBJECT");
1658 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); for (int i = 2; i < items; i++) av_push (av, ST (i));
1659 RETVAL = INVOKE_((event_type)event, ARG_OBJECT (op), ARG_AV (av));
1660 OUTPUT: RETVAL
1661
1662SV *registry (object *op)
1663 CODE:
1664 RETVAL = registry_of (op);
1665 OUTPUT:
1666 RETVAL
1610 1667
1611SV * 1668SV *
1612get_property (object *obj, int type, int idx) 1669get_property (object *obj, int type, int idx)
1613 CODE: 1670 CODE:
1614 RETVAL = newSVcfapi (type, cf_object_get_property (obj, idx)); 1671 RETVAL = newSVcfapi (type, cf_object_get_property (obj, idx));
… …
1812{ 1869{
1813 int unused_type; 1870 int unused_type;
1814 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y); 1871 RETVAL = (object *)object_insert (&unused_type, ob, 0, where, orig, flag, x, y);
1815} 1872}
1816 1873
1817SV *registry (object *op)
1818 CODE:
1819 RETVAL = registry_of (op);
1820 OUTPUT:
1821 RETVAL
1822
1823# syntatic sugar for easier use in event callbacks. 1874# syntatic sugar for easier use in event callbacks.
1824const char *options (object *op) 1875const char *options (object *op)
1825 CODE: 1876 CODE:
1826 RETVAL = op->name; 1877 RETVAL = op->name;
1827 OUTPUT: 1878 OUTPUT:
… …
1899 1950
1900void kill_player (object *op) 1951void kill_player (object *op)
1901 1952
1902MODULE = cf PACKAGE = cf::player PREFIX = cf_player_ 1953MODULE = cf PACKAGE = cf::player PREFIX = cf_player_
1903 1954
1955int invoke (player *pl, int event, ...)
1956 CODE:
1957 if (KLASS_OF (event) != KLASS_PLAYER) croak ("event class must be PLAYER");
1958 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); for (int i = 2; i < items; i++) av_push (av, ST (i));
1959 RETVAL = INVOKE_((event_type)event, ARG_PLAYER (pl), ARG_AV (av));
1960 OUTPUT: RETVAL
1961
1904SV *registry (player *pl) 1962SV *registry (player *pl)
1905 CODE: 1963 CODE:
1906 RETVAL = registry_of (pl); 1964 RETVAL = registry_of (pl);
1907 OUTPUT: 1965 OUTPUT:
1908 RETVAL 1966 RETVAL
… …
2032 OUTPUT: RETVAL 2090 OUTPUT: RETVAL
2033 2091
2034 2092
2035MODULE = cf PACKAGE = cf::map PREFIX = cf_map_ 2093MODULE = cf PACKAGE = cf::map PREFIX = cf_map_
2036 2094
2095int invoke (mapstruct *map, int event, ...)
2096 CODE:
2097 if (KLASS_OF (event) != KLASS_MAP) croak ("event class must be MAP");
2098 AV *av = (AV *)sv_2mortal ((SV *)newAV ()); for (int i = 2; i < items; i++) av_push (av, ST (i));
2099 RETVAL = INVOKE_((event_type)event, ARG_MAP (map), ARG_AV (av));
2100 OUTPUT:
2101 RETVAL
2102
2037SV *registry (mapstruct *map) 2103SV *registry (mapstruct *map)
2038 CODE: 2104 CODE:
2039 RETVAL = registry_of (map); 2105 RETVAL = registry_of (map);
2040 OUTPUT: 2106 OUTPUT:
2041 RETVAL 2107 RETVAL
… …
2133cf_map_normalise (mapstruct *map, int x, int y) 2199cf_map_normalise (mapstruct *map, int x, int y)
2134 PPCODE: 2200 PPCODE:
2135{ 2201{
2136 mapstruct *nmap = 0; 2202 mapstruct *nmap = 0;
2137 I16 nx = 0, ny = 0; 2203 I16 nx = 0, ny = 0;
2138 int flags = cf_map_get_flags (map, &nmap, x, y, &nx, &ny); 2204 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2139 2205
2140 EXTEND (SP, 4); 2206 EXTEND (SP, 4);
2141 PUSHs (sv_2mortal (newSViv (flags))); 2207 PUSHs (sv_2mortal (newSViv (flags)));
2142 2208
2143 if (GIMME_V == G_ARRAY) 2209 if (GIMME_V == G_ARRAY)
… …
2155{ 2221{
2156 object *o; 2222 object *o;
2157 mapstruct *nmap = 0; 2223 mapstruct *nmap = 0;
2158 I16 nx, ny; 2224 I16 nx, ny;
2159 2225
2160 cf_map_get_flags (map, &nmap, x, y, &nx, &ny); 2226 get_map_flags (map, &nmap, x, y, &nx, &ny);
2161 2227
2162 if (nmap) 2228 if (nmap)
2163 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2229 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above)
2164 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o))); 2230 XPUSHs (sv_2mortal (newSVcfapi (CFAPI_POBJECT, o)));
2165} 2231}
… …
2224 } 2290 }
2225 } 2291 }
2226} 2292}
2227 2293
2228 2294
2229MODULE = cf PACKAGE = cf::arch PREFIX = cf_archetype_ 2295MODULE = cf PACKAGE = cf::arch
2230 2296
2231archetype *cf_archetype_get_first() 2297archetype *first()
2232 PROTOTYPE: 2298 PROTOTYPE:
2233 ALIAS: first = 0 2299 CODE:
2300 RETVAL = first_archetype;
2301 OUTPUT: RETVAL
2234 2302
2235archetype *cf_archetype_get_next (archetype *arch) 2303archetype *next (archetype *arch)
2236 ALIAS: next = 0 2304 CODE:
2305 RETVAL = arch->next;
2306 OUTPUT: RETVAL
2237 2307
2238archetype *cf_archetype_get_head (archetype *arch) 2308archetype *head (archetype *arch)
2239 ALIAS: head = 0 2309 CODE:
2310 RETVAL = arch->head;
2311 OUTPUT: RETVAL
2240 2312
2241archetype *cf_archetype_get_more (archetype *arch) 2313archetype *more (archetype *arch)
2242 ALIAS: more = 0 2314 CODE:
2315 RETVAL = arch->more;
2316 OUTPUT: RETVAL
2243 2317
2244const char *cf_archetype_get_name (archetype *arch) 2318const char *name (archetype *arch)
2245 ALIAS: name = 0 2319 CODE:
2320 RETVAL = arch->name;
2321 OUTPUT: RETVAL
2246 2322
2247object *cf_archetype_get_clone (archetype *arch) 2323object *clone (archetype *arch)
2248 ALIAS: clone = 0 2324 CODE:
2325 RETVAL = &arch->clone;
2326 OUTPUT: RETVAL
2249 2327
2250MODULE = cf PACKAGE = cf::party PREFIX = cf_party_ 2328MODULE = cf PACKAGE = cf::party
2251 2329
2252partylist *cf_party_get_first () 2330partylist *first ()
2253 PROTOTYPE: 2331 PROTOTYPE:
2254 ALIAS: first = 0 2332 CODE:
2333 RETVAL = get_firstparty ();
2334 OUTPUT: RETVAL
2255 2335
2256partylist *cf_party_get_next (partylist *party) 2336partylist *next (partylist *party)
2257 ALIAS: next = 0 2337 CODE:
2338 RETVAL = party->next;
2339 OUTPUT: RETVAL
2258 2340
2259const char *cf_party_get_name (partylist *party) 2341const char *name (partylist *party)
2342 CODE:
2343 RETVAL = party->partyname;
2344 OUTPUT: RETVAL
2260 2345
2261const char *cf_party_get_password (partylist *party) 2346const char *password (partylist *party)
2262 ALIAS: password = 0 2347 CODE:
2348 RETVAL = party->passwd;
2349 OUTPUT: RETVAL
2263 2350
2264player *cf_party_get_first_player (partylist *party) 2351MODULE = cf PACKAGE = cf::region
2265 ALIAS: first_player = 0
2266 2352
2267player *cf_party_get_next_player (partylist *party, player *op) 2353region *first ()
2268 ALIAS: next_player = 0
2269
2270
2271MODULE = cf PACKAGE = cf::region PREFIX = cf_region_
2272
2273region *cf_region_get_first ()
2274 PROTOTYPE: 2354 PROTOTYPE:
2275 ALIAS: first = 0 2355 CODE:
2356 RETVAL = first_region;
2357 OUTPUT: RETVAL
2276 2358
2359region *next (region *reg)
2360 CODE:
2361 RETVAL = reg->next;
2362 OUTPUT: RETVAL
2363
2364const char *name (region *reg)
2365 CODE:
2366 RETVAL = reg->name;
2367 OUTPUT: RETVAL
2368
2369region *parent (region *reg)
2370 CODE:
2371 RETVAL = reg->parent;
2372 OUTPUT: RETVAL
2373
2277const char *cf_region_get_name (region *reg) 2374const char *longname (region *reg)
2278 ALIAS: name = 0 2375 CODE:
2376 RETVAL = reg->longname;
2377 OUTPUT: RETVAL
2279 2378
2280region *cf_region_get_next (region *reg) 2379const char *msg (region *reg)
2281 ALIAS: next = 0 2380 CODE:
2381 RETVAL = reg->msg;
2382 OUTPUT: RETVAL
2282 2383
2283region *cf_region_get_parent (region *reg) 2384MODULE = cf PACKAGE = cf::living
2284 ALIAS: parent = 0
2285
2286const char *cf_region_get_longname (region *reg)
2287 ALIAS: longname = 0
2288
2289const char *cf_region_get_message (region *reg)
2290 ALIAS: message = 0
2291
2292
2293MODULE = cf PACKAGE = cf::living PREFIX = cf_living_
2294 2385
2295val64 2386val64
2296exp (living *liv, val64 new_val = 0) 2387exp (living *liv, val64 new_val = 0)
2297 PROTOTYPE: $;$ 2388 PROTOTYPE: $;$
2298 ALIAS: 2389 ALIAS:

Diff Legend

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