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.396 by root, Sun Jan 23 23:35:30 2011 UTC vs.
Revision 1.414 by root, Tue Oct 30 17:07:50 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2006,2007,2008,2009,2010,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the Affero GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>. 18 * <http://www.gnu.org/licenses/>.
19 * 19 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 21 */
22 22
23#include "autoconf.h" 23#include "autoconf.h"
24 24
… …
29#include <cstdarg> 29#include <cstdarg>
30#include <typeinfo> 30#include <typeinfo>
31 31
32#include "global.h" 32#include "global.h"
33#include "rmg.h" 33#include "rmg.h"
34#include "noise.h"
34#include "evthread.h" 35#include "evthread.h"
35#include "sproto.h" 36#include "sproto.h"
36 37
37#include <unistd.h> 38#include <unistd.h>
38#if _POSIX_MEMLOCK 39#if _POSIX_MEMLOCK
… …
66static int tick_inhibit; 67static int tick_inhibit;
67static int tick_pending; 68static int tick_pending;
68 69
69global gbl_ev; 70global gbl_ev;
70static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map; 71static AV *cb_global, *cb_attachable, *cb_object, *cb_player, *cb_client, *cb_type, *cb_map;
71static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now; 72static SV *sv_runtime, *sv_tick_start, *sv_next_tick, *sv_now, *sv_server_tick;
72static AV *av_reflect; 73static AV *av_reflect;
73 74
74bitset<NUM_EVENT_TYPES> ev_want_event; 75bitset<NUM_EVENT_TYPES> ev_want_event;
75bitset<NUM_TYPES> ev_want_type; 76bitset<NUM_TYPES> ev_want_type;
76 77
… …
252 { 253 {
253 static int last_mortalcount; 254 static int last_mortalcount;
254 if (mortals.size () != last_mortalcount) 255 if (mortals.size () != last_mortalcount)
255 { 256 {
256 last_mortalcount = mortals.size (); 257 last_mortalcount = mortals.size ();
257 LOG (llevInfo, "%d mortals.\n", (int)mortals.size ()); 258 object *specimen = is_a<object> (mortals [rndm (mortals.size ())]);
259
260 LOG (llevInfo, "%d mortals (random specimen: %s).\n",
261 (int)mortals.size (), specimen ? specimen->debug_desc () : "(not an object)");
258 262
259 if (0) 263 if (0)
260 { 264 {
261 for (int j = 0; j < mortals.size (); ++j)//D 265 for (int j = 0; j < mortals.size (); ++j)//D
262 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D 266 fprintf (stderr, "%d:%s %p ", j, &((object *)mortals[j])->name, mortals[j]);//D
… …
621 STRLEN len; 625 STRLEN len;
622 char *data = SvPVbyte (sv, len); 626 char *data = SvPVbyte (sv, len);
623 v.assign (data, len); 627 v.assign (data, len);
624} 628}
625 629
630static inline void sv_to (SV *sv, refcnt_buf &v)
631{
632 STRLEN len;
633 char *data = SvPVbyte (sv, len);
634 refcnt_buf buf (data, len);
635 v = buf;
636}
637
626static inline void sv_to (SV *sv, UUID &v) 638static inline void sv_to (SV *sv, UUID &v)
627{ 639{
628 if (!v.parse (SvPV_nolen (sv))) 640 if (!v.parse (SvPV_nolen (sv)))
629 croak ("unparsable uuid: %s", SvPV_nolen (sv)); 641 croak ("unparsable uuid: %s", SvPV_nolen (sv));
630} 642}
… …
1403 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1415 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1404 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1416 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1405 stash_cf_layout_wrap = gv_stashpv ("cf::layout::wrap", 1); 1417 stash_cf_layout_wrap = gv_stashpv ("cf::layout::wrap", 1);
1406 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1); 1418 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1407 1419
1408 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1420 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1409 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV); 1421 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1422 sv_server_tick = get_sv ("cf::SERVER_TICK", 1); SvUPGRADE (sv_server_tick, SVt_IV);
1410 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV); 1423 sv_tick_start = get_sv ("cf::TICK_START" , 1); SvUPGRADE (sv_tick_start , SVt_NV);
1411 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV); 1424 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
1412 1425
1413 cb_global = get_av ("cf::CB_GLOBAL", 1); 1426 cb_global = get_av ("cf::CB_GLOBAL", 1);
1414 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1); 1427 cb_attachable = get_av ("cf::CB_ATTACHABLE", 1);
1415 cb_object = get_av ("cf::CB_OBJECT", 1); 1428 cb_object = get_av ("cf::CB_OBJECT", 1);
1416 cb_player = get_av ("cf::CB_PLAYER", 1); 1429 cb_player = get_av ("cf::CB_PLAYER", 1);
… …
1485 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE) 1498 const_iv (SAVE_MODE) const_iv (SAVE_DIR_MODE)
1486 1499
1487 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE) 1500 const_iv (SK_EXP_ADD_SKILL) const_iv (SK_EXP_TOTAL) const_iv (SK_EXP_NONE)
1488 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY) 1501 const_iv (SK_SUBTRACT_SKILL_EXP) const_iv (SK_EXP_SKILL_ONLY)
1489 1502
1490 const_iv (MAP_ACTIVE) const_iv (MAP_SWAPPED) const_iv (MAP_LOADING) const_iv (MAP_SAVING)
1491 const_iv (MAP_INACTIVE)
1492
1493 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT) 1503 const_iv (KLASS_ATTACHABLE) const_iv (KLASS_GLOBAL) const_iv (KLASS_OBJECT)
1494 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP) 1504 const_iv (KLASS_CLIENT) const_iv (KLASS_PLAYER) const_iv (KLASS_MAP)
1495 1505
1496 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1506 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1497 1507
… …
1529 1539
1530void _gv_clear (SV *gv) 1540void _gv_clear (SV *gv)
1531 CODE: 1541 CODE:
1532 assert (SvTYPE (gv) == SVt_PVGV); 1542 assert (SvTYPE (gv) == SVt_PVGV);
1533# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); } 1543# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1544 SvREFCNT_inc (gv);
1534 f (GvGP (gv)->gp_form); 1545 f (GvGP (gv)->gp_form);
1535 f (GvGP (gv)->gp_io); 1546 f (GvGP (gv)->gp_io);
1536 f (GvGP (gv)->gp_sv); 1547 f (GvGP (gv)->gp_sv);
1537 f (GvGP (gv)->gp_av); 1548 f (GvGP (gv)->gp_av);
1538 f (GvGP (gv)->gp_hv); 1549 f (GvGP (gv)->gp_hv);
1539 f (GvGP (gv)->gp_cv); 1550 f (GvGP (gv)->gp_cv);
1540 GvCVGEN (gv) = 0; 1551 GvCVGEN (gv) = 0;
1541 GvMULTI_off (gv); 1552 GvMULTI_off (gv);
1553 SvREFCNT_dec (gv);
1542# undef f 1554# undef f
1543 1555
1544void _connect_to_perl_1 () 1556void _connect_to_perl_1 ()
1545 1557
1546void _connect_to_perl_2 () 1558void _connect_to_perl_2 ()
… …
1557 1569
1558 for_all_objects (op) 1570 for_all_objects (op)
1559 op->reattach (); 1571 op->reattach ();
1560} 1572}
1561 1573
1562# support function for map-world.ext
1563void _quantise (SV *data_sv, SV *plt_sv)
1564 CODE:
1565{
1566 if (!SvROK (plt_sv) || SvTYPE (SvRV (plt_sv)) != SVt_PVAV)
1567 croak ("_quantise called with invalid agruments");
1568
1569 plt_sv = SvRV (plt_sv);
1570 SV **plt = AvARRAY (plt_sv);
1571 int plt_count = AvFILL (plt_sv) + 1;
1572
1573 STRLEN len;
1574 char *data = SvPVbyte (data_sv, len);
1575 char *dst = data;
1576
1577 while (len >= 3)
1578 {
1579 for (SV **val_sv = plt + plt_count; val_sv-- > plt; )
1580 {
1581 char *val = SvPVX (*val_sv);
1582
1583 if (val [0] == data [0]
1584 && val [1] == data [1]
1585 && val [2] == data [2])
1586 {
1587 *dst++ = val [3];
1588 goto next;
1589 }
1590 }
1591
1592 croak ("_quantise: color not found in palette: #%02x%02x%02x, at offset %d %d",
1593 (uint8_t)data [0], (uint8_t)data [1], (uint8_t)data [2],
1594 dst - SvPVX (data_sv), len);
1595
1596 next:
1597 data += 3;
1598 len -= 3;
1599 }
1600
1601 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1602}
1603
1604void init_anim () 1574void init_anim ()
1605 1575
1606void init_globals () 1576void init_globals ()
1607 1577
1608void init_attackmess () 1578void init_attackmess ()
… …
1654 { 1624 {
1655 ev_async_send (EV_DEFAULT, &tick_watcher); 1625 ev_async_send (EV_DEFAULT, &tick_watcher);
1656 coroapi::cede (); 1626 coroapi::cede ();
1657 } 1627 }
1658 1628
1659void server_tick () 1629void one_tick ()
1660 CODE: 1630 CODE:
1661{ 1631{
1662 ev_now_update (EV_DEFAULT); 1632 ev_now_update (EV_DEFAULT);
1663 NOW = ev_now (EV_DEFAULT); 1633 NOW = ev_now (EV_DEFAULT);
1664 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1634 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1665 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start); 1635 SvNV_set (sv_tick_start, NOW); SvNOK_only (sv_tick_start);
1666 runtime = SvNVX (sv_runtime); 1636 runtime = SvNVX (sv_runtime);
1667 1637
1638 one_tick ();
1639
1668 server_tick (); 1640 ++server_tick;
1641 SvUV_set (sv_server_tick, server_tick); SvIOK_only_UV (sv_server_tick);
1669 1642
1670 ev_now_update (EV_DEFAULT); 1643 ev_now_update (EV_DEFAULT);
1671 NOW = ev_now (EV_DEFAULT); 1644 NOW = ev_now (EV_DEFAULT);
1672 SvNV_set (sv_now, NOW); SvNOK_only (sv_now); 1645 SvNV_set (sv_now, NOW); SvNOK_only (sv_now);
1646
1673 runtime += TICK; 1647 runtime += TICK;
1674 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime); 1648 SvNV_set (sv_runtime, runtime); SvNOK_only (sv_runtime);
1675} 1649}
1676 1650
1677NV floor (NV x) 1651NV floor (NV x)
… …
1778 INIT: 1752 INIT:
1779#if __GLIBC__ 1753#if __GLIBC__
1780 mallopt (M_TOP_PAD, 1024 * 1024); 1754 mallopt (M_TOP_PAD, 1024 * 1024);
1781 mallopt (M_MMAP_THRESHOLD, 1024 * 1024); 1755 mallopt (M_MMAP_THRESHOLD, 1024 * 1024);
1782 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory 1756 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1783 if (__GLIBC_MAJOR < 2 || (__GLIBC_MAJOR == 2 && __GLIBC_MINOR < 10)) 1757 if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10))
1784 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1758 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1785#endif 1759#endif
1786 1760
1787int munlockall () 1761int munlockall ()
1788 1762
… …
2144# dumb kludgy misdesigned plug-in api slowly gets on my nerves. 2118# dumb kludgy misdesigned plug-in api slowly gets on my nerves.
2145 2119
2146object *new (utf8_string archetype = 0) 2120object *new (utf8_string archetype = 0)
2147 PROTOTYPE: ;$ 2121 PROTOTYPE: ;$
2148 CODE: 2122 CODE:
2149 RETVAL = archetype ? get_archetype (archetype) : object::create (); 2123 RETVAL = archetype
2124 ? archetype::get (archetype)
2125 : object::create ();
2150 OUTPUT: 2126 OUTPUT:
2151 RETVAL 2127 RETVAL
2152 2128
2153object *generate (utf8_string arch, object *creator) 2129object *generate (utf8_string arch, object *creator)
2154 CODE: 2130 CODE:
2155 object *obj = get_archetype (arch); 2131 object *obj = archetype::get (arch);
2156 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL); 2132 fix_generated_item (obj, creator, 0, 0, GT_MINIMAL);
2157 RETVAL = obj; 2133 RETVAL = obj;
2158 OUTPUT: 2134 OUTPUT:
2159 RETVAL 2135 RETVAL
2160 2136
… …
2170 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2146 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2171 2147
2172 if (RETVAL->destroyed ()) 2148 if (RETVAL->destroyed ())
2173 RETVAL = 0; 2149 RETVAL = 0;
2174} 2150}
2151 OUTPUT:
2152 RETVAL
2175 2153
2176shstr 2154shstr
2177object::kv_get (shstr key) 2155object::kv_get (shstr key)
2156 CODE:
2157 RETVAL = THIS->kv.get (key);
2158 OUTPUT:
2159 RETVAL
2178 2160
2179void 2161void
2180object::kv_del (shstr key) 2162object::kv_del (shstr key)
2163 CODE:
2164 THIS->kv.del (key);
2181 2165
2182void 2166void
2183object::kv_set (shstr key, shstr value) 2167object::kv_set (shstr key, shstr value)
2168 CODE:
2169 THIS->kv.set (key, value);
2184 2170
2185object *get_nearest_player (object *ob) 2171object *get_nearest_player (object *ob)
2186 ALIAS: nearest_player = 0 2172 ALIAS: nearest_player = 0
2187 PREINIT: 2173 PREINIT:
2188 extern object *get_nearest_player (object *); 2174 extern object *get_nearest_player (object *);
… …
2391 if (pl->ob && pl->ob->map == THIS) 2377 if (pl->ob && pl->ob->map == THIS)
2392 PUSHs (sv_2mortal (to_sv (pl->ob))); 2378 PUSHs (sv_2mortal (to_sv (pl->ob)));
2393 } 2379 }
2394 2380
2395void 2381void
2382maptile::gen_quadmap (int x, int y, int z)
2383 CODE:
2384 gen_quadmap (THIS, x * 50, y * 50, z);
2385
2386void
2396maptile::add_underlay (SV *data, int offset, int stride, SV *palette) 2387maptile::add_underlay (SV *data, int offset, int stride, SV *palette)
2397 CODE: 2388 CODE:
2398{ 2389{
2399 if (!SvROK (palette) || SvTYPE (SvRV (palette)) != SVt_PVAV) 2390 if (!SvROK (palette) || SvTYPE (SvRV (palette)) != SVt_PVAV)
2400 croak ("maptile::add_underlay: palette must be arrayref"); 2391 croak ("maptile::add_underlay: palette must be arrayref");
… …
2416 2407
2417 if (IN_RANGE_EXC (offs, 0, idxlen)) 2408 if (IN_RANGE_EXC (offs, 0, idxlen))
2418 { 2409 {
2419 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0)) 2410 if (SV **elem = av_fetch ((AV *)palette, idx [offs], 0))
2420 { 2411 {
2421 object *ob = get_archetype (cfSvPVutf8_nolen (*elem)); 2412 object *ob = archetype::get (cfSvPVutf8_nolen (*elem));
2422 ob->flag [FLAG_NO_MAP_SAVE] = true; 2413 ob->flag [FLAG_NO_MAP_SAVE] = true;
2423 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY); 2414 THIS->insert (ob, x, y, 0, INS_ABOVE_FLOOR_ONLY);
2424 2415
2425 if (ob->randomitems && !ob->above) 2416 if (ob->randomitems && !ob->above)
2426 { 2417 {
… …
2430 op->flag [FLAG_NO_MAP_SAVE] = true; 2421 op->flag [FLAG_NO_MAP_SAVE] = true;
2431 // TODO: if this is a pickable object, then the item 2422 // TODO: if this is a pickable object, then the item
2432 // will at a bit weird - saving inside the player 2423 // will at a bit weird - saving inside the player
2433 // will clear the flag, but when the player drops 2424 // will clear the flag, but when the player drops
2434 // it without logging out, it keeps the flag. 2425 // it without logging out, it keeps the flag.
2435 // nobody ahs reported this, but this can be rather 2426 // nobody has reported this, but this can be rather
2436 // annoying on persistent maps. 2427 // annoying on persistent maps.
2437 } 2428 }
2438 } 2429 }
2439 } 2430 }
2440 } 2431 }
2441
2442 skip: ; 2432 skip: ;
2443 } 2433 }
2444} 2434}
2445 2435
2446void 2436void
… …
2477 for (int x = 0; x < THIS->width; ++x) 2467 for (int x = 0; x < THIS->width; ++x)
2478 for (int y = 0; y < THIS->height; ++y) 2468 for (int y = 0; y < THIS->height; ++y)
2479 { 2469 {
2480 region *rgn = THIS->region (x, y); 2470 region *rgn = THIS->region (x, y);
2481 2471
2482 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2483 if (object *op = THIS->at (x, y).top) 2472 if (object *op = THIS->at (x, y).top)
2484 if (rgn->treasure && rndm () < rgn->treasure_density) 2473 if (rgn->treasure && rndm () < rgn->treasure_density)
2485 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2474 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2486 } 2475 }
2487 2476
… …
2649 PPCODE: 2638 PPCODE:
2650 EXTEND (SP, clients.size ()); 2639 EXTEND (SP, clients.size ());
2651 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i) 2640 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
2652 PUSHs (sv_2mortal (to_sv (*i))); 2641 PUSHs (sv_2mortal (to_sv (*i)));
2653 2642
2643STRLEN
2644client::inbuf_append (SV *data)
2645 CODE:
2646{
2647 STRLEN len;
2648 char *ptr = SvPVbyte (data, len);
2649
2650 min_it (len, sizeof (THIS->inbuf) - THIS->inbuf_len);
2651 memcpy (THIS->inbuf + THIS->inbuf_len, ptr, len);
2652 THIS->inbuf_len += len;
2653
2654 THIS->inbuf_handle ();
2655
2656 RETVAL = len;
2657}
2658 OUTPUT: RETVAL
2659
2654void 2660void
2655client::send_packet (SV *packet) 2661client::send_packet (SV *packet)
2656 CODE: 2662 CODE:
2657{ 2663{
2658 STRLEN len; 2664 STRLEN len;
… …
2713faceidx face_find (utf8_string name, faceidx defidx = 0) 2719faceidx face_find (utf8_string name, faceidx defidx = 0)
2714 2720
2715faceidx alloc (utf8_string name) 2721faceidx alloc (utf8_string name)
2716 CODE: 2722 CODE:
2717{ 2723{
2718 do 2724 RETVAL = face_alloc ();
2719 {
2720 RETVAL = faces.size ();
2721 faces.resize (RETVAL + 1);
2722 }
2723 while (!RETVAL); // crude way to leave index 0
2724 2725
2725 faces [RETVAL].name = name; 2726 faces [RETVAL].name = name;
2726 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL)); 2727 facehash.insert (std::make_pair (faces [RETVAL].name, RETVAL));
2727 2728
2728 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL; 2729 if (!strcmp (name, BLANK_FACE_NAME )) blank_face = RETVAL;
2729 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL; 2730 if (!strcmp (name, EMPTY_FACE_NAME )) empty_face = RETVAL;
2730 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL; 2731 if (!strcmp (name, MAGICMOUTH_FACE_NAME)) magicmouth_face = RETVAL;
2731} 2732}
2733 OUTPUT: RETVAL
2734
2735faceidx faces_size ()
2736 CODE:
2737 RETVAL = faces.size ();
2732 OUTPUT: RETVAL 2738 OUTPUT: RETVAL
2733 2739
2734void set_type (faceidx idx, int value) 2740void set_type (faceidx idx, int value)
2735 ALIAS: 2741 ALIAS:
2736 set_type = 0 2742 set_type = 0
… …
2782 if (!d) XSRETURN_UNDEF; 2788 if (!d) XSRETURN_UNDEF;
2783 RETVAL = d->data.size (); 2789 RETVAL = d->data.size ();
2784 OUTPUT: 2790 OUTPUT:
2785 RETVAL 2791 RETVAL
2786 2792
2793void set_meta (faceidx idx, SV *sv)
2794 CODE:
2795{
2796 faceinfo *f = face_info (idx); assert (f);
2797 SvREFCNT_dec (f->meta_hv);
2798 f->meta_hv = SvOK (sv) ? (HV *)SvREFCNT_inc (SvRV (sv)) : 0;
2799}
2800
2787SV *get_chksum (faceidx idx, int faceset = 0) 2801SV *get_chksum (faceidx idx, int faceset = 0)
2788 CODE: 2802 CODE:
2789 facedata *d = face_data (idx, faceset); 2803 facedata *d = face_data (idx, faceset);
2790 if (!d) XSRETURN_UNDEF; 2804 if (!d) XSRETURN_UNDEF;
2791 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len); 2805 RETVAL = newSVpvn ((char *)d->chksum, d->chksum_len);
2792 OUTPUT: 2806 OUTPUT:
2793 RETVAL 2807 RETVAL
2794 2808
2809int get_type (faceidx idx)
2810 CODE:
2811 faceinfo *f = face_info (idx);
2812 if (!f) XSRETURN_UNDEF;
2813 RETVAL = f->type;
2814 OUTPUT:
2815 RETVAL
2816
2795SV *get_data (faceidx idx, int faceset = 0) 2817SV *get_data (faceidx idx, int faceset = 0)
2796 CODE: 2818 CODE:
2797 facedata *d = face_data (idx, faceset); 2819 facedata *d = face_data (idx, faceset);
2798 if (!d) XSRETURN_UNDEF; 2820 if (!d) XSRETURN_UNDEF;
2799 RETVAL = newSVpvn (d->data.data (), d->data.length ()); 2821 RETVAL = newSVpvn (d->data, d->data.size ());
2800 OUTPUT: 2822 OUTPUT:
2801 RETVAL 2823 RETVAL
2802 2824
2825SV *get_meta (faceidx idx)
2826 CODE:
2827 faceinfo *f = face_info (idx); assert (f);
2828 if (!f || !f->meta_hv) XSRETURN_UNDEF;
2829 RETVAL = newRV_inc ((SV *)f->meta_hv);
2830 OUTPUT:
2831 RETVAL
2832
2803void invalidate (faceidx idx) 2833void invalidate (faceidx idx)
2804 CODE: 2834 CODE:
2805 for_all_clients (ns) 2835 for_all_clients (ns)
2806 { 2836 ns->invalidate_face (idx);
2807 ns->faces_sent [idx] = false;
2808 ns->force_newmap = true;
2809 }
2810 2837
2811void invalidate_all () 2838void invalidate_all ()
2812 CODE: 2839 CODE:
2813 for_all_clients (ns) 2840 for_all_clients (ns)
2814 { 2841 ns->invalidate_all_faces ();
2815 ns->faces_sent.reset ();
2816 ns->force_newmap = true;
2817 }
2818 2842
2819MODULE = cf PACKAGE = cf::anim PREFIX = anim_ 2843MODULE = cf PACKAGE = cf::anim PREFIX = anim_
2820 2844
2821#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h | 2845#INCLUDE: $PERL $srcdir/genacc faceset $srcdir/../include/anim.h |
2822 2846
… …
2826 OUTPUT: RETVAL 2850 OUTPUT: RETVAL
2827 2851
2828animidx set (utf8_string name, SV *frames, int facings = 1) 2852animidx set (utf8_string name, SV *frames, int facings = 1)
2829 CODE: 2853 CODE:
2830{ 2854{
2831 if (!SvROK (frames) && SvTYPE (SvRV (frames)) != SVt_PVAV) 2855 if (!SvROK (frames) && SvTYPE (SvRV (frames)) != SVt_PVAV)
2832 croak ("frames must be an arrayref"); 2856 croak ("frames must be an arrayref");
2833 2857
2834 AV *av = (AV *)SvRV (frames); 2858 AV *av = (AV *)SvRV (frames);
2835 2859
2836 animation *anim = &animation::find (name); 2860 animation *anim = &animation::find (name);
2837 if (anim->number) 2861 if (anim->number)
2838 { 2862 {
2839 anim->resize (av_len (av) + 1); 2863 anim->resize (av_len (av) + 1);
2840 anim->facings = facings; 2864 anim->facings = facings;
2841 } 2865 }

Diff Legend

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