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.369 by root, Wed Apr 14 02:31:24 2010 UTC vs.
Revision 1.383 by root, Fri Apr 30 20:43:18 2010 UTC

… …
52#include <XSUB.h> 52#include <XSUB.h>
53 53
54#include "CoroAPI.h" 54#include "CoroAPI.h"
55#include "perlxsi.c" 55#include "perlxsi.c"
56 56
57extern sint64 *levels; // the experience table
58
59typedef object_thawer &object_thawer_ref; 57typedef object_thawer &object_thawer_ref;
60typedef object_freezer &object_freezer_ref; 58typedef object_freezer &object_freezer_ref;
61 59
62typedef std::string std__string; 60typedef std::string std__string;
63 61
… …
85 *stash_cf_mapspace_wrap, 83 *stash_cf_mapspace_wrap,
86 *stash_cf_client_wrap, 84 *stash_cf_client_wrap,
87 *stash_cf_arch_wrap, 85 *stash_cf_arch_wrap,
88 *stash_cf_party_wrap, 86 *stash_cf_party_wrap,
89 *stash_cf_region_wrap, 87 *stash_cf_region_wrap,
90 *stash_cf_living_wrap; 88 *stash_cf_living_wrap,
89 *stash_ext_map_world;
91 90
92static SV 91static SV
93 *cv_cf_do_invoke, 92 *cv_cf_do_invoke,
94 *cv_cf__can_merge, 93 *cv_cf__can_merge,
95 *cv_cf_client_send_msg, 94 *cv_cf_client_send_msg,
… …
353#endif 352#endif
354 353
355////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 354//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
356 355
357static SV * 356static SV *
358newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 357newSVptr (void *ptr, HV *stash, HV *hv)
359{ 358{
360 SV *sv; 359 SV *sv;
361 360
362 if (!ptr) 361 if (!ptr)
363 return newSV (0); 362 return newSV (0);
364 363
365 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 364 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
366 return sv_bless (newRV_noinc ((SV *)hv), stash); 365 return sv_bless (newRV_noinc ((SV *)hv), stash);
366}
367
368static SV *
369newSVptr (void *ptr, HV *stash)
370{
371 return newSVptr (ptr, stash, newHV ());
367} 372}
368 373
369static int 374static int
370attachable_free (pTHX_ SV *sv, MAGIC *mg) 375attachable_free (pTHX_ SV *sv, MAGIC *mg)
371{ 376{
… …
479 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap 484 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
480 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap 485 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
481 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap 486 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
482 && !sv_derived_from (sv, "cf::object"))) 487 && !sv_derived_from (sv, "cf::object")))
483 croak ("object of type cf::object expected"); 488 croak ("object of type cf::object expected");
489
490 return SvPTR_nc (sv);
491}
492
493static long noinline
494SvPTR_ornull_maptile (SV *sv)
495{
496 if (expect_false (!SvOK (sv))) return 0;
497
498 if (!SvROK (sv)
499 || (SvSTASH (SvRV (sv)) != stash_cf_map_wrap
500 && SvSTASH (SvRV (sv)) != stash_ext_map_world
501 && !sv_derived_from (sv, "cf::map")))
502 croak ("object of type cf::map expected");
484 503
485 return SvPTR_nc (sv); 504 return SvPTR_nc (sv);
486} 505}
487 506
488static long noinline 507static long noinline
… …
565static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 584static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); }
566static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); } 585static inline void sv_to (SV *sv, signed long long &v) { v = ( signed long long)SvVAL64 (sv); }
567static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); } 586static inline void sv_to (SV *sv, unsigned long long &v) { v = (unsigned long long)SvVAL64 (sv); }
568static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); } 587static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
569static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 588static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); }
570static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); } 589static inline void sv_to (SV *sv, client * &v) { v = (client *) (attachable *)SvPTR_ornull_client (sv); }
571static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); } 590static inline void sv_to (SV *sv, player * &v) { v = (player *) (attachable *)SvPTR_ornull_player (sv); }
572static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); } 591static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
592static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull_maptile (sv); }
573static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); } 593static inline void sv_to (SV *sv, archetype * &v) { v = (archetype *)(attachable *)SvPTR_ornull (sv, "cf::arch"); }
574static inline void sv_to (SV *sv, maptile * &v) { v = (maptile *) (attachable *)SvPTR_ornull (sv, "cf::map"); }
575static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); } 594static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
576static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 595static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
577static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); } 596static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
578static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); } 597static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
579static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); } 598static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
… …
695template<class type> 714template<class type>
696static void noinline 715static void noinline
697cf_obj_to (SV *arg, type &var) 716cf_obj_to (SV *arg, type &var)
698{ 717{
699 sv_to (arg, var); 718 sv_to (arg, var);
700 if (!var) 719 if (expect_false (!var))
701 croak ("must not pass invalid/null cf_obj here"); 720 croak ("must not pass invalid/null cf_obj here");
702} 721}
703 722
704template<class object> 723template<class object>
705static void noinline 724static void noinline
706cf_obj_ornull_to (SV *arg, object *&var) 725cf_obj_ornull_to (SV *arg, object *&var)
707{ 726{
708 if (SvOK (arg)) 727 if (SvOK (arg))
709 { 728 {
710 sv_to (arg, var); 729 sv_to (arg, var);
711 if (!var) 730 if (expect_false (!var))
712 croak ("unable to convert perl object to C++ object"); 731 croak ("unable to convert perl object to C++ object");
713 } 732 }
714 else 733 else
715 var = 0; 734 var = 0;
716} 735}
… …
751 exit (EXIT_FAILURE); 770 exit (EXIT_FAILURE);
752 } 771 }
753 772
754 eval_pv ( 773 eval_pv (
755 "#line 1 'cfperl init'\n" 774 "#line 1 'cfperl init'\n"
756 "use EV ();\n" 775 "use EV ();\n" // required by bootstrap
757 "use Coro ();\n" 776 "use Coro ();\n" // required by bootstrap
758 "cf->bootstrap;\n" 777 "cf->bootstrap;\n" // required for cf::datadir
759 "unshift @INC, cf::datadir ();\n" 778 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
760 "require cf;\n", 779 "require cf;\n",
761 0 780 0
762 ); 781 );
763 782
764 if (SvTRUE (ERRSV)) 783 if (SvTRUE (ERRSV))
… …
1378 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1397 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1379 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1398 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1380 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1399 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1381 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1400 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1382 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1401 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1402 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1383 1403
1384 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1404 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1385 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV); 1405 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1386 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV); 1406 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV);
1387 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV); 1407 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
… …
1436# undef def 1456# undef def
1437# define def(uc, flags) const_iv (SK_ ## uc) 1457# define def(uc, flags) const_iv (SK_ ## uc)
1438# include "skillinc.h" 1458# include "skillinc.h"
1439# undef def 1459# undef def
1440 1460
1441 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1442 const_iv (logBacktrace)
1443
1444 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1461 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1445 1462
1446 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1463 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1447 1464
1448 const_iv (MAX_TIME) 1465 const_iv (MAX_TIME)
… …
1474 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1491 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1475 1492
1476 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1493 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1477 }; 1494 };
1478 1495
1479 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1496 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1480 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1497 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1481 1498
1482 static const struct { 1499 static const struct {
1483 const char *name; 1500 const char *name;
1484 int skip; 1501 int skip;
… …
1490# undef def 1507# undef def
1491 }; 1508 };
1492 1509
1493 AV *av = get_av ("cf::EVENT", 1); 1510 AV *av = get_av ("cf::EVENT", 1);
1494 1511
1495 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1512 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1496 { 1513 {
1497 AV *event = newAV (); 1514 AV *event = newAV ();
1498 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1515 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1499 av_push (event, newSViv (eiv->klass)); 1516 av_push (event, newSViv (eiv->klass));
1500 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1517 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
… …
1799 1816
1800int random_roll (int min, int max, object *op, int goodbad); 1817int random_roll (int min, int max, object *op, int goodbad);
1801 1818
1802const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1819const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1803 1820
1804int
1805exp_to_level (val64 exp) 1821int exp_to_level (val64 exp)
1806 CODE:
1807{
1808 int i = 0;
1809 1822
1810 RETVAL = settings.max_level;
1811
1812 for (i = 1; i <= settings.max_level; i++)
1813 {
1814 if (levels[i] > exp)
1815 {
1816 RETVAL = i - 1;
1817 break;
1818 }
1819 }
1820}
1821 OUTPUT: RETVAL
1822
1823val64
1824level_to_min_exp (int level) 1823val64 level_to_min_exp (int level)
1825 CODE:
1826 if (level > settings.max_level)
1827 RETVAL = levels[settings.max_level];
1828 else if (level < 1)
1829 RETVAL = 0;
1830 else
1831 RETVAL = levels[level];
1832 OUTPUT: RETVAL
1833 1824
1834SV * 1825SV *
1835resistance_to_string (int atnr) 1826resistance_to_string (int atnr)
1836 CODE: 1827 CODE:
1837 if (atnr >= 0 && atnr < NROFATTACKS) 1828 if (atnr >= 0 && atnr < NROFATTACKS)
… …
1895 CODE: 1886 CODE:
1896 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1887 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1897 OUTPUT: 1888 OUTPUT:
1898 RETVAL 1889 RETVAL
1899 1890
1891bool should_invoke (attachable *obj, int event)
1892 CODE:
1893 RETVAL = obj->should_invoke ((event_type)event);
1894 OUTPUT: RETVAL
1895
1900void 1896void
1901debug_trace (attachable *obj, bool on = true) 1897debug_trace (attachable *obj, bool on = true)
1902 CODE: 1898 CODE:
1903 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE; 1899 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1904 if (on) 1900 if (on)
… …
2028} 2024}
2029 OUTPUT: 2025 OUTPUT:
2030 RETVAL 2026 RETVAL
2031 2027
2032object *find_best_object_match (object *op, utf8_string match) 2028object *find_best_object_match (object *op, utf8_string match)
2033
2034object *find_marked_object (object *op)
2035
2036int need_identify (object *obj);
2037 2029
2038int apply_shop_mat (object *shop_mat, object *op); 2030int apply_shop_mat (object *shop_mat, object *op);
2039 2031
2040int move (object *op, int dir, object *originator = op) 2032int move (object *op, int dir, object *originator = op)
2041 CODE: 2033 CODE:
… …
2469 if (oblinkpt *obp = map->find_link (connection)) 2461 if (oblinkpt *obp = map->find_link (connection))
2470 for (objectlink *ol = obp->link; ol; ol = ol->next) 2462 for (objectlink *ol = obp->link; ol; ol = ol->next)
2471 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2463 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2472 2464
2473void 2465void
2474get_map_flags (maptile *map, int x, int y) 2466xy_normalise (maptile *map, int x, int y, int dir = 0)
2475 PPCODE: 2467 PPCODE:
2476{ 2468{
2477 maptile *nmap = 0; 2469 mapxy pos (map, x, y);
2478 I16 nx = 0, ny = 0; 2470 if (!pos.move (dir).normalise ())
2471 XSRETURN_EMPTY;
2479 2472
2480 PUTBACK;
2481 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2482 SPAGAIN;
2483
2484 EXTEND (SP, 4); 2473 EXTEND (SP, 3);
2485 PUSHs (sv_2mortal (newSViv (flags)));
2486
2487 if (GIMME_V == G_ARRAY)
2488 {
2489 PUSHs (sv_2mortal (to_sv (nmap))); 2474 PUSHs (sv_2mortal (to_sv (pos.m)));
2490 PUSHs (sv_2mortal (newSViv (nx))); 2475 PUSHs (sv_2mortal (to_sv (pos.x)));
2491 PUSHs (sv_2mortal (newSViv (ny))); 2476 PUSHs (sv_2mortal (to_sv (pos.y)));
2492 }
2493} 2477}
2494 2478
2495mapspace * 2479mapspace *
2496ms (maptile *map, unsigned int x, unsigned int y) 2480ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2497 PROTOTYPE: $$$ 2481 PROTOTYPE: $$$;$
2498 CODE: 2482 CODE:
2499{ 2483{
2500 maptile *nmap = 0; 2484 mapxy pos (map, x, y);
2501 I16 nx, ny; 2485 if (!pos.move (dir).normalise ())
2502
2503 PUTBACK;
2504 get_map_flags (map, &nmap, x, y, &nx, &ny);
2505 SPAGAIN;
2506
2507 if (!nmap)
2508 XSRETURN_UNDEF; 2486 XSRETURN_UNDEF;
2509 2487
2510 RETVAL = &nmap->at (nx, ny); 2488 RETVAL = &*pos;
2511} 2489}
2512 OUTPUT: 2490 OUTPUT:
2513 RETVAL 2491 RETVAL
2514 2492
2515void 2493void
2516at (maptile *map, unsigned int x, unsigned int y) 2494at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2517 PROTOTYPE: $$$ 2495 PROTOTYPE: $$$;$
2518 PPCODE: 2496 PPCODE:
2519{ 2497 mapxy pos (map, x, y);
2520 maptile *nmap = 0; 2498 if (pos.move (dir).normalise ())
2521 I16 nx, ny;
2522
2523 PUTBACK;
2524 get_map_flags (map, &nmap, x, y, &nx, &ny);
2525 SPAGAIN;
2526
2527 if (nmap)
2528 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2499 for (object *o = pos->bot; o; o = o->above)
2529 XPUSHs (sv_2mortal (to_sv (o))); 2500 XPUSHs (sv_2mortal (to_sv (o)));
2530}
2531 2501
2532SV * 2502SV *
2533bot_at (maptile *map, unsigned int x, unsigned int y) 2503bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2534 PROTOTYPE: $$$ 2504 PROTOTYPE: $$$;$
2535 ALIAS: 2505 ALIAS:
2536 top_at = 1 2506 top_at = 1
2537 flags_at = 2 2507 flags_at = 2
2538 light_at = 3 2508 light_at = 3
2539 move_block_at = 4 2509 move_block_at = 4
2540 move_slow_at = 5 2510 move_slow_at = 5
2541 move_on_at = 6 2511 move_on_at = 6
2542 move_off_at = 7 2512 move_off_at = 7
2543 CODE: 2513 CODE:
2544{ 2514{
2545 sint16 nx = x; 2515 mapxy pos (map, x, y);
2546 sint16 ny = y; 2516 if (!pos.move (dir).normalise ())
2547
2548 if (!xy_normalise (map, nx, ny))
2549 XSRETURN_UNDEF; 2517 XSRETURN_UNDEF;
2550 2518
2551 mapspace &ms = map->at (nx, ny); 2519 mapspace &ms = *pos;
2552 2520
2553 ms.update (); 2521 ms.update ();
2554 2522
2555 switch (ix) 2523 switch (ix)
2556 { 2524 {
… …
2690list () 2658list ()
2691 PPCODE: 2659 PPCODE:
2692 for_all_regions (rgn) 2660 for_all_regions (rgn)
2693 XPUSHs (sv_2mortal (to_sv (rgn))); 2661 XPUSHs (sv_2mortal (to_sv (rgn)));
2694 2662
2695region *find (utf8_string name)
2696 PROTOTYPE: $
2697 CODE:
2698 RETVAL = region::find (name);
2699 OUTPUT: RETVAL
2700
2701int specificity (region *rgn) 2663int specificity (region *rgn)
2702 CODE: 2664 CODE:
2703 RETVAL = 0; 2665 RETVAL = 0;
2704 while (rgn = rgn->parent) 2666 while (rgn = rgn->parent)
2705 RETVAL++; 2667 RETVAL++;
… …
2954 sv_to (sv, self); 2916 sv_to (sv, self);
2955 delete self; 2917 delete self;
2956 2918
2957MODULE = cf PACKAGE = cf::object::thawer 2919MODULE = cf PACKAGE = cf::object::thawer
2958 2920
2959INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/cfperl.h | 2921INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2922
2923bool
2924errors_are_fatal (bool fatal)
2925 CODE:
2926 RETVAL = object_thawer::errors_are_fatal;
2927 object_thawer::errors_are_fatal = fatal;
2928 OUTPUT:
2929 RETVAL
2960 2930
2961SV * 2931SV *
2962new_from_file (char *klass, octet_string path) 2932new_from_file (char *klass, octet_string path)
2963 CODE: 2933 CODE:
2964 object_thawer *f = new object_thawer (path); 2934 object_thawer *f = new object_thawer (path);

Diff Legend

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