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.298 by root, Tue Sep 16 14:25:37 2008 UTC vs.
Revision 1.312 by root, Tue Dec 23 06:58:24 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;
1063maptile::do_load_sync () 1074maptile::do_load_sync ()
1064{ 1075{
1065 CALL_BEGIN (1); 1076 CALL_BEGIN (1);
1066 CALL_ARG (this); 1077 CALL_ARG (this);
1067 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1078 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1068 CALL_END;
1069}
1070
1071void
1072maptile::change_all_map_light (int change)
1073{
1074 CALL_BEGIN (1);
1075 CALL_ARG (change);
1076 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1077 CALL_END; 1079 CALL_END;
1078} 1080}
1079 1081
1080void 1082void
1081object::enter_exit (object *exit) 1083object::enter_exit (object *exit)
1328 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1330 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1329 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1331 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1330 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1332 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1331 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK) 1333 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1332 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1334 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1333 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1335 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) const_iv (FLAG_WIZLOOK)
1334 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1336 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1335 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1337 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1336 1338
1337 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1339 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1338 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1340 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1339 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1341 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1340 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1342 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1341 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1343 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1342 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1344 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1343 1345
1344 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1346 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1345 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1347 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1346 1348
1347 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1349 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
1521 f (GvGP (gv)->gp_cv); 1523 f (GvGP (gv)->gp_cv);
1522 GvCVGEN (gv) = 0; 1524 GvCVGEN (gv) = 0;
1523 GvMULTI_off (gv); 1525 GvMULTI_off (gv);
1524# undef f 1526# undef f
1525 1527
1526
1527void _connect_to_perl () 1528void _connect_to_perl ()
1528 1529
1529void _recalc_want () 1530void _recalc_want ()
1530 1531
1532# not used by default anymore
1531void _global_reattach () 1533void _global_reattach ()
1532 CODE: 1534 CODE:
1533{ 1535{
1534 // reattach to all attachable objects in the game. 1536 // reattach to all attachable objects in the game.
1535 for_all_clients (ns) 1537 for_all_clients (ns)
1578 len -= 3; 1580 len -= 3;
1579 } 1581 }
1580 1582
1581 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1583 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1582} 1584}
1585
1586void init_anim ()
1587
1588void init_globals ()
1589
1590void init_experience ()
1591
1592void init_attackmess ()
1593
1594void init_dynamic ()
1595
1596void load_settings ()
1597
1598void load_materials ()
1599
1600void init_uuid ()
1601 CODE:
1602 UUID::init ();
1603
1604void init_signals ()
1605
1606void init_commands ()
1607
1608void init_skills ()
1609
1610void init_beforeplay ()
1583 1611
1584void evthread_start (int aiofd) 1612void evthread_start (int aiofd)
1585 1613
1586void cede_to_tick () 1614void cede_to_tick ()
1587 CODE: 1615 CODE:
1725#if _POSIX_MEMLOCK 1753#if _POSIX_MEMLOCK
1726 1754
1727int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1755int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1728 INIT: 1756 INIT:
1729#if __GLIBC__ 1757#if __GLIBC__
1758 mallopt (M_TOP_PAD, 1024 * 1024);
1759 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1760 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1730 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1761 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1731#endif 1762#endif
1732 1763
1733int munlockall () 1764int munlockall ()
1734 1765
1753 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1784 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1754 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1785 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1755 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1786 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1756 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1787 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1757#endif 1788#endif
1758 EXTEND (SP, 2*2); 1789 EXTEND (SP, 5*2);
1759 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1790 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1760 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1791 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1761 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object)))); 1792 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1793 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1794 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1762} 1795}
1763 1796
1764int find_animation (utf8_string text) 1797int find_animation (utf8_string text)
1765 PROTOTYPE: $ 1798 PROTOTYPE: $
1766 1799
2206 pl->ob->stats.hp = pl->ob->stats.maxhp; 2239 pl->ob->stats.hp = pl->ob->stats.maxhp;
2207 pl->ob->stats.sp = pl->ob->stats.maxsp; 2240 pl->ob->stats.sp = pl->ob->stats.maxsp;
2208 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2241 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2209 pl->orig_stats = pl->ob->stats; 2242 pl->orig_stats = pl->ob->stats;
2210 2243
2211void clear_los (player *pl) 2244# should only be temporary
2245void esrv_new_player (player *pl)
2212 2246
2247#d# TODO: replace by blocked_los accessor, fix code using this
2213bool 2248bool
2214cell_visible (player *pl, int dx, int dy) 2249cell_visible (player *pl, int dx, int dy)
2215 CODE: 2250 CODE:
2216 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2251 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2217 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2218 OUTPUT: 2252 OUTPUT:
2219 RETVAL 2253 RETVAL
2220 2254
2221void 2255void
2222send (player *pl, SV *packet) 2256send (player *pl, SV *packet)
2290} 2324}
2291 2325
2292INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2326INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2293 2327
2294void 2328void
2329adjust_daylight ()
2330 CODE:
2331 maptile::adjust_daylight ();
2332
2333void
2295maptile::instantiate () 2334maptile::instantiate ()
2296 2335
2297maptile *new () 2336maptile *new ()
2298 PROTOTYPE: 2337 PROTOTYPE:
2299 CODE: 2338 CODE:
2392} 2431}
2393 2432
2394void 2433void
2395maptile::create_region_treasure () 2434maptile::create_region_treasure ()
2396 CODE: 2435 CODE:
2397{
2398 object *op = object::create ();
2399 op->type = FLOOR;
2400 op->map = THIS;
2401
2402 for (int x = 0; x < THIS->width; ++x) 2436 for (int x = 0; x < THIS->width; ++x)
2403 for (int y = 0; y < THIS->height; ++y) 2437 for (int y = 0; y < THIS->height; ++y)
2404 { 2438 {
2405 region *rgn = THIS->region (x, y); 2439 region *rgn = THIS->region (x, y);
2406 2440
2407 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2441 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2442 if (object *op = THIS->at (x, y).top)
2408 if (rgn->treasure && rndm () < rgn->treasure_density) 2443 if (rgn->treasure && rndm () < rgn->treasure_density)
2409 {
2410 op->x = x;
2411 op->y = y;
2412 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2444 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2413 }
2414 } 2445 }
2415
2416 op->destroy ();
2417}
2418 2446
2419int out_of_map (maptile *map, int x, int y) 2447int out_of_map (maptile *map, int x, int y)
2420 2448
2421void 2449void
2422trigger (maptile *map, long connection, bool state = true) 2450trigger (maptile *map, long connection, bool state = true)
2489 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2517 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2490 XPUSHs (sv_2mortal (to_sv (o))); 2518 XPUSHs (sv_2mortal (to_sv (o)));
2491} 2519}
2492 2520
2493SV * 2521SV *
2494bot_at (maptile *obj, unsigned int x, unsigned int y) 2522bot_at (maptile *map, unsigned int x, unsigned int y)
2495 PROTOTYPE: $$$ 2523 PROTOTYPE: $$$
2496 ALIAS: 2524 ALIAS:
2497 top_at = 1 2525 top_at = 1
2498 flags_at = 2 2526 flags_at = 2
2499 light_at = 3 2527 light_at = 3
2500 move_block_at = 4 2528 move_block_at = 4
2501 move_slow_at = 5 2529 move_slow_at = 5
2502 move_on_at = 6 2530 move_on_at = 6
2503 move_off_at = 7 2531 move_off_at = 7
2504 INIT:
2505 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2506 CODE: 2532 CODE:
2533{
2534 sint16 nx = x;
2535 sint16 ny = y;
2536
2537 if (!xy_normalise (map, nx, ny))
2538 XSRETURN_UNDEF;
2539
2540 mapspace &ms = map->at (nx, ny);
2541
2542 ms.update ();
2543
2507 switch (ix) 2544 switch (ix)
2508 { 2545 {
2509 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2546 case 0: RETVAL = to_sv (ms.bot ); break;
2510 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2547 case 1: RETVAL = to_sv (ms.top ); break;
2511 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2548 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2512 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2549 case 3: RETVAL = newSViv (ms.light ); break;
2513 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2550 case 4: RETVAL = newSVuv (ms.move_block); break;
2514 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2551 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2515 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2552 case 6: RETVAL = newSVuv (ms.move_on ); break;
2516 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2553 case 7: RETVAL = newSVuv (ms.move_off ); break;
2517 } 2554 }
2555}
2518 OUTPUT: RETVAL 2556 OUTPUT: RETVAL
2519 2557
2520void fix_walls (maptile *map, int x, int y) 2558void fix_walls (maptile *map, int x, int y)
2521 2559
2522void fix_walls_around (maptile *map, int x, int y) 2560void fix_walls_around (maptile *map, int x, int y)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines