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.292 by root, Tue Jul 29 02:00:55 2008 UTC vs.
Revision 1.304 by root, Wed Oct 1 05:50:19 2008 UTC

… …
81 *stash_cf, 81 *stash_cf,
82 *stash_cf_object_wrap, 82 *stash_cf_object_wrap,
83 *stash_cf_object_player_wrap, 83 *stash_cf_object_player_wrap,
84 *stash_cf_player_wrap, 84 *stash_cf_player_wrap,
85 *stash_cf_map_wrap, 85 *stash_cf_map_wrap,
86 *stash_cf_mapspace_wrap,
86 *stash_cf_client_wrap, 87 *stash_cf_client_wrap,
87 *stash_cf_arch_wrap, 88 *stash_cf_arch_wrap,
88 *stash_cf_party_wrap, 89 *stash_cf_party_wrap,
89 *stash_cf_region_wrap, 90 *stash_cf_region_wrap,
90 *stash_cf_living_wrap; 91 *stash_cf_living_wrap;
… …
429inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 430inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
430inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 431inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
431inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 432inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
432inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 433inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
433inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 434inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
435inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
434 436
435inline SV *to_sv (object & v) { return to_sv (&v); } 437inline SV *to_sv (object & v) { return to_sv (&v); }
436inline SV *to_sv (living & v) { return to_sv (&v); } 438inline SV *to_sv (living & v) { return to_sv (&v); }
437 439
438inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 440inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
439inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); } 441inline SV *to_sv (const treasurelist *v) { return to_sv (v->name); }
440 442
441inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); } 443inline SV *to_sv (UUID v) { return newSVpv (v.c_str (), 0); }
444
445inline SV *to_sv (dynbuf * v)
446{
447 SV *sv = newSV (0);
448
449 sv_upgrade (sv, SVt_PV);
450 SvGROW (sv, v->size () + 1);
451 SvPOK_only (sv);
452 v->linearise (SvPVX (sv));
453 SvCUR_set (sv, v->size ());
454 *SvEND (sv) = 0;
455
456 return sv;
457}
458
459inline SV *to_sv (dynbuf_text * v)
460{
461 SV *sv = to_sv (static_cast<dynbuf *> (v));
462 SvUTF8_on (sv);
463 return sv;
464}
442 465
443inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; } 466inline void sv_to (SV *sv, shstr &v) { v = SvOK (sv) ? SvPVutf8_nolen (sv) : 0; }
444inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; } 467inline void sv_to (SV *sv, char * &v) { free (v); v = SvOK (sv) ? strdup (SvPV_nolen (sv)) : 0; }
445inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); } 468inline void sv_to (SV *sv, bool &v) { v = SvIV (sv); }
446inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); } 469inline void sv_to (SV *sv, signed char &v) { v = SvIV (sv); }
… …
462inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 485inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
463inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 486inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); }
464inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 487inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
465inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 488inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
466inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 489inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
490inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); }
467inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 491inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); }
468inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 492inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }
469 493
470//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 494//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
471inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 495inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
… …
602 626
603 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 627 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
604 628
605 const char *argv[] = { 629 const char *argv[] = {
606 settings.argv [0], 630 settings.argv [0],
607 "-e" 631 "-e0"
608 "use EV; use Coro;" // required for bootstrap
609 "cf->bootstrap;" // required for datadir :*>
610 "unshift @INC, cf::datadir ();"
611 "require cf;"
612 }; 632 };
613 633
614 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 634 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
615 || perl_run (perl)) 635 || perl_run (perl))
616 { 636 {
617 printf ("unable to initialize perl-interpreter, aborting.\n"); 637 printf ("unable to initialize perl-interpreter, aborting.\n");
618 exit (EXIT_FAILURE); 638 exit (EXIT_FAILURE);
619 } 639 }
620 640
641 eval_pv (
642 "#line 1 'cfperl init'\n"
643 "use EV ();\n"
644 "use Coro ();\n"
645 "cf->bootstrap;\n"
646 "unshift @INC, cf::datadir ();\n"
647 "require cf;\n",
648 0
649 );
650
651 if (SvTRUE (ERRSV))
621 { 652 {
622 dSP; 653 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
623 654 exit (EXIT_FAILURE);
624 PUSHMARK (SP);
625 PUTBACK;
626 call_pv ("cf::init", G_DISCARD | G_VOID);
627 } 655 }
628} 656}
629 657
630void cfperl_main () 658void cfperl_main ()
631{ 659{
632 dSP; 660 dSP;
… …
942 CALL_CALL ("ext::books::make_book", G_VOID); 970 CALL_CALL ("ext::books::make_book", G_VOID);
943 CALL_END; 971 CALL_END;
944} 972}
945 973
946void 974void
947cfperl_expand_cfpod (player *pl, std::string &msg)
948{
949 CALL_BEGIN (2);
950 CALL_ARG (pl);
951 CALL_ARG_SV (newSVpvn_utf8 (msg.data (), msg.size ()));
952 CALL_CALL ("cf::player::expand_cfpod", G_SCALAR);
953
954 if (count)
955 {
956 STRLEN len;
957 char *data = SvPVutf8 (TOPs, len);
958 msg.assign (data, len);
959 }
960
961 CALL_END;
962}
963
964void
965cfperl_send_msg (client *ns, int color, const char *type, const char *msg) 975cfperl_send_msg (client *ns, int color, const char *type, const char *msg)
966{ 976{
967 CALL_BEGIN (4); 977 CALL_BEGIN (4);
968 CALL_ARG (ns); 978 CALL_ARG (ns);
969 CALL_ARG (type); 979 CALL_ARG (type);
… …
1190 1200
1191 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1201 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1192 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1202 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1193 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1203 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1194 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1204 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1205 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1195 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1206 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1196 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1207 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1197 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1208 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1198 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1209 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1199 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1210 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
… …
1319 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1330 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1320 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1331 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1321 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1332 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1322 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1333 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1323 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1334 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1324 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1335 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1325 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1336 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1326 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1337 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1327 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1338 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1328 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1339 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1329 1340
1330 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1341 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1331 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1342 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1332 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1343 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1333 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1344 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1334 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1345 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1335 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1346 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1336 1347
1337 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1348 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1338 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1349 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1339 1350
1340 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1351 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
… …
1392 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1403 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1393 const_iv (F_LOCKED) 1404 const_iv (F_LOCKED)
1394 1405
1395 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1406 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1396 1407
1397 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1408 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1398 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1409 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1399 1410
1400 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1411 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1401 1412
1402 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1413 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
… …
1500 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1511 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1501 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1512 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1502 } 1513 }
1503} 1514}
1504 1515
1516void _gv_clear (SV *gv)
1517 CODE:
1518 assert (SvTYPE (gv) == SVt_PVGV);
1519# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1520 f (GvGP (gv)->gp_form);
1521 f (GvGP (gv)->gp_io);
1522 f (GvGP (gv)->gp_sv);
1523 f (GvGP (gv)->gp_av);
1524 f (GvGP (gv)->gp_hv);
1525 f (GvGP (gv)->gp_cv);
1526 GvCVGEN (gv) = 0;
1527 GvMULTI_off (gv);
1528# undef f
1529
1505void _connect_to_perl () 1530void _connect_to_perl ()
1506 1531
1507void _recalc_want () 1532void _recalc_want ()
1508 1533
1534# not used by default anymore
1509void _global_reattach () 1535void _global_reattach ()
1510 CODE: 1536 CODE:
1511{ 1537{
1512 // reattach to all attachable objects in the game. 1538 // reattach to all attachable objects in the game.
1513 for_all_clients (ns) 1539 for_all_clients (ns)
… …
1556 len -= 3; 1582 len -= 3;
1557 } 1583 }
1558 1584
1559 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1585 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1560} 1586}
1587
1588void init_anim ()
1589
1590void init_globals ()
1591
1592void init_experience ()
1593
1594void init_attackmess ()
1595
1596void init_dynamic ()
1597
1598void init_block ()
1599
1600void load_settings ()
1601
1602void load_materials ()
1603
1604void init_uuid ()
1605 CODE:
1606 UUID::init ();
1607
1608void init_signals ()
1609
1610void init_commands ()
1611
1612void init_skills ()
1613
1614void init_beforeplay ()
1561 1615
1562void evthread_start (int aiofd) 1616void evthread_start (int aiofd)
1563 1617
1564void cede_to_tick () 1618void cede_to_tick ()
1565 CODE: 1619 CODE:
… …
1703#if _POSIX_MEMLOCK 1757#if _POSIX_MEMLOCK
1704 1758
1705int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1759int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1706 INIT: 1760 INIT:
1707#if __GLIBC__ 1761#if __GLIBC__
1762 mallopt (M_TOP_PAD, 1024 * 1024);
1763 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1764 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1708 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1765 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1709#endif 1766#endif
1710 1767
1711int munlockall () 1768int munlockall ()
1712 1769
… …
2207 pl->failmsg ("[packet too long for client]"); 2264 pl->failmsg ("[packet too long for client]");
2208 else if (pl->ns) 2265 else if (pl->ns)
2209 pl->ns->send_packet (buf, len); 2266 pl->ns->send_packet (buf, len);
2210} 2267}
2211 2268
2212int
2213listening (player *pl, int new_value = -1)
2214 CODE:
2215 RETVAL = pl->listening;
2216 if (new_value >= 0)
2217 pl->listening = new_value;
2218 OUTPUT:
2219 RETVAL
2220
2221void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2269void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2222 PROTOTYPE: $;$$$ 2270 PROTOTYPE: $;$$$
2223 PPCODE: 2271 PPCODE:
2224 if (GIMME_V != G_VOID) 2272 if (GIMME_V != G_VOID)
2225 { 2273 {
… …
2379} 2427}
2380 2428
2381void 2429void
2382maptile::create_region_treasure () 2430maptile::create_region_treasure ()
2383 CODE: 2431 CODE:
2384{
2385 object *op = object::create ();
2386 op->type = FLOOR;
2387 op->map = THIS;
2388
2389 for (int x = 0; x < THIS->width; ++x) 2432 for (int x = 0; x < THIS->width; ++x)
2390 for (int y = 0; y < THIS->height; ++y) 2433 for (int y = 0; y < THIS->height; ++y)
2391 { 2434 {
2392 region *rgn = THIS->region (x, y); 2435 region *rgn = THIS->region (x, y);
2393 2436
2394 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2437 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2438 if (object *op = THIS->at (x, y).top)
2395 if (rgn->treasure && rndm () < rgn->treasure_density) 2439 if (rgn->treasure && rndm () < rgn->treasure_density)
2396 {
2397 op->x = x;
2398 op->y = y;
2399 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2440 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2400 }
2401 } 2441 }
2402
2403 op->destroy ();
2404}
2405 2442
2406int out_of_map (maptile *map, int x, int y) 2443int out_of_map (maptile *map, int x, int y)
2407 2444
2408void 2445void
2409trigger (maptile *map, long connection, bool state = true) 2446trigger (maptile *map, long connection, bool state = true)
… …
2437 PUSHs (sv_2mortal (to_sv (nmap))); 2474 PUSHs (sv_2mortal (to_sv (nmap)));
2438 PUSHs (sv_2mortal (newSViv (nx))); 2475 PUSHs (sv_2mortal (newSViv (nx)));
2439 PUSHs (sv_2mortal (newSViv (ny))); 2476 PUSHs (sv_2mortal (newSViv (ny)));
2440 } 2477 }
2441} 2478}
2479
2480mapspace *
2481ms (maptile *map, unsigned int x, unsigned int y)
2482 PROTOTYPE: $$$
2483 CODE:
2484{
2485 maptile *nmap = 0;
2486 I16 nx, ny;
2487
2488 PUTBACK;
2489 get_map_flags (map, &nmap, x, y, &nx, &ny);
2490 SPAGAIN;
2491
2492 if (!nmap)
2493 XSRETURN_UNDEF;
2494
2495 RETVAL = &nmap->at (nx, ny);
2496}
2497 OUTPUT:
2498 RETVAL
2442 2499
2443void 2500void
2444at (maptile *map, unsigned int x, unsigned int y) 2501at (maptile *map, unsigned int x, unsigned int y)
2445 PROTOTYPE: $$$ 2502 PROTOTYPE: $$$
2446 PPCODE: 2503 PPCODE:
… …
2574 RETVAL = self->generate_random_map (&rmp); 2631 RETVAL = self->generate_random_map (&rmp);
2575} 2632}
2576 OUTPUT: 2633 OUTPUT:
2577 RETVAL 2634 RETVAL
2578 2635
2636MODULE = cf PACKAGE = cf::mapspace
2637
2638INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2639
2579MODULE = cf PACKAGE = cf::arch 2640MODULE = cf PACKAGE = cf::arch
2580 2641
2581int archetypes_size () 2642int archetypes_size ()
2582 CODE: 2643 CODE:
2583 RETVAL = archetypes.size (); 2644 RETVAL = archetypes.size ();

Diff Legend

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