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.389 by root, Fri Jul 2 15:03:57 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_cf_layout_wrap,
90 *stash_ext_map_world;
91 91
92static SV 92static SV
93 *cv_cf_do_invoke, 93 *cv_cf_do_invoke,
94 *cv_cf__can_merge, 94 *cv_cf__can_merge,
95 *cv_cf_client_send_msg, 95 *cv_cf_client_send_msg,
… …
123 123
124 return sv; 124 return sv;
125} 125}
126#endif 126#endif
127 127
128static noinline utf8_string 128noinline utf8_string
129cfSvPVutf8_nolen (SV *sv) 129cfSvPVutf8_nolen (SV *sv)
130{ 130{
131 SvGETMAGIC (sv); 131 SvGETMAGIC (sv);
132 132
133 if (SvPOK (sv)) 133 if (SvPOK (sv))
… …
353#endif 353#endif
354 354
355////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 355//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
356 356
357static SV * 357static SV *
358newSVptr (void *ptr, HV *stash, HV *hv = newHV ()) 358newSVptr (void *ptr, HV *stash, HV *hv)
359{ 359{
360 SV *sv;
361
362 if (!ptr) 360 if (!ptr)
363 return newSV (0); 361 return newSV (0);
364 362
365 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 363 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
366 return sv_bless (newRV_noinc ((SV *)hv), stash); 364 return sv_bless (newRV_noinc ((SV *)hv), stash);
365}
366
367static SV * noinline
368newSVptr (void *ptr, HV *stash)
369{
370 return newSVptr (ptr, stash, newHV ());
367} 371}
368 372
369static int 373static int
370attachable_free (pTHX_ SV *sv, MAGIC *mg) 374attachable_free (pTHX_ SV *sv, MAGIC *mg)
371{ 375{
… …
383 return 0; 387 return 0;
384} 388}
385 389
386MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free}; 390MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free};
387 391
388static SV * 392static SV * noinline
389newSVattachable (attachable *obj, HV *stash) 393newSVattachable (attachable *obj, HV *stash)
390{ 394{
391 if (!obj) 395 if (!obj)
392 return newSV (0); 396 return newSV (0);
393 397
… …
479 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap 483 || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
480 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap 484 && SvSTASH (SvRV (sv)) != stash_cf_object_player_wrap
481 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap 485 && SvSTASH (SvRV (sv)) != stash_cf_arch_wrap
482 && !sv_derived_from (sv, "cf::object"))) 486 && !sv_derived_from (sv, "cf::object")))
483 croak ("object of type cf::object expected"); 487 croak ("object of type cf::object expected");
488
489 return SvPTR_nc (sv);
490}
491
492static long noinline
493SvPTR_ornull_maptile (SV *sv)
494{
495 if (expect_false (!SvOK (sv))) return 0;
496
497 if (!SvROK (sv)
498 || (SvSTASH (SvRV (sv)) != stash_cf_map_wrap
499 && SvSTASH (SvRV (sv)) != stash_ext_map_world
500 && !sv_derived_from (sv, "cf::map")))
501 croak ("object of type cf::map expected");
484 502
485 return SvPTR_nc (sv); 503 return SvPTR_nc (sv);
486} 504}
487 505
488static long noinline 506static long noinline
… …
513static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 531static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
514static inline SV *to_sv (float v) { return newSVnv (v); } 532static inline SV *to_sv (float v) { return newSVnv (v); }
515static inline SV *to_sv (double v) { return newSVnv (v); } 533static inline SV *to_sv (double v) { return newSVnv (v); }
516static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 534static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
517static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 535static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
536// gcc dislikes noilnine on to_sv
518static inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 537static noinline SV *to_sv_ni (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
538static inline SV *to_sv (object * v) { return to_sv_ni (v); }
519static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 539static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
520static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 540static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
521static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 541static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
522static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 542static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
523static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 543static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
524static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 544static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
545static inline SV *to_sv (layout * v) { return newSVptr (v, stash_cf_layout_wrap); }
525 546
526static inline SV *to_sv (object & v) { return to_sv (&v); } 547static inline SV *to_sv (object & v) { return to_sv (&v); }
527static inline SV *to_sv (living & v) { return to_sv (&v); } 548static inline SV *to_sv (living & v) { return to_sv (&v); }
528 549
529static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 550static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
… …
565static inline void sv_to (SV *sv, unsigned long &v) { v = SvUV (sv); } 586static 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); } 587static 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); } 588static 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); } 589static inline void sv_to (SV *sv, float &v) { v = SvNV (sv); }
569static inline void sv_to (SV *sv, double &v) { v = SvNV (sv); } 590static 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); } 591static 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); } 592static 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); } 593static inline void sv_to (SV *sv, object * &v) { v = (object *) (attachable *)SvPTR_ornull_object (sv); }
594static 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"); } 595static 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"); } 596static 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"); } 597static 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"); } 598static 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"); } 599static 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"); } 600static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
601static inline void sv_to (SV *sv, layout * &v) { v = (layout *) SvPTR_ornull (sv, "cf::layout"); }
580static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); } 602static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
581static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); } 603static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
582 604
583//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 605//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
584static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 606static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
… …
695template<class type> 717template<class type>
696static void noinline 718static void noinline
697cf_obj_to (SV *arg, type &var) 719cf_obj_to (SV *arg, type &var)
698{ 720{
699 sv_to (arg, var); 721 sv_to (arg, var);
700 if (!var) 722 if (expect_false (!var))
701 croak ("must not pass invalid/null cf_obj here"); 723 croak ("must not pass invalid/null cf_obj here");
702} 724}
703 725
704template<class object> 726template<class object>
705static void noinline 727static void noinline
706cf_obj_ornull_to (SV *arg, object *&var) 728cf_obj_ornull_to (SV *arg, object *&var)
707{ 729{
708 if (SvOK (arg)) 730 if (SvOK (arg))
709 { 731 {
710 sv_to (arg, var); 732 sv_to (arg, var);
711 if (!var) 733 if (expect_false (!var))
712 croak ("unable to convert perl object to C++ object"); 734 croak ("unable to convert perl object to C++ object");
713 } 735 }
714 else 736 else
715 var = 0; 737 var = 0;
716} 738}
… …
751 exit (EXIT_FAILURE); 773 exit (EXIT_FAILURE);
752 } 774 }
753 775
754 eval_pv ( 776 eval_pv (
755 "#line 1 'cfperl init'\n" 777 "#line 1 'cfperl init'\n"
756 "use EV ();\n" 778 "use EV ();\n" // required by bootstrap
757 "use Coro ();\n" 779 "use Coro ();\n" // required by bootstrap
758 "cf->bootstrap;\n" 780 "cf->bootstrap;\n" // required for cf::datadir
759 "unshift @INC, cf::datadir ();\n" 781 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
760 "require cf;\n", 782 "require cf;\n",
761 0 783 0
762 ); 784 );
763 785
764 if (SvTRUE (ERRSV)) 786 if (SvTRUE (ERRSV))
… …
1378 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1400 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1379 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1401 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1380 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1402 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1381 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1403 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1382 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1404 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1405 stash_cf_layout_wrap = gv_stashpv ("cf::layout::wrap", 1);
1406 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1383 1407
1384 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1408 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); 1409 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); 1410 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); 1411 sv_next_tick = get_sv ("cf::NEXT_TICK" , 1); SvUPGRADE (sv_next_tick , SVt_NV);
… …
1436# undef def 1460# undef def
1437# define def(uc, flags) const_iv (SK_ ## uc) 1461# define def(uc, flags) const_iv (SK_ ## uc)
1438# include "skillinc.h" 1462# include "skillinc.h"
1439# undef def 1463# undef def
1440 1464
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) 1465 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1445 1466
1446 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1467 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1447 1468
1448 const_iv (MAX_TIME) 1469 const_iv (MAX_TIME)
… …
1474 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1495 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1475 1496
1476 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1497 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1477 }; 1498 };
1478 1499
1479 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1500 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1480 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1501 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1481 1502
1482 static const struct { 1503 static const struct {
1483 const char *name; 1504 const char *name;
1484 int skip; 1505 int skip;
… …
1490# undef def 1511# undef def
1491 }; 1512 };
1492 1513
1493 AV *av = get_av ("cf::EVENT", 1); 1514 AV *av = get_av ("cf::EVENT", 1);
1494 1515
1495 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1516 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1496 { 1517 {
1497 AV *event = newAV (); 1518 AV *event = newAV ();
1498 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1519 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1499 av_push (event, newSViv (eiv->klass)); 1520 av_push (event, newSViv (eiv->klass));
1500 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1521 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
… …
1581 1602
1582void init_anim () 1603void init_anim ()
1583 1604
1584void init_globals () 1605void init_globals ()
1585 1606
1586void init_experience ()
1587
1588void init_attackmess () 1607void init_attackmess ()
1589 1608
1590void init_dynamic () 1609void init_dynamic ()
1591 1610
1592void load_settings () 1611void load_settings ()
1593 1612
1613void reload_exp_table ()
1614
1594void load_materials () 1615void reload_materials ()
1595 1616
1596void init_uuid () 1617void init_uuid ()
1597 CODE: 1618 CODE:
1598 UUID::init (); 1619 UUID::init ();
1599 1620
… …
1799 1820
1800int random_roll (int min, int max, object *op, int goodbad); 1821int random_roll (int min, int max, object *op, int goodbad);
1801 1822
1802const_utf8_string cost_string_from_value(uint64 cost, int approx = 0) 1823const_utf8_string cost_string_from_value(uint64 cost, int approx = 0)
1803 1824
1804int
1805exp_to_level (val64 exp) 1825int exp_to_level (val64 exp)
1806 CODE:
1807{
1808 int i = 0;
1809 1826
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) 1827val64 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 1828
1834SV * 1829SV *
1835resistance_to_string (int atnr) 1830resistance_to_string (int atnr)
1836 CODE: 1831 CODE:
1837 if (atnr >= 0 && atnr < NROFATTACKS) 1832 if (atnr >= 0 && atnr < NROFATTACKS)
… …
1895 CODE: 1890 CODE:
1896 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext); 1891 RETVAL = SvROK (obj) && mg_find (SvRV (obj), PERL_MAGIC_ext);
1897 OUTPUT: 1892 OUTPUT:
1898 RETVAL 1893 RETVAL
1899 1894
1895bool should_invoke (attachable *obj, int event)
1896 CODE:
1897 RETVAL = obj->should_invoke ((event_type)event);
1898 OUTPUT: RETVAL
1899
1900void 1900void
1901debug_trace (attachable *obj, bool on = true) 1901debug_trace (attachable *obj, bool on = true)
1902 CODE: 1902 CODE:
1903 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE; 1903 obj->attachable_flags &= ~attachable::F_DEBUG_TRACE;
1904 if (on) 1904 if (on)
… …
2029 OUTPUT: 2029 OUTPUT:
2030 RETVAL 2030 RETVAL
2031 2031
2032object *find_best_object_match (object *op, utf8_string match) 2032object *find_best_object_match (object *op, utf8_string match)
2033 2033
2034object *find_marked_object (object *op)
2035
2036int need_identify (object *obj);
2037
2038int apply_shop_mat (object *shop_mat, object *op); 2034int apply_shop_mat (object *shop_mat, object *op);
2039 2035
2040int move (object *op, int dir, object *originator = op) 2036int move (object *op, int dir, object *originator = op)
2041 CODE: 2037 CODE:
2042 RETVAL = op->move (dir, originator); 2038 RETVAL = op->move (dir, originator);
… …
2094 2090
2095void pick_up (object *who, object *op) 2091void pick_up (object *who, object *op)
2096 2092
2097void update_object (object *op, int action) 2093void update_object (object *op, int action)
2098 2094
2099void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2095void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2100 2096
2101void player_lvl_adj (object *who, object *skill = 0) 2097void player_lvl_adj (object *who, object *skill = 0)
2102 2098
2103int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2099int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2104 2100
… …
2469 if (oblinkpt *obp = map->find_link (connection)) 2465 if (oblinkpt *obp = map->find_link (connection))
2470 for (objectlink *ol = obp->link; ol; ol = ol->next) 2466 for (objectlink *ol = obp->link; ol; ol = ol->next)
2471 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2467 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2472 2468
2473void 2469void
2474get_map_flags (maptile *map, int x, int y) 2470xy_normalise (maptile *map, int x, int y, int dir = 0)
2475 PPCODE: 2471 PPCODE:
2476{ 2472{
2477 maptile *nmap = 0; 2473 mapxy pos (map, x, y);
2478 I16 nx = 0, ny = 0; 2474 if (!pos.move (dir).normalise ())
2475 XSRETURN_EMPTY;
2479 2476
2480 PUTBACK;
2481 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2482 SPAGAIN;
2483
2484 EXTEND (SP, 4); 2477 EXTEND (SP, 3);
2485 PUSHs (sv_2mortal (newSViv (flags)));
2486
2487 if (GIMME_V == G_ARRAY)
2488 {
2489 PUSHs (sv_2mortal (to_sv (nmap))); 2478 PUSHs (sv_2mortal (to_sv (pos.m)));
2490 PUSHs (sv_2mortal (newSViv (nx))); 2479 PUSHs (sv_2mortal (to_sv (pos.x)));
2491 PUSHs (sv_2mortal (newSViv (ny))); 2480 PUSHs (sv_2mortal (to_sv (pos.y)));
2492 }
2493} 2481}
2494 2482
2495mapspace * 2483mapspace *
2496ms (maptile *map, unsigned int x, unsigned int y) 2484ms (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2497 PROTOTYPE: $$$ 2485 PROTOTYPE: $$$;$
2498 CODE: 2486 CODE:
2499{ 2487{
2500 maptile *nmap = 0; 2488 mapxy pos (map, x, y);
2501 I16 nx, ny; 2489 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; 2490 XSRETURN_UNDEF;
2509 2491
2510 RETVAL = &nmap->at (nx, ny); 2492 RETVAL = &*pos;
2511} 2493}
2512 OUTPUT: 2494 OUTPUT:
2513 RETVAL 2495 RETVAL
2514 2496
2515void 2497void
2516at (maptile *map, unsigned int x, unsigned int y) 2498at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2517 PROTOTYPE: $$$ 2499 PROTOTYPE: $$$;$
2518 PPCODE: 2500 PPCODE:
2519{ 2501 mapxy pos (map, x, y);
2520 maptile *nmap = 0; 2502 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) 2503 for (object *o = pos->bot; o; o = o->above)
2529 XPUSHs (sv_2mortal (to_sv (o))); 2504 XPUSHs (sv_2mortal (to_sv (o)));
2530}
2531 2505
2532SV * 2506SV *
2533bot_at (maptile *map, unsigned int x, unsigned int y) 2507bot_at (maptile *map, unsigned int x, unsigned int y, int dir = 0)
2534 PROTOTYPE: $$$ 2508 PROTOTYPE: $$$;$
2535 ALIAS: 2509 ALIAS:
2536 top_at = 1 2510 top_at = 1
2537 flags_at = 2 2511 flags_at = 2
2538 light_at = 3 2512 light_at = 3
2539 move_block_at = 4 2513 move_block_at = 4
2540 move_slow_at = 5 2514 move_slow_at = 5
2541 move_on_at = 6 2515 move_on_at = 6
2542 move_off_at = 7 2516 move_off_at = 7
2543 CODE: 2517 CODE:
2544{ 2518{
2545 sint16 nx = x; 2519 mapxy pos (map, x, y);
2546 sint16 ny = y; 2520 if (!pos.move (dir).normalise ())
2547
2548 if (!xy_normalise (map, nx, ny))
2549 XSRETURN_UNDEF; 2521 XSRETURN_UNDEF;
2550 2522
2551 mapspace &ms = map->at (nx, ny); 2523 mapspace &ms = *pos;
2552 2524
2553 ms.update (); 2525 ms.update ();
2554 2526
2555 switch (ix) 2527 switch (ix)
2556 { 2528 {
… …
2568 2540
2569# worst xs function of my life 2541# worst xs function of my life
2570bool 2542bool
2571_create_random_map (\ 2543_create_random_map (\
2572 maptile *self,\ 2544 maptile *self,\
2573 utf8_string wallstyle,\ 2545 SV *options,\
2574 utf8_string wall_name,\
2575 utf8_string floorstyle,\
2576 utf8_string monsterstyle,\
2577 utf8_string treasurestyle,\
2578 utf8_string layoutstyle,\
2579 utf8_string doorstyle,\
2580 utf8_string decorstyle,\
2581 utf8_string miningstyle,\
2582 utf8_string origin_map,\
2583 utf8_string final_map,\
2584 utf8_string exitstyle,\
2585 utf8_string this_map,\
2586 utf8_string exit_on_final_map,\
2587 int xsize,\
2588 int ysize,\
2589 int expand2x,\
2590 int layoutoptions1,\
2591 int layoutoptions2,\
2592 int layoutoptions3,\
2593 int symmetry,\
2594 int difficulty,\
2595 int difficulty_given,\
2596 float difficulty_increase,\
2597 int dungeon_level,\
2598 int dungeon_depth,\
2599 int decoroptions,\
2600 int orientation,\
2601 int origin_y,\
2602 int origin_x,\
2603 U32 random_seed,\
2604 val64 total_map_hp,\ 2546 val64 total_map_hp,\
2605 int map_layout_style,\
2606 int treasureoptions,\
2607 int symmetry_used,\
2608 region *region,\ 2547 region *region\
2609 utf8_string custom\
2610) 2548)
2611 CODE: 2549 CODE:
2612{ 2550{
2613 random_map_params rmp; 2551 random_map_params rmp;
2614 2552
2615 assign (rmp.wallstyle , wallstyle); 2553 rmp.hv = (HV *)SvREFCNT_inc_NN (SvRV (options));
2554
2616 assign (rmp.wall_name , wall_name); 2555 assign (rmp.wall_name , rmp.get_str ("wall_name"));
2617 assign (rmp.floorstyle , floorstyle);
2618 assign (rmp.monsterstyle , monsterstyle); 2556 assign (rmp.monsterstyle , rmp.get_str ("monsterstyle"));
2619 assign (rmp.treasurestyle , treasurestyle);
2620 assign (rmp.layoutstyle , layoutstyle); 2557 assign (rmp.layoutstyle , rmp.get_str ("layoutstyle"));
2621 assign (rmp.doorstyle , doorstyle); 2558 assign (rmp.doorstyle , rmp.get_str ("doorstyle"));
2622 assign (rmp.decorstyle , decorstyle);
2623 assign (rmp.miningstyle , miningstyle);
2624 assign (rmp.exitstyle , exitstyle);
2625 assign (rmp.exit_on_final_map, exit_on_final_map); 2559 assign (rmp.exit_on_final_map, rmp.get_str ("exit_on_final_map"));
2626 2560
2627 rmp.origin_map = origin_map; 2561 rmp.origin_map = rmp.get_str ("origin_map");
2562 rmp.origin_x = rmp.get_iv ("origin_x");
2563 rmp.origin_y = rmp.get_iv ("origin_y");
2628 rmp.final_map = final_map; 2564 rmp.final_map = rmp.get_str ("final_map");
2629 rmp.this_map = this_map; 2565 rmp.this_map = rmp.get_str ("this_map");
2630 rmp.xsize = xsize; 2566 rmp.xsize = rmp.get_iv ("xsize");
2631 rmp.ysize = ysize; 2567 rmp.ysize = rmp.get_iv ("ysize");
2632 rmp.expand2x = expand2x; 2568 rmp.expand2x = rmp.get_iv ("expand2x");
2633 rmp.layoutoptions1 = layoutoptions1; 2569 rmp.layoutoptions1 = rmp.get_iv ("layoutoptions1");
2634 rmp.layoutoptions2 = layoutoptions2; 2570 rmp.layoutoptions2 = rmp.get_iv ("layoutoptions2");
2635 rmp.layoutoptions3 = layoutoptions3; 2571 rmp.layoutoptions3 = rmp.get_iv ("layoutoptions3");
2636 rmp.symmetry = symmetry; 2572 rmp.symmetry = rmp.get_iv ("symmetry");
2637 rmp.difficulty = difficulty; 2573 rmp.difficulty = rmp.get_iv ("difficulty");
2638 rmp.difficulty_given = difficulty_given; 2574 rmp.difficulty_given = rmp.get_iv ("difficulty_given");
2639 rmp.difficulty_increase = difficulty_increase; 2575 rmp.difficulty_increase = rmp.get_nv ("difficulty_increase");
2640 rmp.dungeon_level = dungeon_level; 2576 rmp.dungeon_level = rmp.get_iv ("dungeon_level");
2641 rmp.dungeon_depth = dungeon_depth; 2577 rmp.dungeon_depth = rmp.get_iv ("dungeon_depth");
2642 rmp.decoroptions = decoroptions;
2643 rmp.orientation = orientation; 2578 rmp.orientation = rmp.get_iv ("orientation");
2644 rmp.origin_y = origin_y;
2645 rmp.origin_x = origin_x;
2646 rmp.random_seed = random_seed; 2579 rmp.random_seed = rmp.get_uv ("random_seed");
2647 rmp.total_map_hp = (uint64_t) total_map_hp; 2580 rmp.total_map_hp = (uint64_t)total_map_hp;
2648 rmp.map_layout_style = map_layout_style; 2581 rmp.map_layout_style = rmp.get_iv ("map_layout_style");
2649 rmp.treasureoptions = treasureoptions;
2650 rmp.symmetry_used = symmetry_used; 2582 rmp.symmetry_used = rmp.get_iv ("symmetry_used");
2651 rmp.region = region; 2583 rmp.region = region;
2652 rmp.custom = custom;
2653 2584
2654 RETVAL = self->generate_random_map (&rmp); 2585 RETVAL = self->generate_random_map (&rmp);
2655} 2586}
2656 OUTPUT: 2587 OUTPUT:
2657 RETVAL 2588 RETVAL
… …
2689void 2620void
2690list () 2621list ()
2691 PPCODE: 2622 PPCODE:
2692 for_all_regions (rgn) 2623 for_all_regions (rgn)
2693 XPUSHs (sv_2mortal (to_sv (rgn))); 2624 XPUSHs (sv_2mortal (to_sv (rgn)));
2694
2695region *find (utf8_string name)
2696 PROTOTYPE: $
2697 CODE:
2698 RETVAL = region::find (name);
2699 OUTPUT: RETVAL
2700 2625
2701int specificity (region *rgn) 2626int specificity (region *rgn)
2702 CODE: 2627 CODE:
2703 RETVAL = 0; 2628 RETVAL = 0;
2704 while (rgn = rgn->parent) 2629 while (rgn = rgn->parent)
… …
2954 sv_to (sv, self); 2879 sv_to (sv, self);
2955 delete self; 2880 delete self;
2956 2881
2957MODULE = cf PACKAGE = cf::object::thawer 2882MODULE = cf PACKAGE = cf::object::thawer
2958 2883
2959INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/cfperl.h | 2884INCLUDE: $PERL $srcdir/genacc object_thawer $srcdir/../include/freezethaw.h |
2885
2886bool
2887errors_are_fatal (bool fatal)
2888 CODE:
2889 RETVAL = object_thawer::errors_are_fatal;
2890 object_thawer::errors_are_fatal = fatal;
2891 OUTPUT:
2892 RETVAL
2960 2893
2961SV * 2894SV *
2962new_from_file (char *klass, octet_string path) 2895new_from_file (char *klass, octet_string path)
2963 CODE: 2896 CODE:
2964 object_thawer *f = new object_thawer (path); 2897 object_thawer *f = new object_thawer (path);
… …
2990 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2923 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
2991 2924
2992 self->skip (); 2925 self->skip ();
2993 } 2926 }
2994 2927
2928MODULE = cf PACKAGE = cf::layout
2929
2930INCLUDE: $PERL $srcdir/genacc layout $srcdir/../random_maps/random_map.h |
2931

Diff Legend

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