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.310 by root, Fri Dec 19 22:47:30 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)
… …
1580void init_experience () 1599void init_experience ()
1581 1600
1582void init_attackmess () 1601void init_attackmess ()
1583 1602
1584void init_dynamic () 1603void init_dynamic ()
1585
1586void init_block ()
1587 1604
1588void load_settings () 1605void load_settings ()
1589 1606
1590void load_materials () 1607void load_materials ()
1591 1608
… …
1776 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1793 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1777 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1794 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1778 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1795 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1779 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1796 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1780#endif 1797#endif
1781 EXTEND (SP, 2*2); 1798 EXTEND (SP, 5*2);
1782 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1799 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1783 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1800 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1784 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1801 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1802 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1803 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1785} 1804}
1786 1805
1787int find_animation (utf8_string text) 1806int find_animation (utf8_string text)
1788 PROTOTYPE: $ 1807 PROTOTYPE: $
1789 1808
… …
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)
2235 2254
2255# should only be temporary
2256void esrv_new_player (player *pl)
2257
2258#d# TODO: replace by blocked_los accessor, fix code using this
2236bool 2259bool
2237cell_visible (player *pl, int dx, int dy) 2260cell_visible (player *pl, int dx, int dy)
2238 CODE: 2261 CODE:
2239 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2262 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2240 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2241 OUTPUT: 2263 OUTPUT:
2242 RETVAL 2264 RETVAL
2243 2265
2244void 2266void
2245send (player *pl, SV *packet) 2267send (player *pl, SV *packet)
… …
2501 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2523 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2502 XPUSHs (sv_2mortal (to_sv (o))); 2524 XPUSHs (sv_2mortal (to_sv (o)));
2503} 2525}
2504 2526
2505SV * 2527SV *
2506bot_at (maptile *obj, unsigned int x, unsigned int y) 2528bot_at (maptile *map, unsigned int x, unsigned int y)
2507 PROTOTYPE: $$$ 2529 PROTOTYPE: $$$
2508 ALIAS: 2530 ALIAS:
2509 top_at = 1 2531 top_at = 1
2510 flags_at = 2 2532 flags_at = 2
2511 light_at = 3 2533 light_at = 3
2512 move_block_at = 4 2534 move_block_at = 4
2513 move_slow_at = 5 2535 move_slow_at = 5
2514 move_on_at = 6 2536 move_on_at = 6
2515 move_off_at = 7 2537 move_off_at = 7
2516 INIT:
2517 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2518 CODE: 2538 CODE:
2539{
2540 sint16 nx = x;
2541 sint16 ny = y;
2542
2543 if (!xy_normalise (map, nx, ny))
2544 XSRETURN_UNDEF;
2545
2546 mapspace &ms = map->at (nx, ny);
2547
2548 ms.update ();
2549
2519 switch (ix) 2550 switch (ix)
2520 { 2551 {
2521 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2552 case 0: RETVAL = to_sv (ms.bot ); break;
2522 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2553 case 1: RETVAL = to_sv (ms.top ); break;
2523 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2554 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2524 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2555 case 3: RETVAL = newSViv (ms.light ); break;
2525 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2556 case 4: RETVAL = newSVuv (ms.move_block); break;
2526 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2557 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2527 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2558 case 6: RETVAL = newSVuv (ms.move_on ); break;
2528 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2559 case 7: RETVAL = newSVuv (ms.move_off ); break;
2529 } 2560 }
2561}
2530 OUTPUT: RETVAL 2562 OUTPUT: RETVAL
2531 2563
2532void fix_walls (maptile *map, int x, int y) 2564void fix_walls (maptile *map, int x, int y)
2533 2565
2534void fix_walls_around (maptile *map, int x, int y) 2566void fix_walls_around (maptile *map, int x, int y)

Diff Legend

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