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.280 by root, Mon Apr 21 06:35:26 2008 UTC vs.
Revision 1.311 by root, Sat Dec 20 02:32:31 2008 UTC

21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include "autoconf.h" 24#include "autoconf.h"
25 25
26#define PLUGIN_NAME "perl"
27#define PLUGIN_VERSION "cfperl 0.5"
28
29#if HAVE_EXECINFO_H 26#if HAVE_EXECINFO_H
30# include <execinfo.h> 27# include <execinfo.h>
31#endif 28#endif
32 29
33#include <cstdarg> 30#include <cstdarg>
31#include <typeinfo>
34 32
35#include "global.h" 33#include "global.h"
36#include "loader.h" 34#include "loader.h"
37#include "../random_maps/random_map.h" 35#include "../random_maps/random_map.h"
38#include "evthread.h" 36#include "evthread.h"
83 *stash_cf, 81 *stash_cf,
84 *stash_cf_object_wrap, 82 *stash_cf_object_wrap,
85 *stash_cf_object_player_wrap, 83 *stash_cf_object_player_wrap,
86 *stash_cf_player_wrap, 84 *stash_cf_player_wrap,
87 *stash_cf_map_wrap, 85 *stash_cf_map_wrap,
86 *stash_cf_mapspace_wrap,
88 *stash_cf_client_wrap, 87 *stash_cf_client_wrap,
89 *stash_cf_arch_wrap, 88 *stash_cf_arch_wrap,
90 *stash_cf_party_wrap, 89 *stash_cf_party_wrap,
91 *stash_cf_region_wrap, 90 *stash_cf_region_wrap,
92 *stash_cf_living_wrap; 91 *stash_cf_living_wrap;
93 92
93#ifndef newSVpv_utf8
94static inline SV * 94static inline SV *
95newSVpv_utf8 (const char *s) 95newSVpv_utf8 (const char *s)
96{ 96{
97 if (!s) 97 if (!s)
98 return newSV (0); 98 return newSV (0);
99 99
100 SV *sv = newSVpv (s, 0); 100 SV *sv = newSVpv (s, 0);
101 SvUTF8_on (sv); 101 SvUTF8_on (sv);
102 return sv; 102 return sv;
103} 103}
104#endif
104 105
106#ifndef newSVpvn_utf8
105static inline SV * 107static inline SV *
106newSVpvn_utf8 (const char *s, STRLEN l) 108newSVpvn_utf8 (const char *s, STRLEN l, int utf8)
107{ 109{
108 if (!s) 110 if (!s)
109 return newSV (0); 111 return newSV (0);
110 112
111 SV *sv = newSVpvn (s, l); 113 SV *sv = newSVpvn (s, l);
114
115 if (utf8)
112 SvUTF8_on (sv); 116 SvUTF8_on (sv);
117
113 return sv; 118 return sv;
114} 119}
120#endif
115 121
116// helper cast function, returns super class * or 0 122// helper cast function, returns super class * or 0
117template<class super> 123template<class super>
118static super * 124static super *
119is_a (attachable *at) 125is_a (attachable *at)
408 return SvPTR (sv, klass); 414 return SvPTR (sv, klass);
409 else 415 else
410 return 0; 416 return 0;
411} 417}
412 418
413inline 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); }
414inline 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); }
415inline SV *to_sv (bool v) { return newSViv (v); } 421inline SV *to_sv (bool v) { return newSViv (v); }
416inline SV *to_sv ( signed char v) { return newSViv (v); } 422inline SV *to_sv ( signed char v) { return newSViv (v); }
417inline SV *to_sv (unsigned char v) { return newSViv (v); } 423inline SV *to_sv (unsigned char v) { return newSViv (v); }
418inline SV *to_sv ( signed short v) { return newSViv (v); } 424inline SV *to_sv ( signed short v) { return newSViv (v); }
431inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 437inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
432inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 438inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
433inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 439inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
434inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 440inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
435inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 441inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
442inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
436 443
437inline SV *to_sv (object & v) { return to_sv (&v); } 444inline SV *to_sv (object & v) { return to_sv (&v); }
438inline SV *to_sv (living & v) { return to_sv (&v); } 445inline SV *to_sv (living & v) { return to_sv (&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); }
464inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); } 492inline void sv_to (SV *sv, maptile * &v) { v = (maptile *)(attachable *)SvPTR_ornull (sv, "cf::map"); }
465inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); } 493inline void sv_to (SV *sv, region * &v) { v = (region *)(attachable *)SvPTR_ornull (sv, "cf::region"); }
466inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 494inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
467inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); } 495inline void sv_to (SV *sv, partylist * &v) { v = (partylist *)SvPTR_ornull (sv, "cf::party"); }
468inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); } 496inline void sv_to (SV *sv, living * &v) { v = (living *)SvPTR_ornull (sv, "cf::living"); }
497inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *)SvPTR_ornull (sv, "cf::mapspace"); }
469inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); } 498inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *)SvPTR_ornull (sv, "cf::object::freezer"); }
470inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); } 499inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *)SvPTR_ornull (sv, "cf::object::thawer" ); }
471 500
472//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 501//inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
473inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 502inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
604 633
605 PL_exit_flags |= PERL_EXIT_DESTRUCT_END; 634 PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
606 635
607 const char *argv[] = { 636 const char *argv[] = {
608 settings.argv [0], 637 settings.argv [0],
609 "-e" 638 "-e0"
610 "use EV; use Coro;" // required for bootstrap
611 "cf->bootstrap;" // required for datadir :*>
612 "unshift @INC, cf::datadir ();"
613 "require cf;"
614 }; 639 };
615 640
616 if (perl_parse (perl, xs_init, 2, (char **)argv, environ) 641 if (perl_parse (perl, xs_init, 2, (char **)argv, environ)
617 || perl_run (perl)) 642 || perl_run (perl))
618 { 643 {
619 printf ("unable to initialize perl-interpreter, aborting.\n"); 644 printf ("unable to initialize perl-interpreter, aborting.\n");
620 exit (EXIT_FAILURE); 645 exit (EXIT_FAILURE);
621 } 646 }
622 647
648 eval_pv (
649 "#line 1 'cfperl init'\n"
650 "use EV ();\n"
651 "use Coro ();\n"
652 "cf->bootstrap;\n"
653 "unshift @INC, cf::datadir ();\n"
654 "require cf;\n",
655 0
656 );
657
658 if (SvTRUE (ERRSV))
623 { 659 {
624 dSP; 660 printf ("unable to bootstrap perl, aborting:\n%s", SvPV_nolen (ERRSV));
625 661 exit (EXIT_FAILURE);
626 PUSHMARK (SP);
627 PUTBACK;
628 call_pv ("cf::init", G_DISCARD | G_VOID);
629 } 662 }
630} 663}
631 664
632void cfperl_main () 665void cfperl_main ()
633{ 666{
634 dSP; 667 dSP;
977{ 1010{
978 CALL_BEGIN (1); 1011 CALL_BEGIN (1);
979 CALL_ARG (name); 1012 CALL_ARG (name);
980 CALL_CALL ("cf::player::find", G_SCALAR); 1013 CALL_CALL ("cf::player::find", G_SCALAR);
981 1014
982 player *retval; 1015 player *retval = 0;
983
984 if (count)
985 sv_to (POPs, retval); 1016 if (count) sv_to (POPs, retval);
986 else 1017
987 retval = 0; 1018 CALL_END;
1019
1020 return retval;
1021}
1022
1023maptile *
1024find_style (const char *dirname, const char *stylename, int difficulty)
1025{
1026 CALL_BEGIN (3);
1027 CALL_ARG (dirname);
1028 CALL_ARG (stylename);
1029 CALL_ARG (difficulty);
1030 CALL_CALL ("ext::map_random::find_style", G_SCALAR);
1031
1032 maptile *retval = 0;
1033 if (count) sv_to (POPs, retval);
988 1034
989 CALL_END; 1035 CALL_END;
990 1036
991 return retval; 1037 return retval;
992} 1038}
997 CALL_BEGIN (2); 1043 CALL_BEGIN (2);
998 CALL_ARG (path); 1044 CALL_ARG (path);
999 CALL_ARG (origin); 1045 CALL_ARG (origin);
1000 CALL_CALL ("cf::map::find_sync", G_SCALAR); 1046 CALL_CALL ("cf::map::find_sync", G_SCALAR);
1001 1047
1002 maptile *retval; 1048 maptile *retval = 0;
1003
1004 if (count)
1005 sv_to (POPs, retval); 1049 if (count) sv_to (POPs, retval);
1006 else
1007 retval = 0;
1008 1050
1009 CALL_END; 1051 CALL_END;
1010 1052
1011 return retval; 1053 return retval;
1012} 1054}
1018 CALL_ARG (path); 1060 CALL_ARG (path);
1019 CALL_ARG (origin); 1061 CALL_ARG (origin);
1020 CALL_ARG (load); 1062 CALL_ARG (load);
1021 CALL_CALL ("cf::map::find_async", G_SCALAR); 1063 CALL_CALL ("cf::map::find_async", G_SCALAR);
1022 1064
1023 maptile *retval; 1065 maptile *retval = 0;
1024
1025 if (count)
1026 sv_to (POPs, retval); 1066 if (count) sv_to (POPs, retval);
1027 else
1028 retval = 0;
1029 1067
1030 CALL_END; 1068 CALL_END;
1031 1069
1032 return retval; 1070 return retval;
1033} 1071}
1058 1096
1059 CALL_BEGIN (2); 1097 CALL_BEGIN (2);
1060 CALL_ARG (this); 1098 CALL_ARG (this);
1061 CALL_ARG (exit); 1099 CALL_ARG (exit);
1062 CALL_CALL ("cf::object::player::enter_exit", G_VOID); 1100 CALL_CALL ("cf::object::player::enter_exit", G_VOID);
1101 CALL_END;
1102}
1103
1104void
1105object::player_goto (const char *path, int x, int y)
1106{
1107 if (type != PLAYER)
1108 return;
1109
1110 CALL_BEGIN (4);
1111 CALL_ARG (this);
1112 CALL_ARG (path);
1113 CALL_ARG (x);
1114 CALL_ARG (y);
1115 CALL_CALL ("cf::object::player::goto", G_VOID);
1063 CALL_END; 1116 CALL_END;
1064} 1117}
1065 1118
1066const char * 1119const char *
1067object::ref () const 1120object::ref () const
1154 1207
1155 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1); 1208 stash_cf_object_wrap = gv_stashpv ("cf::object::wrap", 1);
1156 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1); 1209 stash_cf_object_player_wrap = gv_stashpv ("cf::object::player::wrap", 1);
1157 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1); 1210 stash_cf_player_wrap = gv_stashpv ("cf::player::wrap", 1);
1158 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1); 1211 stash_cf_map_wrap = gv_stashpv ("cf::map::wrap" , 1);
1212 stash_cf_mapspace_wrap = gv_stashpv ("cf::mapspace::wrap" , 1);
1159 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1213 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1160 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1214 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1161 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1215 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1162 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1216 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1163 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1217 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1283 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL) 1337 const_iv (FLAG_CURSED) const_iv (FLAG_DAMNED) const_iv (FLAG_SEE_ANYWHERE) const_iv (FLAG_KNOWN_MAGICAL)
1284 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL) 1338 const_iv (FLAG_KNOWN_CURSED) const_iv (FLAG_CAN_USE_SKILL) const_iv (FLAG_BEEN_APPLIED) const_iv (FLAG_READY_SCROLL)
1285 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED) 1339 const_iv (FLAG_USE_ROD) const_iv (FLAG_USE_HORN) const_iv (FLAG_MAKE_INVIS) const_iv (FLAG_INV_LOCKED)
1286 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON) 1340 const_iv (FLAG_IS_WOODED) const_iv (FLAG_IS_HILLY) const_iv (FLAG_READY_SKILL) const_iv (FLAG_READY_WEAPON)
1287 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON) 1341 const_iv (FLAG_NO_SKILL_IDENT) const_iv (FLAG_BLIND) const_iv (FLAG_SEE_IN_DARK) const_iv (FLAG_IS_CAULDRON)
1288 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_CLIENT_SENT) const_iv (FLAG_BERSERK) 1342 const_iv (FLAG_NO_STEAL) const_iv (FLAG_ONE_HIT) const_iv (FLAG_DEBUG) const_iv (FLAG_BERSERK)
1289 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL) 1343 const_iv (FLAG_NEUTRAL) const_iv (FLAG_NO_ATTACK) const_iv (FLAG_NO_DAMAGE) const_iv (FLAG_OBJ_ORIGINAL)
1290 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER) 1344 const_iv (FLAG_ACTIVATE_ON_PUSH) const_iv (FLAG_ACTIVATE_ON_RELEASE) const_iv (FLAG_IS_WATER)
1291 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE) 1345 const_iv (FLAG_CONTENT_ON_GEN) const_iv (FLAG_IS_A_TEMPLATE) const_iv (FLAG_IS_BUILDABLE)
1292 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE) 1346 const_iv (FLAG_DESTROY_ON_DEATH) const_iv (FLAG_NO_MAP_SAVE)
1293 1347
1294 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED) 1348 const_iv (NDI_BLACK) const_iv (NDI_WHITE) const_iv (NDI_NAVY) const_iv (NDI_RED)
1295 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN) 1349 const_iv (NDI_ORANGE) const_iv (NDI_BLUE) const_iv (NDI_DK_ORANGE) const_iv (NDI_GREEN)
1296 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD) 1350 const_iv (NDI_LT_GREEN) const_iv (NDI_GREY) const_iv (NDI_BROWN) const_iv (NDI_GOLD)
1297 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE) 1351 const_iv (NDI_TAN) const_iv (NDI_MAX_COLOR) const_iv (NDI_COLOR_MASK) const_iv (NDI_UNIQUE)
1298 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK) 1352 const_iv (NDI_ALL) const_iv (NDI_DEF) const_iv (NDI_REPLY) const_iv (NDI_CLIENT_MASK)
1299 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) 1353 const_iv (NDI_NOCREATE) const_iv (NDI_CLEAR) const_iv (NDI_VERBATIM)
1300 1354
1301 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE) 1355 const_iv (UPD_LOCATION) const_iv (UPD_FLAGS) const_iv (UPD_WEIGHT) const_iv (UPD_FACE)
1302 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF) 1356 const_iv (UPD_NAME) const_iv (UPD_ANIM) const_iv (UPD_ANIMSPEED) const_iv (UPD_NROF)
1303 1357
1304 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE) 1358 const_iv (UPD_SP_MANA) const_iv (UPD_SP_GRACE) const_iv (UPD_SP_DAMAGE)
1356 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK) 1410 const_iv (F_CURSED) const_iv (F_DAMNED) const_iv (F_OPEN) const_iv (F_NOPICK)
1357 const_iv (F_LOCKED) 1411 const_iv (F_LOCKED)
1358 1412
1359 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL) 1413 const_iv (F_BUY) const_iv (F_SHOP) const_iv (F_SELL)
1360 1414
1361 const_iv (P_BLOCKSVIEW) const_iv (P_PLAYER) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE) 1415 const_iv (P_BLOCKSVIEW) const_iv (P_NO_MAGIC) const_iv (P_IS_ALIVE)
1362 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE) 1416 const_iv (P_NO_CLERIC) const_iv (P_OUT_OF_MAP) const_iv (P_NEW_MAP) const_iv (P_UPTODATE)
1363 1417
1364 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE) 1418 const_iv (UP_OBJ_INSERT) const_iv (UP_OBJ_REMOVE) const_iv (UP_OBJ_CHANGE) const_iv (UP_OBJ_FACE)
1365 1419
1366 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON) 1420 const_iv (INS_NO_MERGE) const_iv (INS_ABOVE_FLOOR_ONLY) const_iv (INS_NO_WALK_ON)
1432 1486
1433 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X) 1487 const_iv (SYMMETRY_RANDOM) const_iv (SYMMETRY_NONE) const_iv (SYMMETRY_X)
1434 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY) 1488 const_iv (SYMMETRY_Y) const_iv (SYMMETRY_XY)
1435 1489
1436 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP) 1490 const_iv (GT_ENVIRONMENT) const_iv (GT_INVISIBLE) const_iv (GT_STARTEQUIP)
1437 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_UPDATE_INV) 1491 const_iv (GT_APPLY) const_iv (GT_ONLY_GOOD) const_iv (GT_MINIMAL)
1438 const_iv (GT_MINIMAL)
1439 1492
1440 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND) 1493 const_iv (FT_FACE) const_iv (FT_MUSIC) const_iv (FT_SOUND)
1441 const_iv (FT_RSRC) const_iv (FT_NUM) 1494 const_iv (FT_RSRC) const_iv (FT_NUM)
1442 }; 1495 };
1443 1496
1465 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1518 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
1466 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv)); 1519 newCONSTSUB (stash_cf, (char *)eiv->name, newSViv (eiv->iv));
1467 } 1520 }
1468} 1521}
1469 1522
1523void _gv_clear (SV *gv)
1524 CODE:
1525 assert (SvTYPE (gv) == SVt_PVGV);
1526# define f(sv) { SV *sv_ = (SV *)(sv); sv = 0; SvREFCNT_dec (sv_); }
1527 f (GvGP (gv)->gp_form);
1528 f (GvGP (gv)->gp_io);
1529 f (GvGP (gv)->gp_sv);
1530 f (GvGP (gv)->gp_av);
1531 f (GvGP (gv)->gp_hv);
1532 f (GvGP (gv)->gp_cv);
1533 GvCVGEN (gv) = 0;
1534 GvMULTI_off (gv);
1535# undef f
1536
1470void _connect_to_perl () 1537void _connect_to_perl ()
1471 1538
1472void _recalc_want () 1539void _recalc_want ()
1473 1540
1541# not used by default anymore
1474void _global_reattach () 1542void _global_reattach ()
1475 CODE: 1543 CODE:
1476{ 1544{
1477 // reattach to all attachable objects in the game. 1545 // reattach to all attachable objects in the game.
1478 for_all_clients (ns) 1546 for_all_clients (ns)
1522 } 1590 }
1523 1591
1524 SvCUR_set (data_sv, dst - SvPVX (data_sv)); 1592 SvCUR_set (data_sv, dst - SvPVX (data_sv));
1525} 1593}
1526 1594
1595void init_anim ()
1596
1597void init_globals ()
1598
1599void init_experience ()
1600
1601void init_attackmess ()
1602
1603void init_dynamic ()
1604
1605void load_settings ()
1606
1607void load_materials ()
1608
1609void init_uuid ()
1610 CODE:
1611 UUID::init ();
1612
1613void init_signals ()
1614
1615void init_commands ()
1616
1617void init_skills ()
1618
1619void init_beforeplay ()
1620
1527void evthread_start (int aiofd) 1621void evthread_start (int aiofd)
1528 1622
1529void cede_to_tick () 1623void cede_to_tick ()
1530 CODE: 1624 CODE:
1531 coroapi::cede_to_tick (); 1625 coroapi::cede_to_tick ();
1574NV floor (NV x) 1668NV floor (NV x)
1575 1669
1576NV ceil (NV x) 1670NV ceil (NV x)
1577 1671
1578NV rndm (...) 1672NV rndm (...)
1673 ALIAS:
1674 rmg_rndm = 1
1579 CODE: 1675 CODE:
1676{
1677 rand_gen &gen = ix ? rmg_rndm : rndm;
1580 switch (items) 1678 switch (items)
1581 { 1679 {
1582 case 0: RETVAL = rndm (); break; 1680 case 0: RETVAL = gen (); break;
1583 case 1: RETVAL = rndm (SvUV (ST (0))); break; 1681 case 1: RETVAL = gen (SvUV (ST (0))); break;
1584 case 2: RETVAL = rndm (SvIV (ST (0)), SvIV (ST (1))); break; 1682 case 2: RETVAL = gen (SvIV (ST (0)), SvIV (ST (1))); break;
1585 default: croak ("cf::rndm requires none, one or two parameters."); break; 1683 default: croak ("cf::rndm requires none, one or two parameters."); break;
1586 } 1684 }
1685}
1587 OUTPUT: 1686 OUTPUT:
1588 RETVAL 1687 RETVAL
1589 1688
1590NV clamp (NV value, NV min_value, NV max_value) 1689NV clamp (NV value, NV min_value, NV max_value)
1591 CODE: 1690 CODE:
1663#if _POSIX_MEMLOCK 1762#if _POSIX_MEMLOCK
1664 1763
1665int mlockall (int flags = MCL_CURRENT | MCL_FUTURE) 1764int mlockall (int flags = MCL_CURRENT | MCL_FUTURE)
1666 INIT: 1765 INIT:
1667#if __GLIBC__ 1766#if __GLIBC__
1767 mallopt (M_TOP_PAD, 1024 * 1024);
1768 mallopt (M_MMAP_THRESHOLD, 1024 * 1024 * 128);
1769 mallopt (M_MMAP_MAX, 0); // likely bug-workaround, also frees memory
1668 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc 1770 mallopt (M_PERTURB, 0xee); // bug-workaround for linux glibc+mlockall+calloc
1669#endif 1771#endif
1670 1772
1671int munlockall () 1773int munlockall ()
1672 1774
1691 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks))); 1793 PUSHs (sv_2mortal (newSVpv ("fsmblks" , 0))); PUSHs (sv_2mortal (newSViv (mai.fsmblks)));
1692 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks))); 1794 PUSHs (sv_2mortal (newSVpv ("uordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.uordblks)));
1693 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks))); 1795 PUSHs (sv_2mortal (newSVpv ("fordblks", 0))); PUSHs (sv_2mortal (newSViv (mai.fordblks)));
1694 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost))); 1796 PUSHs (sv_2mortal (newSVpv ("keepcost", 0))); PUSHs (sv_2mortal (newSViv (mai.keepcost)));
1695#endif 1797#endif
1696 EXTEND (SP, 2*2); 1798 EXTEND (SP, 5*2);
1697 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc))); 1799 PUSHs (sv_2mortal (newSVpv ("slice_alloc", 0))); PUSHs (sv_2mortal (newSVuv (slice_alloc)));
1698 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc))); 1800 PUSHs (sv_2mortal (newSVpv ("shstr_alloc", 0))); PUSHs (sv_2mortal (newSVuv (shstr_alloc)));
1801 PUSHs (sv_2mortal (newSVpv ("objects" , 0))); PUSHs (sv_2mortal (newSVuv (objects.size () * sizeof (object))));
1802 PUSHs (sv_2mortal (newSVpv ("sv_count" , 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_count)));
1803 PUSHs (sv_2mortal (newSVpv ("sv_objcount", 0))); PUSHs (sv_2mortal (newSVuv (PL_sv_objcount)));
1699} 1804}
1700 1805
1701int find_animation (utf8_string text) 1806int find_animation (utf8_string text)
1702 PROTOTYPE: $ 1807 PROTOTYPE: $
1703 1808
1787 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i])))); 1892 PUSHs (sv_2mortal (to_sv (archetype::find (coins [i]))));
1788 1893
1789bool 1894bool
1790load_resource_file_ (octet_string filename) 1895load_resource_file_ (octet_string filename)
1791 1896
1897void
1898fix_weight ()
1899
1792MODULE = cf PACKAGE = cf::attachable 1900MODULE = cf PACKAGE = cf::attachable
1793 1901
1794int 1902int
1795valid (SV *obj) 1903valid (SV *obj)
1796 CODE: 1904 CODE:
1859object *actives (U32 index) 1967object *actives (U32 index)
1860 CODE: 1968 CODE:
1861 RETVAL = index < actives.size () ? actives [index] : 0; 1969 RETVAL = index < actives.size () ? actives [index] : 0;
1862 OUTPUT: RETVAL 1970 OUTPUT: RETVAL
1863 1971
1972int mortals_size ()
1973 CODE:
1974 RETVAL = attachable::mortals.size ();
1975 OUTPUT: RETVAL
1976
1864const char *slot_use_name (U32 slot) 1977const char *slot_use_name (U32 slot)
1865 ALIAS: 1978 ALIAS:
1866 slot_nonuse_name = 1 1979 slot_nonuse_name = 1
1867 CODE: 1980 CODE:
1868{ 1981{
1946void apply_below (object *op) 2059void apply_below (object *op)
1947 CODE: 2060 CODE:
1948 player_apply_below (op); 2061 player_apply_below (op);
1949 2062
1950int cast_heal (object *op, object *caster, object *spell, int dir = 0) 2063int cast_heal (object *op, object *caster, object *spell, int dir = 0)
1951
1952#//TODO
1953object *clone_ (object *op, int recursive = 0)
1954 CODE:
1955 if (recursive)
1956 RETVAL = object_create_clone (op);
1957 else
1958 {
1959 RETVAL = object::create ();
1960 op->copy_to (RETVAL);
1961 }
1962 OUTPUT: RETVAL
1963 2064
1964int pay_item (object *op, object *buyer) 2065int pay_item (object *op, object *buyer)
1965 CODE: 2066 CODE:
1966 RETVAL = pay_for_item (op, buyer); 2067 RETVAL = pay_for_item (op, buyer);
1967 OUTPUT: RETVAL 2068 OUTPUT: RETVAL
2045 CODE: 2146 CODE:
2046{ 2147{
2047 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y); 2148 RETVAL = insert_ob_in_map_at (ob, where, orig, flag, x, y);
2048} 2149}
2049 2150
2050const_utf8_string get_ob_key_value (object *op, utf8_string key) 2151shstr
2152object::kv_get (shstr key)
2051 2153
2052bool set_ob_key_value (object *op, utf8_string key, utf8_string value = 0, int add_key = 1) 2154void
2155object::kv_del (shstr key)
2156
2157void
2158object::kv_set (shstr key, shstr value)
2053 2159
2054object *get_nearest_player (object *ob) 2160object *get_nearest_player (object *ob)
2055 ALIAS: nearest_player = 0 2161 ALIAS: nearest_player = 0
2056 PREINIT: 2162 PREINIT:
2057 extern object *get_nearest_player (object *); 2163 extern object *get_nearest_player (object *);
2059void rangevector (object *ob, object *other, int flags = 0) 2165void rangevector (object *ob, object *other, int flags = 0)
2060 PROTOTYPE: $$;$ 2166 PROTOTYPE: $$;$
2061 PPCODE: 2167 PPCODE:
2062{ 2168{
2063 rv_vector rv; 2169 rv_vector rv;
2170
2171 PUTBACK;
2064 get_rangevector (ob, other, &rv, flags); 2172 get_rangevector (ob, other, &rv, flags);
2173 SPAGAIN;
2174
2065 EXTEND (SP, 5); 2175 EXTEND (SP, 5);
2066 PUSHs (newSVuv (rv.distance)); 2176 PUSHs (newSVuv (rv.distance));
2067 PUSHs (newSViv (rv.distance_x)); 2177 PUSHs (newSViv (rv.distance_x));
2068 PUSHs (newSViv (rv.distance_y)); 2178 PUSHs (newSViv (rv.distance_y));
2069 PUSHs (newSViv (rv.direction)); 2179 PUSHs (newSViv (rv.direction));
2138 pl->ob->stats.hp = pl->ob->stats.maxhp; 2248 pl->ob->stats.hp = pl->ob->stats.maxhp;
2139 pl->ob->stats.sp = pl->ob->stats.maxsp; 2249 pl->ob->stats.sp = pl->ob->stats.maxsp;
2140 pl->ob->stats.grace = pl->ob->stats.maxgrace; 2250 pl->ob->stats.grace = pl->ob->stats.maxgrace;
2141 pl->orig_stats = pl->ob->stats; 2251 pl->orig_stats = pl->ob->stats;
2142 2252
2143void clear_los (player *pl) 2253# should only be temporary
2254void esrv_new_player (player *pl)
2144 2255
2256#d# TODO: replace by blocked_los accessor, fix code using this
2145bool 2257bool
2146cell_visible (player *pl, int dx, int dy) 2258cell_visible (player *pl, int dx, int dy)
2147 CODE: 2259 CODE:
2148 RETVAL = FABS (dx) <= pl->ns->mapx / 2 && FABS (dy) <= pl->ns->mapy / 2 2260 RETVAL = pl->blocked_los (dx, dy) != LOS_BLOCKED;
2149 && !pl->blocked_los [dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2];
2150 OUTPUT: 2261 OUTPUT:
2151 RETVAL 2262 RETVAL
2152 2263
2153void 2264void
2154send (player *pl, SV *packet) 2265send (player *pl, SV *packet)
2160 if (len > MAXSOCKBUF) 2271 if (len > MAXSOCKBUF)
2161 pl->failmsg ("[packet too long for client]"); 2272 pl->failmsg ("[packet too long for client]");
2162 else if (pl->ns) 2273 else if (pl->ns)
2163 pl->ns->send_packet (buf, len); 2274 pl->ns->send_packet (buf, len);
2164} 2275}
2165
2166int
2167listening (player *pl, int new_value = -1)
2168 CODE:
2169 RETVAL = pl->listening;
2170 if (new_value >= 0)
2171 pl->listening = new_value;
2172 OUTPUT:
2173 RETVAL
2174 2276
2175void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0) 2277void savebed (player *pl, SV *map_path = 0, SV *x = 0, SV *y = 0)
2176 PROTOTYPE: $;$$$ 2278 PROTOTYPE: $;$$$
2177 PPCODE: 2279 PPCODE:
2178 if (GIMME_V != G_VOID) 2280 if (GIMME_V != G_VOID)
2333} 2435}
2334 2436
2335void 2437void
2336maptile::create_region_treasure () 2438maptile::create_region_treasure ()
2337 CODE: 2439 CODE:
2338{
2339 object *op = object::create ();
2340 op->type = FLOOR;
2341 op->map = THIS;
2342
2343 for (int x = 0; x < THIS->width; ++x) 2440 for (int x = 0; x < THIS->width; ++x)
2344 for (int y = 0; y < THIS->height; ++y) 2441 for (int y = 0; y < THIS->height; ++y)
2345 { 2442 {
2346 region *rgn = THIS->region (x, y); 2443 region *rgn = THIS->region (x, y);
2347 2444
2348 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D 2445 //fprintf (stderr, "%d,%d %f %p\n", x, y, rgn->treasure_density,rgn->treasure);//D
2446 if (object *op = THIS->at (x, y).top)
2349 if (rgn->treasure && rndm () < rgn->treasure_density) 2447 if (rgn->treasure && rndm () < rgn->treasure_density)
2350 {
2351 op->x = x;
2352 op->y = y;
2353 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty); 2448 create_treasure (rgn->treasure, op, GT_ENVIRONMENT, THIS->difficulty);
2354 }
2355 } 2449 }
2356
2357 op->destroy ();
2358}
2359 2450
2360int out_of_map (maptile *map, int x, int y) 2451int out_of_map (maptile *map, int x, int y)
2361 2452
2362void 2453void
2363trigger (maptile *map, long connection, bool state = true) 2454trigger (maptile *map, long connection, bool state = true)
2376get_map_flags (maptile *map, int x, int y) 2467get_map_flags (maptile *map, int x, int y)
2377 PPCODE: 2468 PPCODE:
2378{ 2469{
2379 maptile *nmap = 0; 2470 maptile *nmap = 0;
2380 I16 nx = 0, ny = 0; 2471 I16 nx = 0, ny = 0;
2472
2473 PUTBACK;
2381 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny); 2474 int flags = get_map_flags (map, &nmap, x, y, &nx, &ny);
2475 SPAGAIN;
2382 2476
2383 EXTEND (SP, 4); 2477 EXTEND (SP, 4);
2384 PUSHs (sv_2mortal (newSViv (flags))); 2478 PUSHs (sv_2mortal (newSViv (flags)));
2385 2479
2386 if (GIMME_V == G_ARRAY) 2480 if (GIMME_V == G_ARRAY)
2389 PUSHs (sv_2mortal (newSViv (nx))); 2483 PUSHs (sv_2mortal (newSViv (nx)));
2390 PUSHs (sv_2mortal (newSViv (ny))); 2484 PUSHs (sv_2mortal (newSViv (ny)));
2391 } 2485 }
2392} 2486}
2393 2487
2488mapspace *
2489ms (maptile *map, unsigned int x, unsigned int y)
2490 PROTOTYPE: $$$
2491 CODE:
2492{
2493 maptile *nmap = 0;
2494 I16 nx, ny;
2495
2496 PUTBACK;
2497 get_map_flags (map, &nmap, x, y, &nx, &ny);
2498 SPAGAIN;
2499
2500 if (!nmap)
2501 XSRETURN_UNDEF;
2502
2503 RETVAL = &nmap->at (nx, ny);
2504}
2505 OUTPUT:
2506 RETVAL
2507
2394void 2508void
2395at (maptile *map, unsigned int x, unsigned int y) 2509at (maptile *map, unsigned int x, unsigned int y)
2396 PROTOTYPE: $$$ 2510 PROTOTYPE: $$$
2397 PPCODE: 2511 PPCODE:
2398{ 2512{
2399 object *o;
2400 maptile *nmap = 0; 2513 maptile *nmap = 0;
2401 I16 nx, ny; 2514 I16 nx, ny;
2402 2515
2516 PUTBACK;
2403 get_map_flags (map, &nmap, x, y, &nx, &ny); 2517 get_map_flags (map, &nmap, x, y, &nx, &ny);
2518 SPAGAIN;
2404 2519
2405 if (nmap) 2520 if (nmap)
2406 for (o = GET_MAP_OB (nmap, nx, ny); o; o = o->above) 2521 for (object *o = nmap->at (nx, ny).bot; o; o = o->above)
2407 XPUSHs (sv_2mortal (to_sv (o))); 2522 XPUSHs (sv_2mortal (to_sv (o)));
2408} 2523}
2409 2524
2410SV * 2525SV *
2411bot_at (maptile *obj, unsigned int x, unsigned int y) 2526bot_at (maptile *map, unsigned int x, unsigned int y)
2412 PROTOTYPE: $$$ 2527 PROTOTYPE: $$$
2413 ALIAS: 2528 ALIAS:
2414 top_at = 1 2529 top_at = 1
2415 flags_at = 2 2530 flags_at = 2
2416 light_at = 3 2531 light_at = 3
2417 move_block_at = 4 2532 move_block_at = 4
2418 move_slow_at = 5 2533 move_slow_at = 5
2419 move_on_at = 6 2534 move_on_at = 6
2420 move_off_at = 7 2535 move_off_at = 7
2421 INIT:
2422 if (x >= obj->width || y >= obj->height) XSRETURN_UNDEF;
2423 CODE: 2536 CODE:
2537{
2538 sint16 nx = x;
2539 sint16 ny = y;
2540
2541 if (!xy_normalise (map, nx, ny))
2542 XSRETURN_UNDEF;
2543
2544 mapspace &ms = map->at (nx, ny);
2545
2546 ms.update ();
2547
2424 switch (ix) 2548 switch (ix)
2425 { 2549 {
2426 case 0: RETVAL = to_sv (GET_MAP_OB (obj, x, y)); break; 2550 case 0: RETVAL = to_sv (ms.bot ); break;
2427 case 1: RETVAL = to_sv (GET_MAP_TOP (obj, x, y)); break; 2551 case 1: RETVAL = to_sv (ms.top ); break;
2428 case 2: RETVAL = newSVuv (GET_MAP_FLAGS (obj, x, y)); break; 2552 case 2: RETVAL = newSVuv (ms.flags_ ); break;
2429 case 3: RETVAL = newSViv (GET_MAP_LIGHT (obj, x, y)); break; 2553 case 3: RETVAL = newSViv (ms.light ); break;
2430 case 4: RETVAL = newSVuv (GET_MAP_MOVE_BLOCK (obj, x, y)); break; 2554 case 4: RETVAL = newSVuv (ms.move_block); break;
2431 case 5: RETVAL = newSVuv (GET_MAP_MOVE_SLOW (obj, x, y)); break; 2555 case 5: RETVAL = newSVuv (ms.move_slow ); break;
2432 case 6: RETVAL = newSVuv (GET_MAP_MOVE_ON (obj, x, y)); break; 2556 case 6: RETVAL = newSVuv (ms.move_on ); break;
2433 case 7: RETVAL = newSVuv (GET_MAP_MOVE_OFF (obj, x, y)); break; 2557 case 7: RETVAL = newSVuv (ms.move_off ); break;
2434 } 2558 }
2559}
2435 OUTPUT: RETVAL 2560 OUTPUT: RETVAL
2436 2561
2437void fix_walls (maptile *map, int x, int y) 2562void fix_walls (maptile *map, int x, int y)
2438 2563
2439void fix_walls_around (maptile *map, int x, int y) 2564void fix_walls_around (maptile *map, int x, int y)
2524 RETVAL = self->generate_random_map (&rmp); 2649 RETVAL = self->generate_random_map (&rmp);
2525} 2650}
2526 OUTPUT: 2651 OUTPUT:
2527 RETVAL 2652 RETVAL
2528 2653
2654MODULE = cf PACKAGE = cf::mapspace
2655
2656INCLUDE: $PERL $srcdir/genacc mapspace ../include/map.h |
2657
2529MODULE = cf PACKAGE = cf::arch 2658MODULE = cf PACKAGE = cf::arch
2530 2659
2531int archetypes_size () 2660int archetypes_size ()
2532 CODE: 2661 CODE:
2533 RETVAL = archetypes.size (); 2662 RETVAL = archetypes.size ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines