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.417 by root, Sun Nov 4 01:01:13 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[] = {
… …
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)
… …
1886load_resource_file_ (octet_string filename) 1887load_resource_file_ (octet_string filename)
1887 1888
1888void 1889void
1889fix_weight () 1890fix_weight ()
1890 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
1891MODULE = cf PACKAGE = cf::attachable 1897MODULE = cf PACKAGE = cf::attachable
1892 1898
1893int 1899int
1894valid (SV *obj) 1900valid (SV *obj)
1895 CODE: 1901 CODE:
… …
2117int convert_item (object *item, object *converter) 2123int convert_item (object *item, object *converter)
2118 2124
2119void 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);
2120 2126
2121MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2127MODULE = cf PACKAGE = cf::object PREFIX = cf_
2122
2123# no clean way to get an object from an archetype - stupid idiotic
2124# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
2125 2128
2126object *new (utf8_string archetype = 0) 2129object *new (utf8_string archetype = 0)
2127 PROTOTYPE: ;$ 2130 PROTOTYPE: ;$
2128 CODE: 2131 CODE:
2129 RETVAL = archetype 2132 RETVAL = archetype
… …
2397 croak ("maptile::add_underlay: palette must be arrayref"); 2400 croak ("maptile::add_underlay: palette must be arrayref");
2398 2401
2399 palette = SvRV (palette); 2402 palette = SvRV (palette);
2400 2403
2401 STRLEN idxlen; 2404 STRLEN idxlen;
2402 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen); 2405 const uint8 *idx = (const uint8 *)SvPVbyte (data, idxlen);
2403 2406
2404 for (int x = 0; x < THIS->width; ++x) 2407 for (int x = 0; x < THIS->width; ++x)
2405 for (int y = 0; y < THIS->height; ++y) 2408 for (int y = 0; y < THIS->height; ++y)
2406 { 2409 {
2407 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)
… …
2447 croak ("maptile::set_regiondata: palette must be arrayref"); 2450 croak ("maptile::set_regiondata: palette must be arrayref");
2448 2451
2449 palette = SvRV (palette); 2452 palette = SvRV (palette);
2450 2453
2451 STRLEN idxlen; 2454 STRLEN idxlen;
2452 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen); 2455 const uint8 *idx = (const uint8 *)SvPVbyte (data, idxlen);
2453 2456
2454 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1]; 2457 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2455 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2458 uint8 *regions = salloc<uint8_t> (THIS->size ());
2456 2459
2457 for (int i = av_len ((AV *)palette) + 1; i--; ) 2460 for (int i = av_len ((AV *)palette) + 1; i--; )
2458 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)));
2459 2462
2460 for (int y = 0; y < THIS->height; ++y) 2463 for (int y = 0; y < THIS->height; ++y)
… …
2596archetype *skillvec (U32 index) 2599archetype *skillvec (U32 index)
2597 CODE: 2600 CODE:
2598 RETVAL = index < skillvec.size () ? (archetype *)(object *)skillvec [index] : 0; 2601 RETVAL = index < skillvec.size () ? (archetype *)(object *)skillvec [index] : 0;
2599 OUTPUT: RETVAL 2602 OUTPUT: RETVAL
2600 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
2601INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h | 2611INCLUDE: $PERL $srcdir/genacc archetype $srcdir/../include/object.h |
2602 2612
2603MODULE = cf PACKAGE = cf::party 2613MODULE = cf PACKAGE = cf::party
2604 2614
2605partylist *first () 2615partylist *first ()
… …
2769 case 2: f->magicmap = value; break; 2779 case 2: f->magicmap = value; break;
2770 case 3: f->smooth = value; break; 2780 case 3: f->smooth = value; break;
2771 case 4: f->smoothlevel = value; break; 2781 case 4: f->smoothlevel = value; break;
2772 } 2782 }
2773 2783
2774void set_data (faceidx idx, int faceset, SV *data, SV *chksum) 2784void set_csum (faceidx idx, int faceset, SV *chksum)
2775 CODE: 2785 CODE:
2776{ 2786{
2777 faceinfo *f = face_info (idx); assert (f); 2787 faceinfo *f = face_info (idx); assert (f);
2778 facedata *d = f->face + faceset; 2788 facedata *d = f->face + faceset;
2779 sv_to (data, d->data);
2780 STRLEN clen; 2789 STRLEN clen;
2781 char *cdata = SvPVbyte (chksum, clen); 2790 char *cdata = SvPVbyte (chksum, clen);
2782 2791
2783 assert (("cf::face::set_data called with too long checksum", clen <= CHKSUM_MAXLEN)); 2792 assert (("cf::face::set_data called with too long checksum", clen <= CHKSUM_MAXLEN));
2784 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));
… …
2788 d->chksum_len = clen; 2797 d->chksum_len = clen;
2789 memcpy (d->chksum, cdata, clen); 2798 memcpy (d->chksum, cdata, clen);
2790 2799
2791 // invalidate existing client face info 2800 // invalidate existing client face info
2792 for_all_clients (ns) 2801 for_all_clients (ns)
2793 if (ns->faceset == faceset) 2802 ns->invalidate_face (idx);
2794 {
2795 ns->faces_sent [idx] = false;
2796 ns->force_newmap = true;
2797 }
2798 } 2803 }
2799} 2804}
2800 2805
2801int get_data_size (faceidx idx, int faceset = 0)
2802 CODE:
2803 facedata *d = face_data (idx, faceset);
2804 if (!d) XSRETURN_UNDEF;
2805 RETVAL = d->data.size ();
2806 OUTPUT:
2807 RETVAL
2808
2809void set_meta (faceidx idx, SV *sv)
2810 CODE:
2811{
2812 faceinfo *f = face_info (idx); assert (f);
2813 SvREFCNT_dec (f->meta_hv);
2814 f->meta_hv = SvOK (sv) ? (HV *)SvREFCNT_inc (SvRV (sv)) : 0;
2815}
2816
2817SV *mangle_chksum (SV *chksum) 2806SV *mangle_csum (SV *chksum)
2818 CODE: 2807 CODE:
2819 STRLEN len; 2808 STRLEN len;
2820 char *data = SvPVbyte (chksum, len); 2809 char *data = SvPVbyte (chksum, len);
2821 RETVAL = newSVpvn (data, min (len, CHKSUM_MAXLEN)); 2810 RETVAL = newSVpvn (data, min (len, CHKSUM_MAXLEN));
2822 OUTPUT: 2811 OUTPUT:
2823 RETVAL 2812 RETVAL
2824 2813
2825SV *get_chksum (faceidx idx, int faceset = 0) 2814SV *get_csum (faceidx idx, int faceset = 0)
2826 CODE: 2815 CODE:
2827 facedata *d = face_data (idx, faceset); 2816 facedata *d = face_data (idx, faceset);
2828 if (!d) XSRETURN_UNDEF; 2817 if (!d) XSRETURN_UNDEF;
2829 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len); 2818 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2830 OUTPUT: 2819 OUTPUT:
… …
2841SV *get_name (faceidx idx) 2830SV *get_name (faceidx idx)
2842 CODE: 2831 CODE:
2843 faceinfo *f = face_info (idx); 2832 faceinfo *f = face_info (idx);
2844 if (!f) XSRETURN_UNDEF; 2833 if (!f) XSRETURN_UNDEF;
2845 RETVAL = to_sv (f->name); 2834 RETVAL = to_sv (f->name);
2846 OUTPUT:
2847 RETVAL
2848
2849SV *get_data (faceidx idx, int faceset = 0)
2850 CODE:
2851 facedata *d = face_data (idx, faceset);
2852 if (!d) XSRETURN_UNDEF;
2853 RETVAL = newSVpvn (d->data, d->data.size ());
2854 OUTPUT:
2855 RETVAL
2856
2857SV *get_meta (faceidx idx)
2858 CODE:
2859 faceinfo *f = face_info (idx); assert (f);
2860 if (!f || !f->meta_hv) XSRETURN_UNDEF;
2861 RETVAL = newRV_inc ((SV *)f->meta_hv);
2862 OUTPUT: 2835 OUTPUT:
2863 RETVAL 2836 RETVAL
2864 2837
2865void invalidate (faceidx idx) 2838void invalidate (faceidx idx)
2866 CODE: 2839 CODE:
… …
2969 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2942 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
2970 2943
2971 self->skip (); 2944 self->skip ();
2972 } 2945 }
2973 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
2974MODULE = cf PACKAGE = cf::layout 2976MODULE = cf PACKAGE = cf::layout
2975 2977
2976INCLUDE: $PERL $srcdir/genacc layout $srcdir/../include/rmg.h | 2978INCLUDE: $PERL $srcdir/genacc layout $srcdir/../include/rmg.h |
2977 2979

Diff Legend

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