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.227 by root, Tue Jul 10 16:24:00 2007 UTC vs.
Revision 1.239 by root, Thu Jul 26 00:27:09 2007 UTC

… …
246 delete obj; 246 delete obj;
247 } 247 }
248 } 248 }
249} 249}
250 250
251void
252attachable::set_key (const char *key, const char *value)
253{
254 if (!self)
255 self = newHV ();
256
257 if (value)
258 hv_store (self, key, strlen (key), newSVpv (value, 0), 0);
259 else
260 hv_delete (self, key, strlen (key), G_DISCARD);
261}
262
251attachable & 263attachable &
252attachable::operator =(const attachable &src) 264attachable::operator =(const attachable &src)
253{ 265{
254 //if (self || cb) 266 //if (self || cb)
255 //INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst)); 267 //INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
… …
330{ 342{
331 if (!obj) 343 if (!obj)
332 return &PL_sv_undef; 344 return &PL_sv_undef;
333 345
334 if (!obj->self) 346 if (!obj->self)
347 obj->self = newHV ();
348
349 if (!SvOBJECT (obj->self))
335 { 350 {
336 obj->self = newHV ();
337 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0); 351 sv_magicext ((SV *)obj->self, 0, PERL_MAGIC_ext, &attachable::vtbl, (char *)obj, 0);
338 352
339 // now bless the object _once_ 353 // now bless the object _once_
354 //TODO: create a class registry with c++ type<=>perl name<=>stash and use it here and elsewhere
340 return sv_bless (newRV_inc ((SV *)obj->self), stash); 355 return sv_bless (newRV_inc ((SV *)obj->self), stash);
341 } 356 }
342 else 357 else
343 { 358 {
344 SV *sv = newRV_inc ((SV *)obj->self); 359 SV *sv = newRV_inc ((SV *)obj->self);
… …
417inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 432inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
418inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 433inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
419inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 434inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
420inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 435inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
421inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 436inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
437inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
422inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 438inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
423inline SV *to_sv (region * v) { return newSVptr (v, stash_cf_region_wrap); }
424inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 439inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
425 440
426inline SV *to_sv (object & v) { return to_sv (&v); } 441inline SV *to_sv (object & v) { return to_sv (&v); }
427inline SV *to_sv (living & v) { return to_sv (&v); } 442inline SV *to_sv (living & v) { return to_sv (&v); }
428 443
… …
454inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); } 469inline void sv_to (SV *sv, client * &v) { v = (client *)(attachable *)SvPTR_ornull (sv, "cf::client"); }
455inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); } 470inline void sv_to (SV *sv, player * &v) { v = (player *)(attachable *)SvPTR_ornull (sv, "cf::player"); }
456inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); } 471inline void sv_to (SV *sv, object * &v) { v = (object *)(attachable *)SvPTR_ornull (sv, "cf::object"); }
457inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 472inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
458inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 473inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
474inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); }
459inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 475inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
460inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 476inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
461inline void sv_to (SV *sv, region * &v) { v = (region *)SvPTR_ornull (sv, "cf::region"); }
462inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 477inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
463 478
464//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 479//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
465inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 480inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
466 481
… …
949} 964}
950 965
951SV * 966SV *
952cfperl_result (int idx) 967cfperl_result (int idx)
953{ 968{
954 AV *av = get_av ("cfperl::invoke_results", 0); 969 AV *av = get_av ("cf::INVOKE_RESULTS", 0);
955 if (!av) 970 if (!av)
956 return &PL_sv_undef; 971 return &PL_sv_undef;
957 972
958 SV **sv = av_fetch (av, idx, 0); 973 SV **sv = av_fetch (av, idx, 0);
959 if (!sv) 974 if (!sv)
… …
1006void 1021void
1007cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1022cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
1008{ 1023{
1009 CALL_BEGIN (4); 1024 CALL_BEGIN (4);
1010 CALL_ARG (ns); 1025 CALL_ARG (ns);
1011 CALL_ARG (color);
1012 CALL_ARG (type); 1026 CALL_ARG (type);
1013 CALL_ARG_SV (newSVpv_utf8 (msg)); 1027 CALL_ARG_SV (newSVpv_utf8 (msg));
1028 CALL_ARG (color);
1014 CALL_CALL ("cf::client::send_msg", G_VOID); 1029 CALL_CALL ("cf::client::send_msg", G_VOID);
1015 CALL_END; 1030 CALL_END;
1031}
1032
1033int
1034cfperl_can_merge (object *ob1, object *ob2)
1035{
1036 int can;
1037
1038 CALL_BEGIN (2);
1039 CALL_ARG (ob1);
1040 CALL_ARG (ob2);
1041 CALL_CALL ("cf::_can_merge", G_SCALAR);
1042 can = count && SvTRUE (TOPs);
1043 CALL_END;
1044
1045 return can;
1016} 1046}
1017 1047
1018maptile * 1048maptile *
1019maptile::find_sync (const char *path, maptile *origin) 1049maptile::find_sync (const char *path, maptile *origin)
1020{ 1050{
… …
1491 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY) 1521 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1492 1522
1493 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP) 1523 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1494 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV) 1524 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV)
1495 const_iv (GT_MINIMAL) 1525 const_iv (GT_MINIMAL)
1526
1527 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1528 const_iv (FT_RSRC) const_iv (FT_NUM)
1496 }; 1529 };
1497 1530
1498 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1531 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1499 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1532 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1500 1533
… …
1534 1567
1535 for_all_objects (op) 1568 for_all_objects (op)
1536 op->reattach (); 1569 op->reattach ();
1537} 1570}
1538 1571
1539void _post_tick ()
1540 CODE:
1541 coroapi::next_cede = SvNV (sv_next_tick) - TICK * (1. - 1. / CEDES_PER_TICK);
1542
1543# support function for map-world.ext 1572# support function for map-world.ext
1544void _quantise (SV *data_sv, SV *plt_sv) 1573void _quantise (SV *data_sv, SV *plt_sv)
1545 CODE: 1574 CODE:
1546{ 1575{
1547 if (!SvROK (plt_sv) || SvTYPE (SvRV (plt_sv)) != SVt_PVAV) 1576 if (!SvROK (plt_sv) || SvTYPE (SvRV (plt_sv)) != SVt_PVAV)
… …
1579 len -= 3; 1608 len -= 3;
1580 } 1609 }
1581 1610
1582 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1611 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1583} 1612}
1613
1614void _post_tick ()
1615 CODE:
1616 coroapi::next_cede = SvNV (sv_next_tick) - TICK * (1. - 1. / CEDES_PER_TICK);
1617
1618NV till_cede ()
1619 CODE:
1620 RETVAL = coroapi::next_cede - now ();
1621 OUTPUT:
1622 RETVAL
1623
1624NV till_tick ()
1625 CODE:
1626 RETVAL = SvNV (sv_next_tick) - now ();
1627 OUTPUT:
1628 RETVAL
1584 1629
1585NV floor (NV x) 1630NV floor (NV x)
1586 1631
1587NV ceil (NV x) 1632NV ceil (NV x)
1588 1633
… …
1631octet_string path_combine (octet_string base, octet_string path) 1676octet_string path_combine (octet_string base, octet_string path)
1632 PROTOTYPE: $$ 1677 PROTOTYPE: $$
1633 1678
1634octet_string path_combine_and_normalize (octet_string base, octet_string path) 1679octet_string path_combine_and_normalize (octet_string base, octet_string path)
1635 PROTOTYPE: $$ 1680 PROTOTYPE: $$
1636
1637const_octet_string
1638get_maps_directory (octet_string path)
1639 PROTOTYPE: $
1640 ALIAS: maps_directory = 0
1641 CODE:
1642 RETVAL = create_pathname (path);
1643 OUTPUT: RETVAL
1644 1681
1645void 1682void
1646sub_generation_inc () 1683sub_generation_inc ()
1647 CODE: 1684 CODE:
1648 PL_sub_generation++; 1685 PL_sub_generation++;
… …
1994 2031
1995void add_button_link (object *button, maptile *map, int connected); 2032void add_button_link (object *button, maptile *map, int connected);
1996 2033
1997void remove_button_link (object *op); 2034void remove_button_link (object *op);
1998 2035
2036void handle_apply_yield (object *op);
2037
1999 2038
2000MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2039MODULE = cf PACKAGE = cf::object PREFIX = cf_
2001 2040
2002object *cf_insert_ob_in_ob (object *ob, object *where) 2041object *cf_insert_ob_in_ob (object *ob, object *where)
2003 2042
… …
2104 pl->orig_stats = pl->ob->stats; 2143 pl->orig_stats = pl->ob->stats;
2105 2144
2106void clear_los (player *pl) 2145void clear_los (player *pl)
2107 2146
2108void cf_player_move (player *pl, int dir) 2147void cf_player_move (player *pl, int dir)
2109
2110void play_sound_player_only (player *pl, int soundnum, int x = 0, int y = 0);
2111 2148
2112bool 2149bool
2113cell_visible (player *pl, int dx, int dy) 2150cell_visible (player *pl, int dx, int dy)
2114 CODE: 2151 CODE:
2115 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2152 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
… …
2254 palette = SvRV (palette); 2291 palette = SvRV (palette);
2255 2292
2256 STRLEN idxlen; 2293 STRLEN idxlen;
2257 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen); 2294 const uint8_t *idx = (const uint8_t *)SvPVbyte (data, idxlen);
2258 2295
2259 region **regionmap = (region **)malloc ( 2296 region_ptr *regionmap = new region_ptr [av_len ((AV *)palette) + 1];
2260 (av_len ((AV *)palette) + 1) * sizeof (region *));
2261 uint8_t *regions = salloc<uint8_t> (THIS->size ()); 2297 uint8_t *regions = salloc<uint8_t> (THIS->size ());
2262 2298
2263 for (int i = av_len ((AV *)palette) + 1; i--; ) 2299 for (int i = av_len ((AV *)palette) + 1; i--; )
2264 regionmap [i] = region::find ( 2300 regionmap [i] = region::find (SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2265 SvPVutf8_nolen (*av_fetch ((AV *)palette, i, 1)));
2266 2301
2267 for (int y = 0; y < THIS->height; ++y) 2302 for (int y = 0; y < THIS->height; ++y)
2268 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width); 2303 memcpy (regions + y * THIS->width, idx + offset + y * stride, THIS->width);
2269 2304
2270 sfree (THIS->regions, THIS->size ()); 2305 sfree (THIS->regions, THIS->size ());
2271 free (THIS->regionmap); 2306 delete [] THIS->regionmap;
2272 2307
2273 THIS->regions = regions; 2308 THIS->regions = regions;
2274 THIS->regionmap = regionmap; 2309 THIS->regionmap = regionmap;
2275} 2310}
2276 2311
… …
2296 } 2331 }
2297 } 2332 }
2298 2333
2299 op->destroy (); 2334 op->destroy ();
2300} 2335}
2301
2302void play_sound_map (maptile *map, int x, int y, int sound_num)
2303 2336
2304int out_of_map (maptile *map, int x, int y) 2337int out_of_map (maptile *map, int x, int y)
2305 2338
2306void 2339void
2307trigger (maptile *map, long connection, bool state = true) 2340trigger (maptile *map, long connection, bool state = true)
… …
2579 char *buf = SvPVbyte (packet, len); 2612 char *buf = SvPVbyte (packet, len);
2580 2613
2581 THIS->send_packet (buf, len); 2614 THIS->send_packet (buf, len);
2582} 2615}
2583 2616
2617faceidx
2618client::need_face (utf8_string name, int pri = 0)
2619 CODE:
2620 RETVAL = face_find (name, 0);
2621 if (RETVAL)
2622 {
2623 THIS->send_face (RETVAL, pri);
2624 THIS->flush_fx ();
2625 }
2626 OUTPUT:
2627 RETVAL
2628
2629int
2630client::fx_want (int idx, int value = -1)
2631 CODE:
2632 if (0 < idx && idx < FT_NUM)
2633 {
2634 RETVAL = THIS->fx_want [idx];
2635 if (items > 2)
2636 THIS->fx_want [idx] = value;
2637 }
2638 else
2639 RETVAL = 0;
2640 OUTPUT:
2641 RETVAL
2642
2643MODULE = cf PACKAGE = cf::sound PREFIX = sound_
2644
2645faceidx sound_find (utf8_string name)
2646
2584MODULE = cf PACKAGE = cf::face PREFIX = face_ 2647MODULE = cf PACKAGE = cf::face PREFIX = face_
2585 2648
2586#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h | 2649#INCLUDE: $PERL $srcdir/genacc faceset ../include/face.h |
2587 2650
2588faceidx face_find (utf8_string name, faceidx defidx = 0) 2651faceidx face_find (utf8_string name, faceidx defidx = 0)
… …
2611 set_visibility = 1 2674 set_visibility = 1
2612 set_magicmap = 2 2675 set_magicmap = 2
2613 set_smooth = 3 2676 set_smooth = 3
2614 set_smoothlevel = 4 2677 set_smoothlevel = 4
2615 CODE: 2678 CODE:
2616 faceinfo *f = face_info (idx); 2679 faceinfo *f = face_info (idx); assert (f);
2617 assert (f);
2618 switch (ix) 2680 switch (ix)
2619 { 2681 {
2620 case 0: f->type = value; break; 2682 case 0: f->type = value; break;
2621 case 1: f->visibility = value; break; 2683 case 1: f->visibility = value; break;
2622 case 2: f->magicmap = value; break; 2684 case 2: f->magicmap = value; break;
… …
2625 } 2687 }
2626 2688
2627void set_data (faceidx idx, int faceset, SV *data, SV *chksum) 2689void set_data (faceidx idx, int faceset, SV *data, SV *chksum)
2628 CODE: 2690 CODE:
2629{ 2691{
2630 facedata *d = face_data (idx, faceset); 2692 faceinfo *f = face_info (idx); assert (f);
2631 assert (d); 2693 facedata *d = &(faceset ? f->data64 : f->data32);
2632 sv_to (data, d->data); 2694 sv_to (data, d->data);
2633 STRLEN clen; 2695 STRLEN clen;
2634 char *cdata = SvPVbyte (chksum, clen); 2696 char *cdata = SvPVbyte (chksum, clen);
2635 clen = min (CHKSUM_SIZE, clen); 2697 clen = min (CHKSUM_SIZE, clen);
2636 2698
… …
2646 ns->force_newmap = true; 2708 ns->force_newmap = true;
2647 } 2709 }
2648 } 2710 }
2649} 2711}
2650 2712
2713int get_data_size (faceidx idx, int faceset = 0)
2714 CODE:
2715 facedata *d = face_data (idx, faceset); assert (d);
2716 RETVAL = d->data.size ();
2717 OUTPUT:
2718 RETVAL
2719
2720SV *get_chksum (faceidx idx, int faceset = 0)
2721 CODE:
2722 facedata *d = face_data (idx, faceset); assert (d);
2723 RETVAL = newSVpvn ((char *)d->chksum, CHKSUM_SIZE);
2724 OUTPUT:
2725 RETVAL
2726
2651void invalidate (faceidx idx) 2727void invalidate (faceidx idx)
2652 CODE: 2728 CODE:
2653 for_all_clients (ns) 2729 for_all_clients (ns)
2654 { 2730 {
2655 ns->faces_sent [idx] = false; 2731 ns->faces_sent [idx] = false;

Diff Legend

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