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.413 by root, Tue Oct 30 15:05:10 2012 UTC vs.
Revision 1.425 by root, Wed Nov 14 06:21:39 2012 UTC

… …
92 92
93static SV 93static SV
94 *cv_cf_do_invoke, 94 *cv_cf_do_invoke,
95 *cv_cf__can_merge, 95 *cv_cf__can_merge,
96 *cv_cf_client_send_msg, 96 *cv_cf_client_send_msg,
97 *cv_cf_ix,
97 *cv_cf_tick, 98 *cv_cf_tick,
98 *cv_cf_match_match; 99 *cv_cf_match_match;
99 100
100#ifndef newSVpv_utf8 101#ifndef newSVpv_utf8
101static SV * 102static SV *
… …
1157 CALL_ARG (originator); 1158 CALL_ARG (originator);
1158 CALL_CALL ("cf::mapscript::activate", G_VOID); 1159 CALL_CALL ("cf::mapscript::activate", G_VOID);
1159 CALL_END; 1160 CALL_END;
1160} 1161}
1161 1162
1163void cfperl_ix (client *ns, int set, faceidx idx, int pri)
1164{
1165 CALL_BEGIN (3);
1166 CALL_ARG (ns);
1167 CALL_ARG (set);
1168 CALL_ARG (idx);
1169 CALL_ARG (pri);
1170 CALL_CALL (cv_cf_ix, G_VOID);
1171 CALL_END;
1172}
1173
1162player * 1174player *
1163player::find (const_utf8_string name) 1175player::find (const_utf8_string name)
1164{ 1176{
1165 CALL_BEGIN (1); 1177 CALL_BEGIN (1);
1166 CALL_ARG (name); 1178 CALL_ARG (name);
… …
1436_connect_to_perl_2 () 1448_connect_to_perl_2 ()
1437{ 1449{
1438 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke); 1450 cv_cf_do_invoke = (SV *)get_cv ("cf::do_invoke" , 0); assert (cv_cf_do_invoke);
1439 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge); 1451 cv_cf__can_merge = (SV *)get_cv ("cf::_can_merge" , 0); assert (cv_cf__can_merge);
1440 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg); 1452 cv_cf_client_send_msg = (SV *)get_cv ("cf::client::send_msg", 0); assert (cv_cf_client_send_msg);
1453 cv_cf_ix = (SV *)get_cv ("cf::face::ix" , 0); assert (cv_cf_ix);
1441 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick); 1454 cv_cf_tick = (SV *)get_cv ("cf::tick" , 0); assert (cv_cf_tick);
1442 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match); 1455 cv_cf_match_match = (SV *)get_cv ("cf::match::match" , 0); assert (cv_cf_match_match);
1443} 1456}
1444 1457
1445MODULE = cf PACKAGE = cf PREFIX = cf_ 1458MODULE = cf PACKAGE = cf PREFIX = cf_
… …
1450 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI; 1463 I_CORO_API (PACKAGE); coroapi::GCoroAPI = GCoroAPI;
1451 1464
1452 _connect_to_perl_1 (); 1465 _connect_to_perl_1 ();
1453 1466
1454 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1)); 1467 newCONSTSUB (stash_cf, "VERSION", newSVpv (VERSION, sizeof (VERSION) - 1));
1455
1456 //{
1457 // require_pv ("Time::HiRes");
1458 //
1459 // SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1460 // if (!svp) croak ("Time::HiRes is required");
1461 // if (!SvIOK(*svp)) croak ("Time::NVtime isn’t a function pointer");
1462 // coroapi::time = INT2PTR (double(*)(), SvIV(*svp));
1463 //}
1464 1468
1465 static const struct { 1469 static const struct {
1466 const char *name; 1470 const char *name;
1467 IV iv; 1471 IV iv;
1468 } *civ, const_iv[] = { 1472 } *civ, const_iv[] = {
… …
1579 1583
1580void init_dynamic () 1584void init_dynamic ()
1581 1585
1582void load_settings () 1586void load_settings ()
1583 1587
1584void reload_exp_table () 1588void _reload_exp_table ()
1585 1589
1586void reload_materials () 1590void _reload_materials ()
1587 1591
1588void init_uuid () 1592void init_uuid ()
1589 CODE: 1593 CODE:
1590 UUID::init (); 1594 UUID::init ();
1591 1595
… …
1655NV rndm (...) 1659NV rndm (...)
1656 ALIAS: 1660 ALIAS:
1657 rmg_rndm = 1 1661 rmg_rndm = 1
1658 CODE: 1662 CODE:
1659{ 1663{
1660 rand_gen &gen = ix ? rmg_rndm : rndm; 1664 rand_gen &gen = ix ? rmg_rndm : rndm;
1661 switch (items) 1665 switch (items)
1662 { 1666 {
1663 case 0: RETVAL = gen (); break; 1667 case 0: RETVAL = gen (); break;
1664 case 1: RETVAL = gen (SvUV (ST (0))); break; 1668 case 1: RETVAL = gen (SvUV (ST (0))); break;
1665 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break; 1669 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
… …
1789 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1793 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1790 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count))); 1794 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1791 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount))); 1795 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1792} 1796}
1793 1797
1794int find_animation (utf8_string text)
1795 PROTOTYPE: $
1796
1797int random_roll (int min, int max, object *op, int goodbad); 1798int random_roll (int min, int max, object *op, int goodbad);
1798 1799
1799const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1800const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1800 1801
1801int exp_to_level (val64 exp) 1802int exp_to_level (val64 exp)
1802 1803
1803val64 level_to_min_exp (int level) 1804val64 level_to_min_exp (int level)
1805
1806const_utf8_string
1807spellpathnames (int idx)
1808 CODE:
1809 RETVAL = spellpathnames [idx];
1810 OUTPUT: RETVAL
1804 1811
1805SV * 1812SV *
1806attacktype_name (int atnr) 1813attacktype_name (int atnr)
1807 CODE: 1814 CODE:
1808 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS) 1815 RETVAL = IN_RANGE_EXC (atnr, 0, NROFATTACKS)
… …
1880load_resource_file_ (octet_string filename) 1887load_resource_file_ (octet_string filename)
1881 1888
1882void 1889void
1883fix_weight () 1890fix_weight ()
1884 1891
1892utf8_string
1893expand_cfpod (int hintmode, int gender, const_utf8_string cfpod)
1894 PPCODE:
1895 XPUSHs (to_sv (player::expand_cfpod (hintmode, gender, cfpod)));
1896
1885MODULE = cf PACKAGE = cf::attachable 1897MODULE = cf PACKAGE = cf::attachable
1886 1898
1887int 1899int
1888valid (SV *obj) 1900valid (SV *obj)
1889 CODE: 1901 CODE:
… …
2111int convert_item (object *item, object *converter) 2123int convert_item (object *item, object *converter)
2112 2124
2113void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags); 2125void fix_generated_item (object *op, object *creator, int difficulty, int max_magic, int flags);
2114 2126
2115MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2127MODULE = cf PACKAGE = cf::object PREFIX = cf_
2116
2117# no clean way to get an object from an archetype - stupid idiotic
2118# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
2119 2128
2120object *new (utf8_string archetype = 0) 2129object *new (utf8_string archetype = 0)
2121 PROTOTYPE: ;$ 2130 PROTOTYPE: ;$
2122 CODE: 2131 CODE:
2123 RETVAL = archetype 2132 RETVAL = archetype
… …
2391 croak ("maptile::add_underlay: palette must be arrayref"); 2400 croak ("maptile::add_underlay: palette must be arrayref");
2392 2401
2393 palette = SvRV (palette); 2402 palette = SvRV (palette);
2394 2403
2395 STRLEN idxlen; 2404 STRLEN idxlen;
2396 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen); 2405 const uint8 *idx = (const uint8 *)SvPVbyte (data, idxlen);
2397 2406
2398 for (int x = 0; x < THIS->width; ++x) 2407 for (int x = 0; x < THIS->width; ++x)
2399 for (int y = 0; y < THIS->height; ++y) 2408 for (int y = 0; y < THIS->height; ++y)
2400 { 2409 {
2401 for (object *op = THIS->at (x, y).bot; op; op = op->above) 2410 for (object *op = THIS->at (x, y).bot; op; op = op->above)
… …
2441 croak ("maptile::set_regiondata: palette must be arrayref"); 2450 croak ("maptile::set_regiondata: palette must be arrayref");
2442 2451
2443 palette = SvRV (palette); 2452 palette = SvRV (palette);
2444 2453
2445 STRLEN idxlen; 2454 STRLEN idxlen;
2446 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen); 2455 const uint8 *idx = (const uint8 *)SvPVbyte (data, idxlen);
2447 2456
2448 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2457 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2449 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2458 uint8 *regions = salloc<uint8_t> (THIS->size ());
2450 2459
2451 for (int i = av_len ((AV *)palette) + 1; i--; ) 2460 for (int i = av_len ((AV *)palette) + 1; i--; )
2452 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1))); 2461 regionmap [i] = region::find (cfSvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2453 2462
2454 for (int y = 0; y < THIS->height; ++y) 2463 for (int y = 0; y < THIS->height; ++y)
… …
2580archetype *archetypes (U32 index) 2589archetype *archetypes (U32 index)
2581 CODE: 2590 CODE:
2582 RETVAL = index < archetypes.size () ? archetypes [index] : 0; 2591 RETVAL = index < archetypes.size () ? archetypes [index] : 0;
2583 OUTPUT: RETVAL 2592 OUTPUT: RETVAL
2584 2593
2594int skillvec_size ()
2595 CODE:
2596 RETVAL = skillvec.size ();
2597 OUTPUT: RETVAL
2598
2599archetype *skillvec (U32 index)
2600 CODE:
2601 RETVAL = index < skillvec.size () ? (archetype *)(object *)skillvec [index] : 0;
2602 OUTPUT: RETVAL
2603
2604void
2605find_by_type (int type)
2606 PPCODE:
2607 for_all_archetypes (arch)
2608 if (arch->type == type)
2609 XPUSHs (sv_2mortal (to_sv (arch)));
2610
2585INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h | 2611INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2586 2612
2587MODULE = cf PACKAGE = cf::party 2613MODULE = cf PACKAGE = cf::party
2588 2614
2589partylist *first () 2615partylist *first ()
… …
2637list () 2663list ()
2638 PPCODE: 2664 PPCODE:
2639 EXTEND (SP, clients.size ()); 2665 EXTEND (SP, clients.size ());
2640 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 2666 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
2641 PUSHs (sv_2mortal (to_sv (*i))); 2667 PUSHs (sv_2mortal (to_sv (*i)));
2668
2669STRLEN
2670client::inbuf_append (SV *data)
2671 CODE:
2672{
2673 STRLEN len;
2674 char *ptr = SvPVbyte (data, len);
2675
2676 min_it (len, sizeof (THIS->inbuf) - THIS->inbuf_len);
2677 memcpy (THIS->inbuf + THIS->inbuf_len, ptr, len);
2678 THIS->inbuf_len += len;
2679
2680 THIS->inbuf_handle ();
2681
2682 RETVAL = len;
2683}
2684 OUTPUT: RETVAL
2642 2685
2643void 2686void
2644client::send_packet (SV *packet) 2687client::send_packet (SV *packet)
2645 CODE: 2688 CODE:
2646{ 2689{
… …
2736 case 2: f->magicmap = value; break; 2779 case 2: f->magicmap = value; break;
2737 case 3: f->smooth = value; break; 2780 case 3: f->smooth = value; break;
2738 case 4: f->smoothlevel = value; break; 2781 case 4: f->smoothlevel = value; break;
2739 } 2782 }
2740 2783
2741void set_data (faceidx idx, int faceset, SV *data, SV *chksum) 2784void set_csum (faceidx idx, int faceset, SV *chksum)
2742 CODE: 2785 CODE:
2743{ 2786{
2744 faceinfo *f = face_info (idx); assert (f); 2787 faceinfo *f = face_info (idx); assert (f);
2745 facedata *d = f->face + faceset; 2788 facedata *d = f->face + faceset;
2746 sv_to (data, d->data);
2747 STRLEN clen; 2789 STRLEN clen;
2748 char *cdata = SvPVbyte (chksum, clen); 2790 char *cdata = SvPVbyte (chksum, clen);
2749 clen = min (CHKSUM_MAXLEN, clen);
2750 2791
2792 assert (("cf::face::set_data called with too long checksum", clen <= CHKSUM_MAXLEN));
2751 assert (("cf::face::set_data must be called with a non-empty checksum", clen)); 2793 assert (("cf::face::set_data must be called with a non-empty checksum", clen));
2752 2794
2753 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen)) 2795 if (clen != d->chksum_len || memcmp (d->chksum, cdata, clen))
2754 { 2796 {
2755 d->chksum_len = clen; 2797 d->chksum_len = clen;
2756 memcpy (d->chksum, cdata, clen); 2798 memcpy (d->chksum, cdata, clen);
2757 2799
2758 // invalidate existing client face info 2800 // invalidate existing client face info
2759 for_all_clients (ns) 2801 for_all_clients (ns)
2760 if (ns->faceset == faceset) 2802 ns->invalidate_face (idx);
2761 {
2762 ns->faces_sent [idx] = false;
2763 ns->force_newmap = true;
2764 }
2765 } 2803 }
2766} 2804}
2767 2805
2768int get_data_size (faceidx idx, int faceset = 0) 2806SV *mangle_csum (SV *chksum)
2769 CODE: 2807 CODE:
2770 facedata *d = face_data (idx, faceset); 2808 STRLEN len;
2771 if (!d) XSRETURN_UNDEF; 2809 char *data = SvPVbyte (chksum, len);
2772 RETVAL = d->data.size (); 2810 RETVAL = newSVpvn (data, min (len, CHKSUM_MAXLEN));
2773 OUTPUT: 2811 OUTPUT:
2774 RETVAL 2812 RETVAL
2775 2813
2776void set_meta (faceidx idx, SV *sv)
2777 CODE:
2778{
2779 faceinfo *f = face_info (idx); assert (f);
2780 SvREFCNT_dec (f->meta_hv);
2781 f->meta_hv = SvOK (sv) ? (HV *)SvREFCNT_inc (SvRV (sv)) : 0;
2782}
2783
2784SV *get_chksum (faceidx idx, int faceset = 0) 2814SV *get_csum (faceidx idx, int faceset = 0)
2785 CODE: 2815 CODE:
2786 facedata *d = face_data (idx, faceset); 2816 facedata *d = face_data (idx, faceset);
2787 if (!d) XSRETURN_UNDEF; 2817 if (!d) XSRETURN_UNDEF;
2788 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len); 2818 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2789 OUTPUT: 2819 OUTPUT:
2790 RETVAL 2820 RETVAL
2791 2821
2792SV *get_data (faceidx idx, int faceset = 0) 2822int get_type (faceidx idx)
2793 CODE: 2823 CODE:
2794 facedata *d = face_data (idx, faceset); 2824 faceinfo *f = face_info (idx);
2795 if (!d) XSRETURN_UNDEF; 2825 if (!f) XSRETURN_UNDEF;
2796 RETVAL = newSVpvn (d->data, d->data.size ()); 2826 RETVAL = f->type;
2797 OUTPUT: 2827 OUTPUT:
2798 RETVAL 2828 RETVAL
2799 2829
2800SV *get_meta (faceidx idx) 2830SV *get_name (faceidx idx)
2801 CODE: 2831 CODE:
2802 faceinfo *f = face_info (idx); assert (f); 2832 faceinfo *f = face_info (idx);
2803 if (!f || !f->meta_hv) XSRETURN_UNDEF; 2833 if (!f) XSRETURN_UNDEF;
2804 RETVAL = newRV_inc ((SV *)f->meta_hv); 2834 RETVAL = to_sv (f->name);
2805 OUTPUT: 2835 OUTPUT:
2806 RETVAL 2836 RETVAL
2807 2837
2808void invalidate (faceidx idx) 2838void invalidate (faceidx idx)
2809 CODE: 2839 CODE:
… …
2912 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2942 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
2913 2943
2914 self->skip (); 2944 self->skip ();
2915 } 2945 }
2916 2946
2947MODULE = cf PACKAGE = cf::treasurelist
2948
2949# quick hack, because I didn't want to implement accessors for treasurelist.
2950# this asks for even more autogen, actually.
2951
2952void
2953expand (treasurelist *list)
2954 PPCODE:
2955 EXTEND (SP, 3);
2956 PUSHs (sv_2mortal (to_sv (list->name)));
2957 PUSHs (sv_2mortal (to_sv (list->total_chance)));
2958 AV *av = newAV ();
2959 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2960 for (treasure *item = list->items; item; item = item->next)
2961 {
2962 AV *iav = newAV ();
2963 av_push (av, newRV_noinc ((SV *)iav));
2964
2965 av_extend (iav, 7);
2966 av_push (iav, to_sv (item->item));
2967 av_push (iav, to_sv (item->name));
2968 av_push (iav, to_sv (item->change_arch.name));
2969 av_push (iav, to_sv (item->change_arch.title));
2970 av_push (iav, to_sv (item->change_arch.slaying));
2971 av_push (iav, to_sv (item->chance));
2972 av_push (iav, to_sv (item->nrof));
2973 av_push (iav, to_sv (item->magic));
2974 }
2975
2917MODULE = cf PACKAGE = cf::layout 2976MODULE = cf PACKAGE = cf::layout
2918 2977
2919INCLUDE: $PERL $srcdir/genacc layout $srcdir/../include/rmg.h | 2978INCLUDE: $PERL $srcdir/genacc layout $srcdir/../include/rmg.h |
2920 2979

Diff Legend

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