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.302 by root, Mon Sep 22 23:57:48 2008 UTC vs.
Revision 1.307 by root, Sun Nov 16 03:52:13 2008 UTC

… …
88 *stash_cf_arch_wrap, 88 *stash_cf_arch_wrap,
89 *stash_cf_party_wrap, 89 *stash_cf_party_wrap,
90 *stash_cf_region_wrap, 90 *stash_cf_region_wrap,
91 *stash_cf_living_wrap; 91 *stash_cf_living_wrap;
92 92
93#ifndef newSVpv_utf8
93static inline SV * 94static inline SV *
94newSVpv_utf8 (const char *s) 95newSVpv_utf8 (const char *s)
95{ 96{
96 if (!s) 97 if (!s)
97 return newSV (0); 98 return newSV (0);
98 99
99 SV *sv = newSVpv (s, 0); 100 SV *sv = newSVpv (s, 0);
100 SvUTF8_on (sv); 101 SvUTF8_on (sv);
101 return sv; 102 return sv;
102} 103}
104#endif
103 105
106#ifndef newSVpvn_utf8
104static inline SV * 107static inline SV *
105newSVpvn_utf8 (const char *s, STRLEN l) 108newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
106{ 109{
107 if (!s) 110 if (!s)
108 return newSV (0); 111 return newSV (0);
109 112
110 SV *sv = newSVpvn (s, l); 113 SV *sv = newSVpvn (s, l);
114
115 if (utf8)
111 SvUTF8_on (sv); 116 SvUTF8_on (sv);
117
112 return sv; 118 return sv;
113} 119}
120#endif
114 121
115// helper cast function, returns super class * or 0 122// helper cast function, returns super class * or 0
116template<class super> 123template<class super>
117static super * 124static super *
118is_a (attachable *at) 125is_a (attachable *at)
… …
407 return SvPTR (sv, klass); 414 return SvPTR (sv, klass);
408 else 415 else
409 return 0; 416 return 0;
410} 417}
411 418
412inline 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); }
413inline 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); }
414inline SV *to_sv (bool v) { return newSViv (v); } 421inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 422inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 423inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 424inline SV *to_sv ( signed short v) { return newSViv (v); }
… …
626 633
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 634 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 635
629 const char *argv[] = { 636 const char *argv[] = {
630 settings.argv [0], 637 settings.argv [0],
631 "-e" 638 "-e0"
632 "use EV; use Coro;" // required for bootstrap
633 "cf->bootstrap;" // required for datadir :*>
634 "unshift @INC, cf::datadir ();"
635 "require cf;"
636 }; 639 };
637 640
638 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 641 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
639 || perl_run (perl)) 642 || perl_run (perl))
640 { 643 {
641 printf ("unable to initialize perl-interpreter, aborting.\n"); 644 printf ("unable to initialize perl-interpreter, aborting.\n");
642 exit (EXIT_FAILURE); 645 exit (EXIT_FAILURE);
643 } 646 }
644 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))
645 { 659 {
646 dSP; 660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
647 661 exit (EXIT_FAILURE);
648 PUSHMARK (SP);
649 PUTBACK;
650 call_pv ("cf::init", G_DISCARD | G_VOID);
651 } 662 }
652} 663}
653 664
654void cfperl_main () 665void cfperl_main ()
655{ 666{
656 dSP; 667 dSP;
… …
1521 f (GvGP (gv)->gp_cv); 1532 f (GvGP (gv)->gp_cv);
1522 GvCVGEN (gv) = 0; 1533 GvCVGEN (gv) = 0;
1523 GvMULTI_off (gv); 1534 GvMULTI_off (gv);
1524# undef f 1535# undef f
1525 1536
1526
1527void _connect_to_perl () 1537void _connect_to_perl ()
1528 1538
1529void _recalc_want () 1539void _recalc_want ()
1530 1540
1541# not used by default anymore
1531void _global_reattach () 1542void _global_reattach ()
1532 CODE: 1543 CODE:
1533{ 1544{
1534 // reattach to all attachable objects in the game. 1545 // reattach to all attachable objects in the game.
1535 for_all_clients (ns) 1546 for_all_clients (ns)
… …
1578 len -= 3; 1589 len -= 3;
1579 } 1590 }
1580 1591
1581 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1592 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1582} 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 ()
1583 1622
1584void evthread_start (int aiofd) 1623void evthread_start (int aiofd)
1585 1624
1586void cede_to_tick () 1625void cede_to_tick ()
1587 CODE: 1626 CODE:
… …
2210 pl->ob->stats.sp = pl->ob->stats.maxsp; 2249 pl->ob->stats.sp = pl->ob->stats.maxsp;
2211 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2250 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2212 pl->orig_stats = pl->ob->stats; 2251 pl->orig_stats = pl->ob->stats;
2213 2252
2214void clear_los (player *pl) 2253void clear_los (player *pl)
2254
2255# should only be temporary
2256void esrv_new_player (player *pl)
2215 2257
2216bool 2258bool
2217cell_visible (player *pl, int dx, int dy) 2259cell_visible (player *pl, int dx, int dy)
2218 CODE: 2260 CODE:
2219 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2261 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2

Diff Legend

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