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.303 by root, Tue Sep 23 04:29:11 2008 UTC vs.
Revision 1.306 by elmex, Fri Oct 31 16:13:41 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 ();"
633 "use Coro ();"
634 "cf->bootstrap;"
635 "unshift @INC, cf::datadir ();"
636 "require cf;"
637 }; 639 };
638 640
639 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 641 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
640 || perl_run (perl)) 642 || perl_run (perl))
641 { 643 {
642 printf ("unable to initialize perl-interpreter, aborting.\n"); 644 printf ("unable to initialize perl-interpreter, aborting.\n");
645 exit (EXIT_FAILURE);
646 }
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))
659 {
660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
643 exit (EXIT_FAILURE); 661 exit (EXIT_FAILURE);
644 } 662 }
645} 663}
646 664
647void cfperl_main () 665void cfperl_main ()
… …
1518 1536
1519void _connect_to_perl () 1537void _connect_to_perl ()
1520 1538
1521void _recalc_want () 1539void _recalc_want ()
1522 1540
1541# not used by default anymore
1523void _global_reattach () 1542void _global_reattach ()
1524 CODE: 1543 CODE:
1525{ 1544{
1526 // reattach to all attachable objects in the game. 1545 // reattach to all attachable objects in the game.
1527 for_all_clients (ns) 1546 for_all_clients (ns)
… …
2230 pl->ob->stats.sp = pl->ob->stats.maxsp; 2249 pl->ob->stats.sp = pl->ob->stats.maxsp;
2231 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2250 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2232 pl->orig_stats = pl->ob->stats; 2251 pl->orig_stats = pl->ob->stats;
2233 2252
2234void clear_los (player *pl) 2253void clear_los (player *pl)
2254
2255void esrv_new_player (player *pl)
2235 2256
2236bool 2257bool
2237cell_visible (player *pl, int dx, int dy) 2258cell_visible (player *pl, int dx, int dy)
2238 CODE: 2259 CODE:
2239 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2260 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2

Diff Legend

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