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.288 by root, Tue May 6 18:47:32 2008 UTC vs.
Revision 1.309 by root, Thu Dec 4 03:48:19 2008 UTC

… …
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include "autoconf.h" 24#include "autoconf.h"
25 25
26#define PLUGIN_NAME "perl"
27#define PLUGIN_VERSION "cfperl 0.5"
28
29#if HAVE_EXECINFO_H 26#if HAVE_EXECINFO_H
30# include <execinfo.h> 27# include <execinfo.h>
31#endif 28#endif
32 29
33#include <cstdarg> 30#include <cstdarg>
31#include <typeinfo>
34 32
35#include "global.h" 33#include "global.h"
36#include "loader.h" 34#include "loader.h"
37#include "../random_maps/random_map.h" 35#include "../random_maps/random_map.h"
38#include "evthread.h" 36#include "evthread.h"
… …
83 *stash_cf, 81 *stash_cf,
84 *stash_cf_object_wrap, 82 *stash_cf_object_wrap,
85 *stash_cf_object_player_wrap, 83 *stash_cf_object_player_wrap,
86 *stash_cf_player_wrap, 84 *stash_cf_player_wrap,
87 *stash_cf_map_wrap, 85 *stash_cf_map_wrap,
86 *stash_cf_mapspace_wrap,
88 *stash_cf_client_wrap, 87 *stash_cf_client_wrap,
89 *stash_cf_arch_wrap, 88 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 89 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 90 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 91 *stash_cf_living_wrap;
93 92
93#ifndef newSVpv_utf8
94static inline SV * 94static inline SV *
95newSVpv_utf8 (const char *s) 95newSVpv_utf8 (const char *s)
96{ 96{
97 if (!s) 97 if (!s)
98 return newSV (0); 98 return newSV (0);
99 99
100 SV *sv = newSVpv (s, 0); 100 SV *sv = newSVpv (s, 0);
101 SvUTF8_on (sv); 101 SvUTF8_on (sv);
102 return sv; 102 return sv;
103} 103}
104#endif
104 105
106#ifndef newSVpvn_utf8
105static inline SV * 107static inline SV *
106newSVpvn_utf8 (const char *s, STRLEN l) 108newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
107{ 109{
108 if (!s) 110 if (!s)
109 return newSV (0); 111 return newSV (0);
110 112
111 SV *sv = newSVpvn (s, l); 113 SV *sv = newSVpvn (s, l);
114
115 if (utf8)
112 SvUTF8_on (sv); 116 SvUTF8_on (sv);
117
113 return sv; 118 return sv;
114} 119}
120#endif
115 121
116// helper cast function, returns super class * or 0 122// helper cast function, returns super class * or 0
117template<class super> 123template<class super>
118static super * 124static super *
119is_a (attachable *at) 125is_a (attachable *at)
… …
408 return SvPTR (sv, klass); 414 return SvPTR (sv, klass);
409 else 415 else
410 return 0; 416 return 0;
411} 417}
412 418
413inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 419inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length (), 1); }
414inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); } 420inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
415inline SV *to_sv (bool v) { return newSViv (v); } 421inline SV *to_sv (bool v) { return newSViv (v); }
416inline SV *to_sv ( signed char v) { return newSViv (v); } 422inline SV *to_sv ( signed char v) { return newSViv (v); }
417inline SV *to_sv (unsigned char v) { return newSViv (v); } 423inline SV *to_sv (unsigned char v) { return newSViv (v); }
418inline SV *to_sv ( signed short v) { return newSViv (v); } 424inline SV *to_sv ( signed short v) { return newSViv (v); }
… …
431inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 437inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
432inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 438inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
433inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 439inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
434inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 440inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
435inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 441inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
442inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
436 443
437inline SV *to_sv (object & v) { return to_sv (&v); } 444inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 445inline SV *to_sv (living & v) { return to_sv (&v); }
439 446
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 447inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 449
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451
452inline SV *to_sv (dynbuf * v)
453{
454 SV *sv = newSV (0);
455
456 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1);
458 SvPOK_only (sv);
459 v->linearise (SvPVX (sv));
460 SvCUR_set (sv, v->size ());
461 *SvEND (sv) = 0;
462
463 return sv;
464}
465
466inline SV *to_sv (dynbuf_text * v)
467{
468 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv);
470 return sv;
471}
444 472
445inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 473inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
446inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 474inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
447inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
448inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
… …
464inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 492inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
465inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 493inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); }
466inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 494inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
467inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 495inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
468inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 496inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
497inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); }
469inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 498inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); }
470inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 499inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }
471 500
472//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 501//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
473inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 502inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
… …
604 633
605 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 634 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
606 635
607 const char *argv[] = { 636 const char *argv[] = {
608 settings.argv [0], 637 settings.argv [0],
609 "-e" 638 "-e0"
610 "use EV; use Coro;" // required for bootstrap
611 "cf->bootstrap;" // required for datadir :*>
612 "unshift @INC, cf::datadir ();"
613 "require cf;"
614 }; 639 };
615 640
616 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 641 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
617 || perl_run (perl)) 642 || perl_run (perl))
618 { 643 {
619 printf ("unable to initialize perl-interpreter, aborting.\n"); 644 printf ("unable to initialize perl-interpreter, aborting.\n");
620 exit (EXIT_FAILURE); 645 exit (EXIT_FAILURE);
621 } 646 }
622 647
648 eval_pv (
649 "#line 1 'cfperl init'\n"
650 "use EV ();\n"
651 "use Coro ();\n"
652 "cf->bootstrap;\n"
653 "unshift @INC, cf::datadir ();\n"
654 "require cf;\n",
655 0
656 );
657
658 if (SvTRUE (ERRSV))
623 { 659 {
624 dSP; 660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
625 661 exit (EXIT_FAILURE);
626 PUSHMARK (SP);
627 PUTBACK;
628 call_pv ("cf::init", G_DISCARD | G_VOID);
629 } 662 }
630} 663}
631 664
632void cfperl_main () 665void cfperl_main ()
633{ 666{
634 dSP; 667 dSP;
… …
1174 1207
1175 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1208 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1176 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1209 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1177 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1210 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1178 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1211 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1212 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1179 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1213 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1180 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1214 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1181 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1215 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1182 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1216 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1183 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1217 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
… …
1303 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1337 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1304 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1338 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1305 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1339 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1306 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1340 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1307 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1341 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1308 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1342 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1309 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1343 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1310 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1344 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1311 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1345 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1312 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1346 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1313 1347
1314 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1348 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1315 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1349 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1316 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1350 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1317 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1351 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1318 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1352 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1319 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1353 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1320 1354
1321 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1355 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1322 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1356 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1323 1357
1324 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1358 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
… …
1376 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1410 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1377 const_iv (F_LOCKED) 1411 const_iv (F_LOCKED)
1378 1412
1379 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1413 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1380 1414
1381 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1415 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1382 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1416 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1383 1417
1384 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1418 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1385 1419
1386 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1420 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
… …
1484 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1518 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1485 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1519 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1486 } 1520 }
1487} 1521}
1488 1522
1523void _gv_clear (SV *gv)
1524 CODE:
1525 assert (SvTYPE (gv) == SVt_PVGV);
1526# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1527 f (GvGP (gv)->gp_form);
1528 f (GvGP (gv)->gp_io);
1529 f (GvGP (gv)->gp_sv);
1530 f (GvGP (gv)->gp_av);
1531 f (GvGP (gv)->gp_hv);
1532 f (GvGP (gv)->gp_cv);
1533 GvCVGEN (gv) = 0;
1534 GvMULTI_off (gv);
1535# undef f
1536
1489void _connect_to_perl () 1537void _connect_to_perl ()
1490 1538
1491void _recalc_want () 1539void _recalc_want ()
1492 1540
1541# not used by default anymore
1493void _global_reattach () 1542void _global_reattach ()
1494 CODE: 1543 CODE:
1495{ 1544{
1496 // reattach to all attachable objects in the game. 1545 // reattach to all attachable objects in the game.
1497 for_all_clients (ns) 1546 for_all_clients (ns)
… …
1540 len -= 3; 1589 len -= 3;
1541 } 1590 }
1542 1591
1543 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1592 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1544} 1593}
1594
1595void init_anim ()
1596
1597void init_globals ()
1598
1599void init_experience ()
1600
1601void init_attackmess ()
1602
1603void init_dynamic ()
1604
1605void init_block ()
1606
1607void load_settings ()
1608
1609void load_materials ()
1610
1611void init_uuid ()
1612 CODE:
1613 UUID::init ();
1614
1615void init_signals ()
1616
1617void init_commands ()
1618
1619void init_skills ()
1620
1621void init_beforeplay ()
1545 1622
1546void evthread_start (int aiofd) 1623void evthread_start (int aiofd)
1547 1624
1548void cede_to_tick () 1625void cede_to_tick ()
1549 CODE: 1626 CODE:
… …
1687#if _POSIX_MEMLOCK 1764#if _POSIX_MEMLOCK
1688 1765
1689int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1766int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1690 INIT: 1767 INIT:
1691#if __GLIBC__ 1768#if __GLIBC__
1769 mallopt (M_TOP_PAD, 1024 * 1024);
1770 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1771 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1692 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1772 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1693#endif 1773#endif
1694 1774
1695int munlockall () 1775int munlockall ()
1696 1776
… …
1715 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1795 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1716 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1796 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1717 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1797 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1718 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1798 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1719#endif 1799#endif
1720 EXTEND (SP, 2*2); 1800 EXTEND (SP, 5*2);
1721 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1801 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1722 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1802 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1723 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1803 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1804 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1805 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1724} 1806}
1725 1807
1726int find_animation (utf8_string text) 1808int find_animation (utf8_string text)
1727 PROTOTYPE: $ 1809 PROTOTYPE: $
1728 1810
… …
2085void rangevector (object *ob, object *other, int flags = 0) 2167void rangevector (object *ob, object *other, int flags = 0)
2086 PROTOTYPE: $$;$ 2168 PROTOTYPE: $$;$
2087 PPCODE: 2169 PPCODE:
2088{ 2170{
2089 rv_vector rv; 2171 rv_vector rv;
2172
2173 PUTBACK;
2090 get_rangevector (ob, other, &rv, flags); 2174 get_rangevector (ob, other, &rv, flags);
2175 SPAGAIN;
2176
2091 EXTEND (SP, 5); 2177 EXTEND (SP, 5);
2092 PUSHs (newSVuv (rv.distance)); 2178 PUSHs (newSVuv (rv.distance));
2093 PUSHs (newSViv (rv.distance_x)); 2179 PUSHs (newSViv (rv.distance_x));
2094 PUSHs (newSViv (rv.distance_y)); 2180 PUSHs (newSViv (rv.distance_y));
2095 PUSHs (newSViv (rv.direction)); 2181 PUSHs (newSViv (rv.direction));
… …
2166 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2252 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2167 pl->orig_stats = pl->ob->stats; 2253 pl->orig_stats = pl->ob->stats;
2168 2254
2169void clear_los (player *pl) 2255void clear_los (player *pl)
2170 2256
2257# should only be temporary
2258void esrv_new_player (player *pl)
2259
2171bool 2260bool
2172cell_visible (player *pl, int dx, int dy) 2261cell_visible (player *pl, int dx, int dy)
2173 CODE: 2262 CODE:
2174 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2263 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2
2175 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]; 2264 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
… …
2186 if (len > MAXSOCKBUF) 2275 if (len > MAXSOCKBUF)
2187 pl->failmsg ("[packet too long for client]"); 2276 pl->failmsg ("[packet too long for client]");
2188 else if (pl->ns) 2277 else if (pl->ns)
2189 pl->ns->send_packet (buf, len); 2278 pl->ns->send_packet (buf, len);
2190} 2279}
2191
2192int
2193listening (player *pl, int new_value = -1)
2194 CODE:
2195 RETVAL = pl->listening;
2196 if (new_value >= 0)
2197 pl->listening = new_value;
2198 OUTPUT:
2199 RETVAL
2200 2280
2201void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2281void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2202 PROTOTYPE: $;$$$ 2282 PROTOTYPE: $;$$$
2203 PPCODE: 2283 PPCODE:
2204 if (GIMME_V != G_VOID) 2284 if (GIMME_V != G_VOID)
… …
2359} 2439}
2360 2440
2361void 2441void
2362maptile::create_region_treasure () 2442maptile::create_region_treasure ()
2363 CODE: 2443 CODE:
2364{
2365 object *op = object::create ();
2366 op->type = FLOOR;
2367 op->map = THIS;
2368
2369 for (int x = 0; x < THIS->width; ++x) 2444 for (int x = 0; x < THIS->width; ++x)
2370 for (int y = 0; y < THIS->height; ++y) 2445 for (int y = 0; y < THIS->height; ++y)
2371 { 2446 {
2372 region *rgn = THIS->region (x, y); 2447 region *rgn = THIS->region (x, y);
2373 2448
2374 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2449 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2450 if (object *op = THIS->at (x, y).top)
2375 if (rgn->treasure && rndm () < rgn->treasure_density) 2451 if (rgn->treasure && rndm () < rgn->treasure_density)
2376 {
2377 op->x = x;
2378 op->y = y;
2379 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2452 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2380 }
2381 } 2453 }
2382
2383 op->destroy ();
2384}
2385 2454
2386int out_of_map (maptile *map, int x, int y) 2455int out_of_map (maptile *map, int x, int y)
2387 2456
2388void 2457void
2389trigger (maptile *map, long connection, bool state = true) 2458trigger (maptile *map, long connection, bool state = true)
… …
2402get_map_flags (maptile *map, int x, int y) 2471get_map_flags (maptile *map, int x, int y)
2403 PPCODE: 2472 PPCODE:
2404{ 2473{
2405 maptile *nmap = 0; 2474 maptile *nmap = 0;
2406 I16 nx = 0, ny = 0; 2475 I16 nx = 0, ny = 0;
2476
2477 PUTBACK;
2407 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2478 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2479 SPAGAIN;
2408 2480
2409 EXTEND (SP, 4); 2481 EXTEND (SP, 4);
2410 PUSHs (sv_2mortal (newSViv (flags))); 2482 PUSHs (sv_2mortal (newSViv (flags)));
2411 2483
2412 if (GIMME_V == G_ARRAY) 2484 if (GIMME_V == G_ARRAY)
… …
2415 PUSHs (sv_2mortal (newSViv (nx))); 2487 PUSHs (sv_2mortal (newSViv (nx)));
2416 PUSHs (sv_2mortal (newSViv (ny))); 2488 PUSHs (sv_2mortal (newSViv (ny)));
2417 } 2489 }
2418} 2490}
2419 2491
2492mapspace *
2493ms (maptile *map, unsigned int x, unsigned int y)
2494 PROTOTYPE: $$$
2495 CODE:
2496{
2497 maptile *nmap = 0;
2498 I16 nx, ny;
2499
2500 PUTBACK;
2501 get_map_flags (map, &nmap, x, y, &nx, &ny);
2502 SPAGAIN;
2503
2504 if (!nmap)
2505 XSRETURN_UNDEF;
2506
2507 RETVAL = &nmap->at (nx, ny);
2508}
2509 OUTPUT:
2510 RETVAL
2511
2420void 2512void
2421at (maptile *map, unsigned int x, unsigned int y) 2513at (maptile *map, unsigned int x, unsigned int y)
2422 PROTOTYPE: $$$ 2514 PROTOTYPE: $$$
2423 PPCODE: 2515 PPCODE:
2424{ 2516{
2425 object *o;
2426 maptile *nmap = 0; 2517 maptile *nmap = 0;
2427 I16 nx, ny; 2518 I16 nx, ny;
2428 2519
2520 PUTBACK;
2429 get_map_flags (map, &nmap, x, y, &nx, &ny); 2521 get_map_flags (map, &nmap, x, y, &nx, &ny);
2522 SPAGAIN;
2430 2523
2431 if (nmap) 2524 if (nmap)
2432 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2525 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2433 XPUSHs (sv_2mortal (to_sv (o))); 2526 XPUSHs (sv_2mortal (to_sv (o)));
2434} 2527}
2435 2528
2436SV * 2529SV *
2437bot_at (maptile *obj, unsigned int x, unsigned int y) 2530bot_at (maptile *map, unsigned int x, unsigned int y)
2438 PROTOTYPE: $$$ 2531 PROTOTYPE: $$$
2439 ALIAS: 2532 ALIAS:
2440 top_at = 1 2533 top_at = 1
2441 flags_at = 2 2534 flags_at = 2
2442 light_at = 3 2535 light_at = 3
2443 move_block_at = 4 2536 move_block_at = 4
2444 move_slow_at = 5 2537 move_slow_at = 5
2445 move_on_at = 6 2538 move_on_at = 6
2446 move_off_at = 7 2539 move_off_at = 7
2447 INIT:
2448 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2449 CODE: 2540 CODE:
2541{
2542 sint16 nx = x;
2543 sint16 ny = y;
2544
2545 if (!xy_normalise (map, nx, ny))
2546 XSRETURN_UNDEF;
2547
2548 mapspace &ms = map->at (nx, ny);
2549
2550 ms.update ();
2551
2450 switch (ix) 2552 switch (ix)
2451 { 2553 {
2452 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2554 case 0: RETVAL = to_sv (ms.bot ); break;
2453 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2555 case 1: RETVAL = to_sv (ms.top ); break;
2454 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2556 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2455 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2557 case 3: RETVAL = newSViv (ms.light ); break;
2456 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2558 case 4: RETVAL = newSVuv (ms.move_block); break;
2457 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2559 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2458 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2560 case 6: RETVAL = newSVuv (ms.move_on ); break;
2459 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2561 case 7: RETVAL = newSVuv (ms.move_off ); break;
2460 } 2562 }
2563}
2461 OUTPUT: RETVAL 2564 OUTPUT: RETVAL
2462 2565
2463void fix_walls (maptile *map, int x, int y) 2566void fix_walls (maptile *map, int x, int y)
2464 2567
2465void fix_walls_around (maptile *map, int x, int y) 2568void fix_walls_around (maptile *map, int x, int y)
… …
2550 RETVAL = self->generate_random_map (&rmp); 2653 RETVAL = self->generate_random_map (&rmp);
2551} 2654}
2552 OUTPUT: 2655 OUTPUT:
2553 RETVAL 2656 RETVAL
2554 2657
2658MODULE = cf PACKAGE = cf::mapspace
2659
2660INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2661
2555MODULE = cf PACKAGE = cf::arch 2662MODULE = cf PACKAGE = cf::arch
2556 2663
2557int archetypes_size () 2664int archetypes_size ()
2558 CODE: 2665 CODE:
2559 RETVAL = archetypes.size (); 2666 RETVAL = archetypes.size ();

Diff Legend

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