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.293 by root, Mon Aug 11 23:23:41 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); }
… …
439 446
440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 447inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 448inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
442 449
443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 450inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
451
452inline SV *to_sv (dynbuf * v)
453{
454 SV *sv = newSV (0);
455
456 sv_upgrade (sv, SVt_PV);
457 SvGROW (sv, v->size () + 1);
458 SvPOK_only (sv);
459 v->linearise (SvPVX (sv));
460 SvCUR_set (sv, v->size ());
461 *SvEND (sv) = 0;
462
463 return sv;
464}
465
466inline SV *to_sv (dynbuf_text * v)
467{
468 SV *sv = to_sv (static_cast<dynbuf *> (v));
469 SvUTF8_on (sv);
470 return sv;
471}
444 472
445inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 473inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
446inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 474inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
447inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 475inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
448inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 476inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
… …
579 va_end (ap); 607 va_end (ap);
580 608
581 return sv; 609 return sv;
582} 610}
583 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
584////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 636//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
585 637
586SV * 638SV *
587registry (attachable *ext) 639registry (attachable *ext)
588{ 640{
… …
605 657
606 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 658 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
607 659
608 const char *argv[] = { 660 const char *argv[] = {
609 settings.argv [0], 661 settings.argv [0],
610 "-e" 662 "-e0"
611 "use EV; use Coro;" // required for bootstrap
612 "cf->bootstrap;" // required for datadir :*>
613 "unshift @INC, cf::datadir ();"
614 "require cf;"
615 }; 663 };
616 664
617 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 665 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
618 || perl_run (perl)) 666 || perl_run (perl))
619 { 667 {
620 printf ("unable to initialize perl-interpreter, aborting.\n"); 668 printf ("unable to initialize perl-interpreter, aborting.\n");
621 exit (EXIT_FAILURE); 669 exit (EXIT_FAILURE);
622 } 670 }
623 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))
624 { 683 {
625 dSP; 684 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
626 685 exit (EXIT_FAILURE);
627 PUSHMARK (SP);
628 PUTBACK;
629 call_pv ("cf::init", G_DISCARD | G_VOID);
630 } 686 }
631} 687}
632 688
689void
633void cfperl_main () 690cfperl_main ()
634{ 691{
635 dSP; 692 dSP;
636 693
637 PUSHMARK (SP); 694 PUSHMARK (SP);
638 PUTBACK; 695 PUTBACK;
… …
663# undef def 720# undef def
664}; 721};
665 722
666#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)
667 724
668static void 725static void noinline
669gather_callbacks (AV *&callbacks, AV *registry, event_type event) 726gather_callbacks (AV *&callbacks, AV *registry, event_type event)
670{ 727{
671 // event must be in array 728 // event must be in array
672 if (event >= 0 && event <= AvFILLp (registry)) 729 if (event >= 0 && event <= AvFILLp (registry))
673 { 730 {
… …
759{ 816{
760 attachable::gather_callbacks (callbacks, event); 817 attachable::gather_callbacks (callbacks, event);
761 ::gather_callbacks (callbacks, cb_map, event); 818 ::gather_callbacks (callbacks, cb_map, event);
762} 819}
763 820
764void 821static void noinline
765_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry) 822_recalc_want (bitset<NUM_EVENT_TYPES> &set, AV *registry)
766{ 823{
767 for (int event = 0; event <= AvFILLp (registry); ++event) 824 for (int event = 0; event <= AvFILLp (registry); ++event)
768 { 825 {
769 SV *cbs_ = AvARRAY (registry)[event]; 826 SV *cbs_ = AvARRAY (registry)[event];
… …
779 } 836 }
780 } 837 }
781} 838}
782 839
783// very slow and inefficient way to recalculate the global want bitsets 840// very slow and inefficient way to recalculate the global want bitsets
784void 841static void
785_recalc_want () 842_recalc_want ()
786{ 843{
787 ev_want_event.reset (); 844 ev_want_event.reset ();
788 845
789 _recalc_want (ev_want_event, cb_global); 846 _recalc_want (ev_want_event, cb_global);
… …
899} 956}
900 957
901///////////////////////////////////////////////////////////////////////////// 958/////////////////////////////////////////////////////////////////////////////
902// various c++ => perl glue functions 959// various c++ => perl glue functions
903 960
961void
904void cfperl_tick () 962cfperl_tick ()
905{ 963{
906 tick_pending = 1; 964 tick_pending = 1;
907 965
908 if (tick_inhibit) 966 if (tick_inhibit)
909 return; 967 return;
… …
941{ 999{
942 CALL_BEGIN (2); 1000 CALL_BEGIN (2);
943 CALL_ARG (book); 1001 CALL_ARG (book);
944 CALL_ARG (level); 1002 CALL_ARG (level);
945 CALL_CALL ("ext::books::make_book", G_VOID); 1003 CALL_CALL ("ext::books::make_book", G_VOID);
946 CALL_END;
947}
948
949void
950cfperl_expand_cfpod (player *pl, std::string &msg)
951{
952 CALL_BEGIN (2);
953 CALL_ARG (pl);
954 CALL_ARG_SV (newSVpvn_utf8 (msg.data (), msg.size ()));
955 CALL_CALL ("cf::player::expand_cfpod", G_SCALAR);
956
957 if (count)
958 {
959 STRLEN len;
960 char *data = SvPVutf8 (TOPs, len);
961 msg.assign (data, len);
962 }
963
964 CALL_END; 1004 CALL_END;
965} 1005}
966 1006
967void 1007void
968cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 1008cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
… …
989 CALL_END; 1029 CALL_END;
990 1030
991 return can; 1031 return can;
992} 1032}
993 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
994player * 1045player *
995player::find (const char *name) 1046player::find (const char *name)
996{ 1047{
997 CALL_BEGIN (1); 1048 CALL_BEGIN (1);
998 CALL_ARG (name); 1049 CALL_ARG (name);
… …
1060maptile::do_load_sync () 1111maptile::do_load_sync ()
1061{ 1112{
1062 CALL_BEGIN (1); 1113 CALL_BEGIN (1);
1063 CALL_ARG (this); 1114 CALL_ARG (this);
1064 CALL_CALL ("cf::map::do_load_sync", G_SCALAR); 1115 CALL_CALL ("cf::map::do_load_sync", G_SCALAR);
1065 CALL_END;
1066}
1067
1068void
1069maptile::change_all_map_light (int change)
1070{
1071 CALL_BEGIN (1);
1072 CALL_ARG (change);
1073 CALL_CALL ("cf::map::change_all_map_light", G_VOID);
1074 CALL_END; 1116 CALL_END;
1075} 1117}
1076 1118
1077void 1119void
1078object::enter_exit (object *exit) 1120object::enter_exit (object *exit)
… …
1150///////////////////////////////////////////////////////////////////////////// 1192/////////////////////////////////////////////////////////////////////////////
1151 1193
1152struct EVAPI *evapi::GEVAPI; 1194struct EVAPI *evapi::GEVAPI;
1153struct CoroAPI *coroapi::GCoroAPI; 1195struct CoroAPI *coroapi::GCoroAPI;
1154 1196
1197void
1155void coroapi::do_cede_to_tick () 1198coroapi::do_cede_to_tick ()
1156{ 1199{
1157 cede_pending = 0; 1200 cede_pending = 0;
1158 cede (); 1201 cede ();
1159} 1202}
1160 1203
… …
1184 ev_io_set ((ev_io *)this, fd, events); 1227 ev_io_set ((ev_io *)this, fd, events);
1185 if (active) start (); 1228 if (active) start ();
1186 } 1229 }
1187} 1230}
1188 1231
1189void 1232static void
1190_connect_to_perl () 1233_connect_to_perl ()
1191{ 1234{
1192 stash_cf = gv_stashpv ("cf", 1); 1235 stash_cf = gv_stashpv ("cf", 1);
1193 1236
1194 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1237 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
… …
1284 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)
1285 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)
1286 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)
1287 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)
1288 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)
1289 1333
1290 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES) 1334 const_iv (NUM_TYPES) const_iv (NUM_SUBTYPES)
1291 1335
1292 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE) 1336 const_iv (ST_BD_BUILD) const_iv (ST_BD_REMOVE)
1293 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)
… …
1323 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1367 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1324 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1368 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1325 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)
1326 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)
1327 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)
1328 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1372 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1329 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)
1330 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)
1331 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)
1332 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)
1333 1377
1334 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)
1335 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)
1336 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)
1337 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)
1338 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)
1339 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1383 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1340 1384
1341 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)
1342 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)
1343 1387
1344 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)
… …
1504 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1548 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1505 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1549 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1506 } 1550 }
1507} 1551}
1508 1552
1553void _gv_clear (SV *gv)
1554 CODE:
1555 assert (SvTYPE (gv) == SVt_PVGV);
1556# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1557 f (GvGP (gv)->gp_form);
1558 f (GvGP (gv)->gp_io);
1559 f (GvGP (gv)->gp_sv);
1560 f (GvGP (gv)->gp_av);
1561 f (GvGP (gv)->gp_hv);
1562 f (GvGP (gv)->gp_cv);
1563 GvCVGEN (gv) = 0;
1564 GvMULTI_off (gv);
1565# undef f
1566
1509void _connect_to_perl () 1567void _connect_to_perl ()
1510 1568
1511void _recalc_want () 1569void _recalc_want ()
1512 1570
1571# not used by default anymore
1513void _global_reattach () 1572void _global_reattach ()
1514 CODE: 1573 CODE:
1515{ 1574{
1516 // reattach to all attachable objects in the game. 1575 // reattach to all attachable objects in the game.
1517 for_all_clients (ns) 1576 for_all_clients (ns)
… …
1560 len -= 3; 1619 len -= 3;
1561 } 1620 }
1562 1621
1563 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1622 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1564} 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 ()
1565 1650
1566void evthread_start (int aiofd) 1651void evthread_start (int aiofd)
1567 1652
1568void cede_to_tick () 1653void cede_to_tick ()
1569 CODE: 1654 CODE:
… …
1707#if _POSIX_MEMLOCK 1792#if _POSIX_MEMLOCK
1708 1793
1709int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1794int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1710 INIT: 1795 INIT:
1711#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
1712 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1800 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1713#endif 1801#endif
1714 1802
1715int munlockall () 1803int munlockall ()
1716 1804
… …
1735 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)));
1736 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)));
1737 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)));
1738 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)));
1739#endif 1827#endif
1740 EXTEND (SP, 2*2); 1828 EXTEND (SP, 5*2);
1741 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)));
1742 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)));
1743 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)));
1744} 1834}
1745 1835
1746int find_animation (utf8_string text) 1836int find_animation (utf8_string text)
1747 PROTOTYPE: $ 1837 PROTOTYPE: $
1748 1838
… …
2057 2147
2058void push_button (object *op); 2148void push_button (object *op);
2059 2149
2060void use_trigger (object *op); 2150void use_trigger (object *op);
2061 2151
2062void add_button_link (object *button, maptile *map, int connected);
2063
2064void remove_button_link (object *op);
2065
2066void handle_apply_yield (object *op); 2152void handle_apply_yield (object *op);
2067 2153
2068 2154
2069MODULE = cf PACKAGE = cf::object PREFIX = cf_ 2155MODULE = cf PACKAGE = cf::object PREFIX = cf_
2070 2156
… …
2188 pl->ob->stats.hp = pl->ob->stats.maxhp; 2274 pl->ob->stats.hp = pl->ob->stats.maxhp;
2189 pl->ob->stats.sp = pl->ob->stats.maxsp; 2275 pl->ob->stats.sp = pl->ob->stats.maxsp;
2190 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2276 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2191 pl->orig_stats = pl->ob->stats; 2277 pl->orig_stats = pl->ob->stats;
2192 2278
2193void clear_los (player *pl) 2279# should only be temporary
2280void esrv_new_player (player *pl)
2194 2281
2282#d# TODO: replace by blocked_los accessor, fix code using this
2195bool 2283bool
2196cell_visible (player *pl, int dx, int dy) 2284cell_visible (player *pl, int dx, int dy)
2197 CODE: 2285 CODE:
2198 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2286 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2199 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2200 OUTPUT: 2287 OUTPUT:
2201 RETVAL 2288 RETVAL
2202 2289
2203void 2290void
2204send (player *pl, SV *packet) 2291send (player *pl, SV *packet)
… …
2210 if (len > MAXSOCKBUF) 2297 if (len > MAXSOCKBUF)
2211 pl->failmsg ("[packet too long for client]"); 2298 pl->failmsg ("[packet too long for client]");
2212 else if (pl->ns) 2299 else if (pl->ns)
2213 pl->ns->send_packet (buf, len); 2300 pl->ns->send_packet (buf, len);
2214} 2301}
2215
2216int
2217listening (player *pl, int new_value = -1)
2218 CODE:
2219 RETVAL = pl->listening;
2220 if (new_value >= 0)
2221 pl->listening = new_value;
2222 OUTPUT:
2223 RETVAL
2224 2302
2225void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2303void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2226 PROTOTYPE: $;$$$ 2304 PROTOTYPE: $;$$$
2227 PPCODE: 2305 PPCODE:
2228 if (GIMME_V != G_VOID) 2306 if (GIMME_V != G_VOID)
… …
2281} 2359}
2282 2360
2283INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h | 2361INCLUDE: $PERL $srcdir/genacc maptile ../include/map.h |
2284 2362
2285void 2363void
2364adjust_daylight ()
2365 CODE:
2366 maptile::adjust_daylight ();
2367
2368void
2286maptile::instantiate () 2369maptile::instantiate ()
2287 2370
2288maptile *new () 2371maptile *new ()
2289 PROTOTYPE: 2372 PROTOTYPE:
2290 CODE: 2373 CODE:
… …
2383} 2466}
2384 2467
2385void 2468void
2386maptile::create_region_treasure () 2469maptile::create_region_treasure ()
2387 CODE: 2470 CODE:
2388{
2389 object *op = object::create ();
2390 op->type = FLOOR;
2391 op->map = THIS;
2392
2393 for (int x = 0; x < THIS->width; ++x) 2471 for (int x = 0; x < THIS->width; ++x)
2394 for (int y = 0; y < THIS->height; ++y) 2472 for (int y = 0; y < THIS->height; ++y)
2395 { 2473 {
2396 region *rgn = THIS->region (x, y); 2474 region *rgn = THIS->region (x, y);
2397 2475
2398 //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)
2399 if (rgn->treasure && rndm () < rgn->treasure_density) 2478 if (rgn->treasure && rndm () < rgn->treasure_density)
2400 {
2401 op->x = x;
2402 op->y = y;
2403 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2479 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2404 }
2405 } 2480 }
2406 2481
2407 op->destroy ();
2408}
2409
2410int out_of_map (maptile *map, int x, int y) 2482int out_of_map (maptile *map, int x, int y)
2411 2483
2412void 2484void
2413trigger (maptile *map, long connection, bool state = true) 2485find_link (maptile *map, shstr_tmp connection)
2414 CODE:
2415 activate_connection (map, connection, state);
2416
2417void
2418get_connection (maptile *map, long connection)
2419 PPCODE: 2486 PPCODE:
2420 oblinkpt *obp = get_connection_links (map, connection); 2487 if (oblinkpt *obp = map->find_link (connection))
2421 if (obp)
2422 for (objectlink *ol = obp->link; ol; ol = ol->next) 2488 for (objectlink *ol = obp->link; ol; ol = ol->next)
2423 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob))); 2489 XPUSHs (sv_2mortal (to_sv ((object *)ol->ob)));
2424 2490
2425void 2491void
2426get_map_flags (maptile *map, int x, int y) 2492get_map_flags (maptile *map, int x, int y)
… …
2480 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)
2481 XPUSHs (sv_2mortal (to_sv (o))); 2547 XPUSHs (sv_2mortal (to_sv (o)));
2482} 2548}
2483 2549
2484SV * 2550SV *
2485bot_at (maptile *obj, unsigned int x, unsigned int y) 2551bot_at (maptile *map, unsigned int x, unsigned int y)
2486 PROTOTYPE: $$$ 2552 PROTOTYPE: $$$
2487 ALIAS: 2553 ALIAS:
2488 top_at = 1 2554 top_at = 1
2489 flags_at = 2 2555 flags_at = 2
2490 light_at = 3 2556 light_at = 3
2491 move_block_at = 4 2557 move_block_at = 4
2492 move_slow_at = 5 2558 move_slow_at = 5
2493 move_on_at = 6 2559 move_on_at = 6
2494 move_off_at = 7 2560 move_off_at = 7
2495 INIT:
2496 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2497 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
2498 switch (ix) 2573 switch (ix)
2499 { 2574 {
2500 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2575 case 0: RETVAL = to_sv (ms.bot ); break;
2501 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2576 case 1: RETVAL = to_sv (ms.top ); break;
2502 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2577 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2503 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2578 case 3: RETVAL = newSViv (ms.light ); break;
2504 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2579 case 4: RETVAL = newSVuv (ms.move_block); break;
2505 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2580 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2506 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2581 case 6: RETVAL = newSVuv (ms.move_on ); break;
2507 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2582 case 7: RETVAL = newSVuv (ms.move_off ); break;
2508 } 2583 }
2584}
2509 OUTPUT: RETVAL 2585 OUTPUT: RETVAL
2510 2586
2511void fix_walls (maptile *map, int x, int y) 2587void fix_walls (maptile *map, int x, int y)
2512 2588
2513void fix_walls_around (maptile *map, int x, int y) 2589void fix_walls_around (maptile *map, int x, int y)
… …
2646 PROTOTYPE: $ 2722 PROTOTYPE: $
2647 CODE: 2723 CODE:
2648 RETVAL = region::find (name); 2724 RETVAL = region::find (name);
2649 OUTPUT: RETVAL 2725 OUTPUT: RETVAL
2650 2726
2651region *find_fuzzy (utf8_string name)
2652 PROTOTYPE: $
2653 CODE:
2654 RETVAL = region::find_fuzzy (name);
2655 OUTPUT: RETVAL
2656
2657int specificity (region *rgn) 2727int specificity (region *rgn)
2658 CODE: 2728 CODE:
2659 RETVAL = 0; 2729 RETVAL = 0;
2660 while (rgn = rgn->parent) 2730 while (rgn = rgn->parent)
2661 RETVAL++; 2731 RETVAL++;

Diff Legend

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