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.315 by root, Thu Jan 8 03:03:24 2009 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)
… …
151 SvREFCNT_inc (self); 158 SvREFCNT_inc (self);
152 hv_clear (self); 159 hv_clear (self);
153 sv_unmagic ((SV *)self, PERL_MAGIC_ext); 160 sv_unmagic ((SV *)self, PERL_MAGIC_ext);
154 SvREFCNT_dec (self); 161 SvREFCNT_dec (self);
155 162
156 // self *must* be null now because thats sv_unmagic's job. 163 // self *must* be null now because that's sv_unmagic's job.
157 assert (!this->self); 164 assert (!this->self);
158 } 165 }
159} 166}
160 167
161void 168void
… …
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 405 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399 406
400 return (long)mg->mg_ptr; 407 return (long)mg->mg_ptr;
401} 408}
402 409
403static long 410static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 411SvPTR_ornull (SV *sv, const char *klass)
405{ 412{
406 if (SvOK (sv)) 413 if (SvOK (sv))
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); }
… …
600 va_end (ap); 607 va_end (ap);
601 608
602 return sv; 609 return sv;
603} 610}
604 611
612// typemap support, mostly to avoid excessive inlining
613template<class type>
614static void noinline
615cf_obj_to (SV *arg, type &var)
616{
617 sv_to (arg, var);
618 if (!var)
619 croak ("must not pass invalid/null cf_obj here");
620}
621
622template<class object>
623static void noinline
624cf_obj_ornull_to (SV *arg, object *&var)
625{
626 if (SvOK (arg))
627 {
628 sv_to (arg, var);
629 if (!var)
630 croak ("unable to convert perl object to C++ object");
631 }
632 else
633 var = 0;
634}
635
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 636//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 637
607SV * 638SV *
608registry (attachable *ext) 639registry (attachable *ext)
609{ 640{
… …
626 657
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 658 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 659
629 const char *argv[] = { 660 const char *argv[] = {
630 settings.argv [0], 661 settings.argv [0],
631 "-e" 662 "-e0"
632 "use EV; use Coro;" // required for bootstrap
633 "cf->bootstrap;" // required for datadir :*>
634 "unshift @INC, cf::datadir ();"
635 "require cf;"
636 }; 663 };
637 664
638 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 665 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
639 || perl_run (perl)) 666 || perl_run (perl))
640 { 667 {
641 printf ("unable to initialize perl-interpreter, aborting.\n"); 668 printf ("unable to initialize perl-interpreter, aborting.\n");
642 exit (EXIT_FAILURE); 669 exit (EXIT_FAILURE);
643 } 670 }
644 671
672 eval_pv (
673 "#line 1 'cfperl init'\n"
674 "use EV ();\n"
675 "use Coro ();\n"
676 "cf->bootstrap;\n"
677 "unshift @INC, cf::datadir ();\n"
678 "require cf;\n",
679 0
680 );
681
682 if (SvTRUE (ERRSV))
645 { 683 {
646 dSP; 684 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
647 685 exit (EXIT_FAILURE);
648 PUSHMARK (SP);
649 PUTBACK;
650 call_pv ("cf::init", G_DISCARD | G_VOID);
651 } 686 }
652} 687}
653 688
689void
654void cfperl_main () 690cfperl_main ()
655{ 691{
656 dSP; 692 dSP;
657 693
658 PUSHMARK (SP); 694 PUSHMARK (SP);
659 PUTBACK; 695 PUTBACK;
… …
684# undef def 720# undef def
685}; 721};
686 722
687#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 723#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
688 724
689static void 725static void noinline
690gather_callbacks (AV *&callbacks, AV *registry, event_type event) 726gather_callbacks (AV *&callbacks, AV *registry, event_type event)
691{ 727{
692 // event must be in array 728 // event must be in array
693 if (event >= 0 && event <= AvFILLp (registry)) 729 if (event >= 0 && event <= AvFILLp (registry))
694 { 730 {
… …
780{ 816{
781 attachable::gather_callbacks (callbacks, event); 817 attachable::gather_callbacks (callbacks, event);
782 ::gather_callbacks (callbacks, cb_map, event); 818 ::gather_callbacks (callbacks, cb_map, event);
783} 819}
784 820
785void 821static void noinline
786_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 822_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
787{ 823{
788 for (int event = 0; event <= AvFILLp (registry); ++event) 824 for (int event = 0; event <= AvFILLp (registry); ++event)
789 { 825 {
790 SV *cbs_ = AvARRAY (registry)[event]; 826 SV *cbs_ = AvARRAY (registry)[event];
… …
800 } 836 }
801 } 837 }
802} 838}
803 839
804// very slow and inefficient way to recalculate the global want bitsets 840// very slow and inefficient way to recalculate the global want bitsets
805void 841static void
806_recalc_want () 842_recalc_want ()
807{ 843{
808 ev_want_event.reset (); 844 ev_want_event.reset ();
809 845
810 _recalc_want (ev_want_event, cb_global); 846 _recalc_want (ev_want_event, cb_global);
… …
920} 956}
921 957
922///////////////////////////////////////////////////////////////////////////// 958/////////////////////////////////////////////////////////////////////////////
923// various c++ => perl glue functions 959// various c++ => perl glue functions
924 960
961void
925void cfperl_tick () 962cfperl_tick ()
926{ 963{
927 tick_pending = 1; 964 tick_pending = 1;
928 965
929 if (tick_inhibit) 966 if (tick_inhibit)
930 return; 967 return;
… …
992 CALL_END; 1029 CALL_END;
993 1030
994 return can; 1031 return can;
995} 1032}
996 1033
1034void
1035cfperl_mapscript_activate (object *ob, object *activator, int state)
1036{
1037 CALL_BEGIN (3);
1038 CALL_ARG (ob);
1039 CALL_ARG (activator);
1040 CALL_ARG (state);
1041 CALL_CALL ("cf::mapscript::activate", G_VOID);
1042 CALL_END;
1043}
1044
997player * 1045player *
998player::find (const char *name) 1046player::find (const char *name)
999{ 1047{
1000 CALL_BEGIN (1); 1048 CALL_BEGIN (1);
1001 CALL_ARG (name); 1049 CALL_ARG (name);
… …
1063maptile::do_load_sync () 1111maptile::do_load_sync ()
1064{ 1112{
1065 CALL_BEGIN (1); 1113 CALL_BEGIN (1);
1066 CALL_ARG (this); 1114 CALL_ARG (this);
1067 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1115 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; 1116 CALL_END;
1078} 1117}
1079 1118
1080void 1119void
1081object::enter_exit (object *exit) 1120object::enter_exit (object *exit)
… …
1153///////////////////////////////////////////////////////////////////////////// 1192/////////////////////////////////////////////////////////////////////////////
1154 1193
1155struct EVAPI *evapi::GEVAPI; 1194struct EVAPI *evapi::GEVAPI;
1156struct CoroAPI *coroapi::GCoroAPI; 1195struct CoroAPI *coroapi::GCoroAPI;
1157 1196
1197void
1158void coroapi::do_cede_to_tick () 1198coroapi::do_cede_to_tick ()
1159{ 1199{
1160 cede_pending = 0; 1200 cede_pending = 0;
1161 cede (); 1201 cede ();
1162} 1202}
1163 1203
… …
1187 ev_io_set ((ev_io *)this, fd, events); 1227 ev_io_set ((ev_io *)this, fd, events);
1188 if (active) start (); 1228 if (active) start ();
1189 } 1229 }
1190} 1230}
1191 1231
1192void 1232static void
1193_connect_to_perl () 1233_connect_to_perl ()
1194{ 1234{
1195 stash_cf = gv_stashpv ("cf", 1); 1235 stash_cf = gv_stashpv ("cf", 1);
1196 1236
1197 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1237 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
… …
1287 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON) 1327 const_iv (FORCE) const_iv (POTION_EFFECT) const_iv (EVENT_CONNECTOR) const_iv (CLOSE_CON)
1288 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL) 1328 const_iv (CONTAINER) const_iv (ARMOUR_IMPROVER) const_iv (WEAPON_IMPROVER) const_iv (SKILLSCROLL)
1289 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE) 1329 const_iv (DEEP_SWAMP) const_iv (IDENTIFY_ALTAR) const_iv (MENU) const_iv (RUNE)
1290 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE) 1330 const_iv (TRAP) const_iv (POWER_CRYSTAL) const_iv (CORPSE) const_iv (DISEASE)
1291 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER) 1331 const_iv (SYMPTOM) const_iv (BUILDER) const_iv (MATERIAL) const_iv (ITEM_TRANSFORMER)
1332 const_iv (MAPSCRIPT) const_iv (SAFE_GROUND)
1292 1333
1293 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1334 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1294 1335
1295 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1336 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1296 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM) 1337 const_iv (ST_MAT_FLOOR) const_iv (ST_MAT_WALL) const_iv (ST_MAT_ITEM)
… …
1328 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1369 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) 1370 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) 1371 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) 1372 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) 1373 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) 1374 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) 1375 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) 1376 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1336 1377
1337 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1378 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) 1379 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) 1380 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) 1381 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) 1382 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) 1383 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1343 1384
1344 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1385 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) 1386 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1346 1387
1347 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1388 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
… …
1521 f (GvGP (gv)->gp_cv); 1562 f (GvGP (gv)->gp_cv);
1522 GvCVGEN (gv) = 0; 1563 GvCVGEN (gv) = 0;
1523 GvMULTI_off (gv); 1564 GvMULTI_off (gv);
1524# undef f 1565# undef f
1525 1566
1526
1527void _connect_to_perl () 1567void _connect_to_perl ()
1528 1568
1529void _recalc_want () 1569void _recalc_want ()
1530 1570
1571# not used by default anymore
1531void _global_reattach () 1572void _global_reattach ()
1532 CODE: 1573 CODE:
1533{ 1574{
1534 // reattach to all attachable objects in the game. 1575 // reattach to all attachable objects in the game.
1535 for_all_clients (ns) 1576 for_all_clients (ns)
… …
1578 len -= 3; 1619 len -= 3;
1579 } 1620 }
1580 1621
1581 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1622 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1582} 1623}
1624
1625void init_anim ()
1626
1627void init_globals ()
1628
1629void init_experience ()
1630
1631void init_attackmess ()
1632
1633void init_dynamic ()
1634
1635void load_settings ()
1636
1637void load_materials ()
1638
1639void init_uuid ()
1640 CODE:
1641 UUID::init ();
1642
1643void init_signals ()
1644
1645void init_commands ()
1646
1647void init_skills ()
1648
1649void init_beforeplay ()
1583 1650
1584void evthread_start (int aiofd) 1651void evthread_start (int aiofd)
1585 1652
1586void cede_to_tick () 1653void cede_to_tick ()
1587 CODE: 1654 CODE:
… …
1725#if _POSIX_MEMLOCK 1792#if _POSIX_MEMLOCK
1726 1793
1727int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1794int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1728 INIT: 1795 INIT:
1729#if __GLIBC__ 1796#if __GLIBC__
1797 mallopt (M_TOP_PAD, 1024 * 1024);
1798 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1799 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1730 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1800 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1731#endif 1801#endif
1732 1802
1733int munlockall () 1803int munlockall ()
1734 1804
… …
1753 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1823 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))); 1824 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))); 1825 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))); 1826 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1757#endif 1827#endif
1758 EXTEND (SP, 2*2); 1828 EXTEND (SP, 5*2);
1759 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1829 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))); 1830 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)))); 1831 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1832 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1833 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1762} 1834}
1763 1835
1764int find_animation (utf8_string text) 1836int find_animation (utf8_string text)
1765 PROTOTYPE: $ 1837 PROTOTYPE: $
1766 1838
… …
2075 2147
2076void push_button (object *op); 2148void push_button (object *op);
2077 2149
2078void use_trigger (object *op); 2150void use_trigger (object *op);
2079 2151
2080void add_button_link (object *button, maptile *map, int connected);
2081
2082void remove_button_link (object *op);
2083
2084void handle_apply_yield (object *op); 2152void handle_apply_yield (object *op);
2085 2153
2086 2154
2087MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2155MODULE = cf PACKAGE = cf::object PREFIX = cf_
2088 2156
… …
2206 pl->ob->stats.hp = pl->ob->stats.maxhp; 2274 pl->ob->stats.hp = pl->ob->stats.maxhp;
2207 pl->ob->stats.sp = pl->ob->stats.maxsp; 2275 pl->ob->stats.sp = pl->ob->stats.maxsp;
2208 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2276 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2209 pl->orig_stats = pl->ob->stats; 2277 pl->orig_stats = pl->ob->stats;
2210 2278
2211void clear_los (player *pl) 2279# should only be temporary
2280void esrv_new_player (player *pl)
2212 2281
2282#d# TODO: replace by blocked_los accessor, fix code using this
2213bool 2283bool
2214cell_visible (player *pl, int dx, int dy) 2284cell_visible (player *pl, int dx, int dy)
2215 CODE: 2285 CODE:
2216 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2286 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2217 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2218 OUTPUT: 2287 OUTPUT:
2219 RETVAL 2288 RETVAL
2220 2289
2221void 2290void
2222send (player *pl, SV *packet) 2291send (player *pl, SV *packet)
… …
2290} 2359}
2291 2360
2292INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2361INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2293 2362
2294void 2363void
2364adjust_daylight ()
2365 CODE:
2366 maptile::adjust_daylight ();
2367
2368void
2295maptile::instantiate () 2369maptile::instantiate ()
2296 2370
2297maptile *new () 2371maptile *new ()
2298 PROTOTYPE: 2372 PROTOTYPE:
2299 CODE: 2373 CODE:
… …
2392} 2466}
2393 2467
2394void 2468void
2395maptile::create_region_treasure () 2469maptile::create_region_treasure ()
2396 CODE: 2470 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) 2471 for (int x = 0; x < THIS->width; ++x)
2403 for (int y = 0; y < THIS->height; ++y) 2472 for (int y = 0; y < THIS->height; ++y)
2404 { 2473 {
2405 region *rgn = THIS->region (x, y); 2474 region *rgn = THIS->region (x, y);
2406 2475
2407 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2476 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2477 if (object *op = THIS->at (x, y).top)
2408 if (rgn->treasure && rndm () < rgn->treasure_density) 2478 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); 2479 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2413 }
2414 } 2480 }
2415 2481
2416 op->destroy ();
2417}
2418
2419int out_of_map (maptile *map, int x, int y) 2482int out_of_map (maptile *map, int x, int y)
2420 2483
2421void 2484void
2422trigger (maptile *map, long connection, bool state = true) 2485find_link (maptile *map, shstr_tmp connection)
2423 CODE:
2424 activate_connection (map, connection, state);
2425
2426void
2427get_connection (maptile *map, long connection)
2428 PPCODE: 2486 PPCODE:
2429 oblinkpt *obp = get_connection_links (map, connection); 2487 if (oblinkpt *obp = map->find_link (connection))
2430 if (obp)
2431 for (objectlink *ol = obp->link; ol; ol = ol->next) 2488 for (objectlink *ol = obp->link; ol; ol = ol->next)
2432 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2489 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2433 2490
2434void 2491void
2435get_map_flags (maptile *map, int x, int y) 2492get_map_flags (maptile *map, int x, int y)
… …
2489 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2546 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2490 XPUSHs (sv_2mortal (to_sv (o))); 2547 XPUSHs (sv_2mortal (to_sv (o)));
2491} 2548}
2492 2549
2493SV * 2550SV *
2494bot_at (maptile *obj, unsigned int x, unsigned int y) 2551bot_at (maptile *map, unsigned int x, unsigned int y)
2495 PROTOTYPE: $$$ 2552 PROTOTYPE: $$$
2496 ALIAS: 2553 ALIAS:
2497 top_at = 1 2554 top_at = 1
2498 flags_at = 2 2555 flags_at = 2
2499 light_at = 3 2556 light_at = 3
2500 move_block_at = 4 2557 move_block_at = 4
2501 move_slow_at = 5 2558 move_slow_at = 5
2502 move_on_at = 6 2559 move_on_at = 6
2503 move_off_at = 7 2560 move_off_at = 7
2504 INIT:
2505 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2506 CODE: 2561 CODE:
2562{
2563 sint16 nx = x;
2564 sint16 ny = y;
2565
2566 if (!xy_normalise (map, nx, ny))
2567 XSRETURN_UNDEF;
2568
2569 mapspace &ms = map->at (nx, ny);
2570
2571 ms.update ();
2572
2507 switch (ix) 2573 switch (ix)
2508 { 2574 {
2509 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2575 case 0: RETVAL = to_sv (ms.bot ); break;
2510 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2576 case 1: RETVAL = to_sv (ms.top ); break;
2511 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2577 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2512 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2578 case 3: RETVAL = newSViv (ms.light ); break;
2513 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2579 case 4: RETVAL = newSVuv (ms.move_block); break;
2514 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2580 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2515 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2581 case 6: RETVAL = newSVuv (ms.move_on ); break;
2516 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2582 case 7: RETVAL = newSVuv (ms.move_off ); break;
2517 } 2583 }
2584}
2518 OUTPUT: RETVAL 2585 OUTPUT: RETVAL
2519 2586
2520void fix_walls (maptile *map, int x, int y) 2587void fix_walls (maptile *map, int x, int y)
2521 2588
2522void fix_walls_around (maptile *map, int x, int y) 2589void fix_walls_around (maptile *map, int x, int y)
… …
2655 PROTOTYPE: $ 2722 PROTOTYPE: $
2656 CODE: 2723 CODE:
2657 RETVAL = region::find (name); 2724 RETVAL = region::find (name);
2658 OUTPUT: RETVAL 2725 OUTPUT: RETVAL
2659 2726
2660region *find_fuzzy (utf8_string name)
2661 PROTOTYPE: $
2662 CODE:
2663 RETVAL = region::find_fuzzy (name);
2664 OUTPUT: RETVAL
2665
2666int specificity (region *rgn) 2727int specificity (region *rgn)
2667 CODE: 2728 CODE:
2668 RETVAL = 0; 2729 RETVAL = 0;
2669 while (rgn = rgn->parent) 2730 while (rgn = rgn->parent)
2670 RETVAL++; 2731 RETVAL++;

Diff Legend

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