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.302 by root, Mon Sep 22 23:57:48 2008 UTC vs.
Revision 1.320 by root, Thu Jul 16 21:42:56 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
… …
310 fprintf (stderr, "P %p\n", pl); 317 fprintf (stderr, "P %p\n", pl);
311 318
312 for_all_clients (ns) 319 for_all_clients (ns)
313 if (find_backref (ptr, ns)) 320 if (find_backref (ptr, ns))
314 fprintf (stderr, "C %p\n", ns); 321 fprintf (stderr, "C %p\n", ns);
315
316} 322}
317 323
318////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 324//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
319 325
320static SV * 326static SV *
… …
398 croak ("perl code used %s object, but C object is already destroyed, caught", klass); 404 croak ("perl code used %s object, but C object is already destroyed, caught", klass);
399 405
400 return (long)mg->mg_ptr; 406 return (long)mg->mg_ptr;
401} 407}
402 408
403static long 409static long noinline
404SvPTR_ornull (SV *sv, const char *klass) 410SvPTR_ornull (SV *sv, const char *klass)
405{ 411{
406 if (SvOK (sv)) 412 if (SvOK (sv))
407 return SvPTR (sv, klass); 413 return SvPTR (sv, klass);
408 else 414 else
409 return 0; 415 return 0;
410} 416}
411 417
412inline SV *to_sv (const shstr & v) { return newSVpvn_utf8 ((const char *)v, v.length ()); } 418inline 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); } 419inline SV *to_sv (const char * v) { return v ? newSVpv (v, 0) : newSV (0); }
414inline SV *to_sv (bool v) { return newSViv (v); } 420inline SV *to_sv (bool v) { return newSViv (v); }
415inline SV *to_sv ( signed char v) { return newSViv (v); } 421inline SV *to_sv ( signed char v) { return newSViv (v); }
416inline SV *to_sv (unsigned char v) { return newSViv (v); } 422inline SV *to_sv (unsigned char v) { return newSViv (v); }
417inline SV *to_sv ( signed short v) { return newSViv (v); } 423inline SV *to_sv ( signed short v) { return newSViv (v); }
… …
600 va_end (ap); 606 va_end (ap);
601 607
602 return sv; 608 return sv;
603} 609}
604 610
611// typemap support, mostly to avoid excessive inlining
612template<class type>
613static void noinline
614cf_obj_to (SV *arg, type &var)
615{
616 sv_to (arg, var);
617 if (!var)
618 croak ("must not pass invalid/null cf_obj here");
619}
620
621template<class object>
622static void noinline
623cf_obj_ornull_to (SV *arg, object *&var)
624{
625 if (SvOK (arg))
626 {
627 sv_to (arg, var);
628 if (!var)
629 croak ("unable to convert perl object to C++ object");
630 }
631 else
632 var = 0;
633}
634
605////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 635//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
606 636
607SV * 637SV *
608registry (attachable *ext) 638registry (attachable *ext)
609{ 639{
… …
626 656
627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 657 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
628 658
629 const char *argv[] = { 659 const char *argv[] = {
630 settings.argv [0], 660 settings.argv [0],
631 "-e" 661 "-e0"
632 "use EV; use Coro;" // required for bootstrap
633 "cf->bootstrap;" // required for datadir :*>
634 "unshift @INC, cf::datadir ();"
635 "require cf;"
636 }; 662 };
637 663
638 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 664 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
639 || perl_run (perl)) 665 || perl_run (perl))
640 { 666 {
641 printf ("unable to initialize perl-interpreter, aborting.\n"); 667 printf ("unable to initialize perl-interpreter, aborting.\n");
642 exit (EXIT_FAILURE); 668 exit (EXIT_FAILURE);
643 } 669 }
644 670
671 eval_pv (
672 "#line 1 'cfperl init'\n"
673 "use EV ();\n"
674 "use Coro ();\n"
675 "cf->bootstrap;\n"
676 "unshift @INC, cf::datadir ();\n"
677 "require cf;\n",
678 0
679 );
680
681 if (SvTRUE (ERRSV))
645 { 682 {
646 dSP; 683 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
647 684 exit (EXIT_FAILURE);
648 PUSHMARK (SP);
649 PUTBACK;
650 call_pv ("cf::init", G_DISCARD | G_VOID);
651 } 685 }
652} 686}
653 687
688void
654void cfperl_main () 689cfperl_main ()
655{ 690{
656 dSP; 691 dSP;
657 692
658 PUSHMARK (SP); 693 PUSHMARK (SP);
659 PUTBACK; 694 PUTBACK;
… …
684# undef def 719# undef def
685}; 720};
686 721
687#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE) 722#define KLASS_OF(event) (((unsigned int)event) < NUM_EVENT_TYPES ? klass_of [event] : KLASS_NONE)
688 723
689static void 724static void noinline
690gather_callbacks (AV *&callbacks, AV *registry, event_type event) 725gather_callbacks (AV *&callbacks, AV *registry, event_type event)
691{ 726{
692 // event must be in array 727 // event must be in array
693 if (event >= 0 && event <= AvFILLp (registry)) 728 if (event >= 0 && event <= AvFILLp (registry))
694 { 729 {
… …
780{ 815{
781 attachable::gather_callbacks (callbacks, event); 816 attachable::gather_callbacks (callbacks, event);
782 ::gather_callbacks (callbacks, cb_map, event); 817 ::gather_callbacks (callbacks, cb_map, event);
783} 818}
784 819
785void 820static void noinline
786_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 821_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
787{ 822{
788 for (int event = 0; event <= AvFILLp (registry); ++event) 823 for (int event = 0; event <= AvFILLp (registry); ++event)
789 { 824 {
790 SV *cbs_ = AvARRAY (registry)[event]; 825 SV *cbs_ = AvARRAY (registry)[event];
… …
800 } 835 }
801 } 836 }
802} 837}
803 838
804// very slow and inefficient way to recalculate the global want bitsets 839// very slow and inefficient way to recalculate the global want bitsets
805void 840static void
806_recalc_want () 841_recalc_want ()
807{ 842{
808 ev_want_event.reset (); 843 ev_want_event.reset ();
809 844
810 _recalc_want (ev_want_event, cb_global); 845 _recalc_want (ev_want_event, cb_global);
… …
920} 955}
921 956
922///////////////////////////////////////////////////////////////////////////// 957/////////////////////////////////////////////////////////////////////////////
923// various c++ => perl glue functions 958// various c++ => perl glue functions
924 959
960void
925void cfperl_tick () 961cfperl_tick ()
926{ 962{
927 tick_pending = 1; 963 tick_pending = 1;
928 964
929 if (tick_inhibit) 965 if (tick_inhibit)
930 return; 966 return;
… …
992 CALL_END; 1028 CALL_END;
993 1029
994 return can; 1030 return can;
995} 1031}
996 1032
1033void
1034cfperl_mapscript_activate (object *ob, int state, object *activator, object *originator)
1035{
1036 CALL_BEGIN (4);
1037 CALL_ARG (ob);
1038 CALL_ARG (state);
1039 CALL_ARG (activator);
1040 CALL_ARG (originator);
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)
… …
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:
… …
1756 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)));
1757 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)));
1758 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)));
1759 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)));
1760#endif 1827#endif
1761 EXTEND (SP, 2*2); 1828 EXTEND (SP, 5*2);
1762 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)));
1763 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)));
1764 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)));
1765} 1834}
1766 1835
1767int find_animation (utf8_string text) 1836int find_animation (utf8_string text)
1768 PROTOTYPE: $ 1837 PROTOTYPE: $
1769 1838
… …
2074 2143
2075int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2144int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2076 2145
2077int calc_skill_exp (object *who, object *op, object *skill); 2146int calc_skill_exp (object *who, object *op, object *skill);
2078 2147
2079void push_button (object *op); 2148void push_button (object *op, object *originator);
2080 2149
2081void use_trigger (object *op); 2150void use_trigger (object *op, object *originator);
2082
2083void add_button_link (object *button, maptile *map, int connected);
2084
2085void remove_button_link (object *op);
2086 2151
2087void handle_apply_yield (object *op); 2152void handle_apply_yield (object *op);
2153
2154int convert_item (object *item, object *converter);
2088 2155
2089 2156
2090MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2157MODULE = cf PACKAGE = cf::object PREFIX = cf_
2091 2158
2092# no clean way to get an object from an archetype - stupid idiotic 2159# no clean way to get an object from an archetype - stupid idiotic
… …
2209 pl->ob->stats.hp = pl->ob->stats.maxhp; 2276 pl->ob->stats.hp = pl->ob->stats.maxhp;
2210 pl->ob->stats.sp = pl->ob->stats.maxsp; 2277 pl->ob->stats.sp = pl->ob->stats.maxsp;
2211 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2278 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2212 pl->orig_stats = pl->ob->stats; 2279 pl->orig_stats = pl->ob->stats;
2213 2280
2214void clear_los (player *pl) 2281# should only be temporary
2282void esrv_new_player (player *pl)
2215 2283
2284#d# TODO: replace by blocked_los accessor, fix code using this
2216bool 2285bool
2217cell_visible (player *pl, int dx, int dy) 2286cell_visible (player *pl, int dx, int dy)
2218 CODE: 2287 CODE:
2219 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2288 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2220 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2221 OUTPUT: 2289 OUTPUT:
2222 RETVAL 2290 RETVAL
2223 2291
2224void 2292void
2225send (player *pl, SV *packet) 2293send (player *pl, SV *packet)
… …
2293} 2361}
2294 2362
2295INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2363INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2296 2364
2297void 2365void
2366adjust_daylight ()
2367 CODE:
2368 maptile::adjust_daylight ();
2369
2370int
2371outdoor_darkness (int darkness = 0)
2372 CODE:
2373 RETVAL = maptile::outdoor_darkness;
2374 if (items)
2375 maptile::outdoor_darkness = darkness;
2376 OUTPUT:
2377 RETVAL
2378
2379void
2298maptile::instantiate () 2380maptile::instantiate ()
2299 2381
2300maptile *new () 2382maptile *new ()
2301 PROTOTYPE: 2383 PROTOTYPE:
2302 CODE: 2384 CODE:
… …
2409 } 2491 }
2410 2492
2411int out_of_map (maptile *map, int x, int y) 2493int out_of_map (maptile *map, int x, int y)
2412 2494
2413void 2495void
2414trigger (maptile *map, long connection, bool state = true) 2496find_link (maptile *map, shstr_tmp connection)
2415 CODE:
2416 activate_connection (map, connection, state);
2417
2418void
2419get_connection (maptile *map, long connection)
2420 PPCODE: 2497 PPCODE:
2421 oblinkpt *obp = get_connection_links (map, connection); 2498 if (oblinkpt *obp = map->find_link (connection))
2422 if (obp)
2423 for (objectlink *ol = obp->link; ol; ol = ol->next) 2499 for (objectlink *ol = obp->link; ol; ol = ol->next)
2424 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2500 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2425 2501
2426void 2502void
2427get_map_flags (maptile *map, int x, int y) 2503get_map_flags (maptile *map, int x, int y)
… …
2481 for (object *o = nmap->at (nx, ny).bot; o; o = o->above) 2557 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2482 XPUSHs (sv_2mortal (to_sv (o))); 2558 XPUSHs (sv_2mortal (to_sv (o)));
2483} 2559}
2484 2560
2485SV * 2561SV *
2486bot_at (maptile *obj, unsigned int x, unsigned int y) 2562bot_at (maptile *map, unsigned int x, unsigned int y)
2487 PROTOTYPE: $$$ 2563 PROTOTYPE: $$$
2488 ALIAS: 2564 ALIAS:
2489 top_at = 1 2565 top_at = 1
2490 flags_at = 2 2566 flags_at = 2
2491 light_at = 3 2567 light_at = 3
2492 move_block_at = 4 2568 move_block_at = 4
2493 move_slow_at = 5 2569 move_slow_at = 5
2494 move_on_at = 6 2570 move_on_at = 6
2495 move_off_at = 7 2571 move_off_at = 7
2496 INIT:
2497 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2498 CODE: 2572 CODE:
2573{
2574 sint16 nx = x;
2575 sint16 ny = y;
2576
2577 if (!xy_normalise (map, nx, ny))
2578 XSRETURN_UNDEF;
2579
2580 mapspace &ms = map->at (nx, ny);
2581
2582 ms.update ();
2583
2499 switch (ix) 2584 switch (ix)
2500 { 2585 {
2501 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2586 case 0: RETVAL = to_sv (ms.bot ); break;
2502 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2587 case 1: RETVAL = to_sv (ms.top ); break;
2503 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2588 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2504 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2589 case 3: RETVAL = newSViv (ms.light ); break;
2505 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2590 case 4: RETVAL = newSVuv (ms.move_block); break;
2506 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2591 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2507 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2592 case 6: RETVAL = newSVuv (ms.move_on ); break;
2508 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2593 case 7: RETVAL = newSVuv (ms.move_off ); break;
2509 } 2594 }
2595}
2510 OUTPUT: RETVAL 2596 OUTPUT: RETVAL
2511 2597
2512void fix_walls (maptile *map, int x, int y) 2598void fix_walls (maptile *map, int x, int y)
2513 2599
2514void fix_walls_around (maptile *map, int x, int y) 2600void fix_walls_around (maptile *map, int x, int y)
… …
2647 PROTOTYPE: $ 2733 PROTOTYPE: $
2648 CODE: 2734 CODE:
2649 RETVAL = region::find (name); 2735 RETVAL = region::find (name);
2650 OUTPUT: RETVAL 2736 OUTPUT: RETVAL
2651 2737
2652region *find_fuzzy (utf8_string name)
2653 PROTOTYPE: $
2654 CODE:
2655 RETVAL = region::find_fuzzy (name);
2656 OUTPUT: RETVAL
2657
2658int specificity (region *rgn) 2738int specificity (region *rgn)
2659 CODE: 2739 CODE:
2660 RETVAL = 0; 2740 RETVAL = 0;
2661 while (rgn = rgn->parent) 2741 while (rgn = rgn->parent)
2662 RETVAL++; 2742 RETVAL++;

Diff Legend

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