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.380 by root, Sun Apr 25 10:45:38 2010 UTC vs.
Revision 1.391 by root, Sat Jul 3 01:49:18 2010 UTC

… …
84 *stash_cf_client_wrap, 84 *stash_cf_client_wrap,
85 *stash_cf_arch_wrap, 85 *stash_cf_arch_wrap,
86 *stash_cf_party_wrap, 86 *stash_cf_party_wrap,
87 *stash_cf_region_wrap, 87 *stash_cf_region_wrap,
88 *stash_cf_living_wrap, 88 *stash_cf_living_wrap,
89 *stash_cf_layout_wrap,
89 *stash_ext_map_world; 90 *stash_ext_map_world;
90 91
91static SV 92static SV
92 *cv_cf_do_invoke, 93 *cv_cf_do_invoke,
93 *cv_cf__can_merge, 94 *cv_cf__can_merge,
… …
122 123
123 return sv; 124 return sv;
124} 125}
125#endif 126#endif
126 127
127static noinline utf8_string 128noinline utf8_string
128cfSvPVutf8_nolen (SV *sv) 129cfSvPVutf8_nolen (SV *sv)
129{ 130{
130 SvGETMAGIC (sv); 131 SvGETMAGIC (sv);
131 132
132 if (SvPOK (sv)) 133 if (SvPOK (sv))
… …
354////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 355//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
355 356
356static SV * 357static SV *
357newSVptr (void *ptr, HV *stash, HV *hv) 358newSVptr (void *ptr, HV *stash, HV *hv)
358{ 359{
359 SV *sv;
360
361 if (!ptr) 360 if (!ptr)
362 return newSV (0); 361 return newSV (0);
363 362
364 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 363 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
365 return sv_bless (newRV_noinc ((SV *)hv), stash); 364 return sv_bless (newRV_noinc ((SV *)hv), stash);
366} 365}
367 366
368static SV * 367static SV * noinline
369newSVptr (void *ptr, HV *stash) 368newSVptr (void *ptr, HV *stash)
370{ 369{
371 return newSVptr (ptr, stash, newHV ()); 370 return newSVptr (ptr, stash, newHV ());
372} 371}
373 372
… …
388 return 0; 387 return 0;
389} 388}
390 389
391MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free}; 390MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free};
392 391
393static SV * 392static SV * noinline
394newSVattachable (attachable *obj, HV *stash) 393newSVattachable (attachable *obj, HV *stash)
395{ 394{
396 if (!obj) 395 if (!obj)
397 return newSV (0); 396 return newSV (0);
398 397
… …
532static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 531static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
533static inline SV *to_sv (float v) { return newSVnv (v); } 532static inline SV *to_sv (float v) { return newSVnv (v); }
534static inline SV *to_sv (double v) { return newSVnv (v); } 533static inline SV *to_sv (double v) { return newSVnv (v); }
535static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 534static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); }
536static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); } 535static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
536// gcc dislikes noilnine on to_sv
537static inline SV *to_sv (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); } 537static noinline SV *to_sv_ni (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
538static inline SV *to_sv (object * v) { return to_sv_ni (v); }
538static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); } 539static inline SV *to_sv (maptile * v) { return newSVattachable (v, stash_cf_map_wrap); }
539static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); } 540static inline SV *to_sv (archetype * v) { return newSVattachable (v, stash_cf_arch_wrap); }
540static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); } 541static inline SV *to_sv (region * v) { return newSVattachable (v, stash_cf_region_wrap); }
541static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); } 542static inline SV *to_sv (partylist * v) { return newSVptr (v, stash_cf_party_wrap); }
542static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); } 543static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
543static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); } 544static inline SV *to_sv (mapspace * v) { return newSVptr (v, stash_cf_mapspace_wrap); }
545static inline SV *to_sv (layout * v) { return newSVptr (v, stash_cf_layout_wrap); }
544 546
545static inline SV *to_sv (object & v) { return to_sv (&v); } 547static inline SV *to_sv (object & v) { return to_sv (&v); }
546static inline SV *to_sv (living & v) { return to_sv (&v); } 548static inline SV *to_sv (living & v) { return to_sv (&v); }
547 549
548static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); } 550static inline SV *to_sv (const std::string & v) { return newSVpvn (v.data (), v.size ()); }
… …
594static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); } 596static inline void sv_to (SV *sv, region * &v) { v = (region *) (attachable *)SvPTR_ornull (sv, "cf::region"); }
595static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); } 597static inline void sv_to (SV *sv, attachable * &v) { v = (attachable *)SvPTR_ornull (sv, "cf::attachable"); }
596static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); } 598static inline void sv_to (SV *sv, partylist * &v) { v = (partylist *) SvPTR_ornull (sv, "cf::party"); }
597static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); } 599static inline void sv_to (SV *sv, living * &v) { v = (living *) SvPTR_ornull (sv, "cf::living"); }
598static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); } 600static inline void sv_to (SV *sv, mapspace * &v) { v = (mapspace *) SvPTR_ornull (sv, "cf::mapspace"); }
601static inline void sv_to (SV *sv, layout * &v) { v = (layout *) SvPTR_ornull (sv, "cf::layout"); }
599static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); } 602static inline void sv_to (SV *sv, object_freezer * &v) { v = (object_freezer *) SvPTR_ornull (sv, "cf::object::freezer"); }
600static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); } 603static inline void sv_to (SV *sv, object_thawer * &v) { v = (object_thawer *) SvPTR_ornull (sv, "cf::object::thawer" ); }
601 604
602//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; } 605//static inline void sv_to (SV *sv, faceinfo * &v) { v = &faces [face_find (SvPV_nolen (sv), 0)]; }
603static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); } 606static inline void sv_to (SV *sv, treasurelist * &v) { v = treasurelist::find (SvPV_nolen (sv)); }
… …
770 exit (EXIT_FAILURE); 773 exit (EXIT_FAILURE);
771 } 774 }
772 775
773 eval_pv ( 776 eval_pv (
774 "#line 1 'cfperl init'\n" 777 "#line 1 'cfperl init'\n"
775 "use EV ();\n" 778 "use EV ();\n" // required by bootstrap
776 "use Coro ();\n" 779 "use Coro ();\n" // required by bootstrap
777 "cf->bootstrap;\n" 780 "cf->bootstrap;\n" // required for cf::datadir
778 "unshift @INC, cf::datadir ();\n" 781 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
779 "require cf;\n", 782 "require cf;\n",
780 0 783 0
781 ); 784 );
782 785
783 if (SvTRUE (ERRSV)) 786 if (SvTRUE (ERRSV))
… …
1397 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1); 1400 stash_cf_client_wrap = gv_stashpv ("cf::client::wrap", 1);
1398 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1); 1401 stash_cf_arch_wrap = gv_stashpv ("cf::arch::wrap" , 1);
1399 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1); 1402 stash_cf_party_wrap = gv_stashpv ("cf::party::wrap" , 1);
1400 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1); 1403 stash_cf_region_wrap = gv_stashpv ("cf::region::wrap", 1);
1401 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1); 1404 stash_cf_living_wrap = gv_stashpv ("cf::living::wrap", 1);
1405 stash_cf_layout_wrap = gv_stashpv ("cf::layout::wrap", 1);
1402 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1); 1406 stash_ext_map_world = gv_stashpv ("ext::map_world" , 1);
1403 1407
1404 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV); 1408 sv_now = get_sv ("cf::NOW" , 1); SvUPGRADE (sv_now , SVt_NV);
1405 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV); 1409 sv_runtime = get_sv ("cf::RUNTIME" , 1); SvUPGRADE (sv_runtime , SVt_NV);
1406 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV); 1410 sv_tick_start = get_sv ("cf::TICK_START", 1); SvUPGRADE (sv_tick_start, SVt_NV);
… …
1456# undef def 1460# undef def
1457# define def(uc, flags) const_iv (SK_ ## uc) 1461# define def(uc, flags) const_iv (SK_ ## uc)
1458# include "skillinc.h" 1462# include "skillinc.h"
1459# undef def 1463# undef def
1460 1464
1461 const_iv (llevError) const_iv (llevInfo) const_iv (llevDebug) const_iv (llevMonster)
1462 const_iv (logBacktrace)
1463
1464 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd) 1465 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1465 1466
1466 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1467 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1467 1468
1468 const_iv (MAX_TIME) 1469 const_iv (MAX_TIME)
… …
1494 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1495 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1495 1496
1496 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1497 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1497 }; 1498 };
1498 1499
1499 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1500 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1500 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1501 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1501 1502
1502 static const struct { 1503 static const struct {
1503 const char *name; 1504 const char *name;
1504 int skip; 1505 int skip;
… …
1510# undef def 1511# undef def
1511 }; 1512 };
1512 1513
1513 AV *av = get_av ("cf::EVENT", 1); 1514 AV *av = get_av ("cf::EVENT", 1);
1514 1515
1515 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1516 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1516 { 1517 {
1517 AV *event = newAV (); 1518 AV *event = newAV ();
1518 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1519 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1519 av_push (event, newSViv (eiv->klass)); 1520 av_push (event, newSViv (eiv->klass));
1520 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1521 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
… …
1601 1602
1602void init_anim () 1603void init_anim ()
1603 1604
1604void init_globals () 1605void init_globals ()
1605 1606
1606void init_experience ()
1607
1608void init_attackmess () 1607void init_attackmess ()
1609 1608
1610void init_dynamic () 1609void init_dynamic ()
1611 1610
1612void load_settings () 1611void load_settings ()
1613 1612
1613void reload_exp_table ()
1614
1614void load_materials () 1615void reload_materials ()
1615 1616
1616void init_uuid () 1617void init_uuid ()
1617 CODE: 1618 CODE:
1618 UUID::init (); 1619 UUID::init ();
1619 1620
… …
2089 2090
2090void pick_up (object *who, object *op) 2091void pick_up (object *who, object *op)
2091 2092
2092void update_object (object *op, int action) 2093void update_object (object *op, int action)
2093 2094
2094void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2095void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2095 2096
2096void player_lvl_adj (object *who, object *skill = 0) 2097void player_lvl_adj (object *who, object *skill = 0)
2097 2098
2098int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2099int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2099 2100
… …
2537} 2538}
2538 OUTPUT: RETVAL 2539 OUTPUT: RETVAL
2539 2540
2540# worst xs function of my life 2541# worst xs function of my life
2541bool 2542bool
2542_create_random_map (\ 2543_create_random_map (maptile *self, SV *options)
2543 maptile *self,\
2544 utf8_string wallstyle,\
2545 utf8_string wall_name,\
2546 utf8_string floorstyle,\
2547 utf8_string monsterstyle,\
2548 utf8_string treasurestyle,\
2549 utf8_string layoutstyle,\
2550 utf8_string doorstyle,\
2551 utf8_string decorstyle,\
2552 utf8_string miningstyle,\
2553 utf8_string origin_map,\
2554 utf8_string final_map,\
2555 utf8_string exitstyle,\
2556 utf8_string this_map,\
2557 utf8_string exit_on_final_map,\
2558 int xsize,\
2559 int ysize,\
2560 int expand2x,\
2561 int layoutoptions1,\
2562 int layoutoptions2,\
2563 int layoutoptions3,\
2564 int symmetry,\
2565 int difficulty,\
2566 int difficulty_given,\
2567 float difficulty_increase,\
2568 int dungeon_level,\
2569 int dungeon_depth,\
2570 int decoroptions,\
2571 int orientation,\
2572 int origin_y,\
2573 int origin_x,\
2574 U32 random_seed,\
2575 val64 total_map_hp,\
2576 int map_layout_style,\
2577 int treasureoptions,\
2578 int symmetry_used,\
2579 region *region,\
2580 utf8_string custom\
2581)
2582 CODE: 2544 CODE:
2583{ 2545{
2584 random_map_params rmp; 2546 random_map_params rmp ((HV *)SvRV (options));
2585
2586 assign (rmp.wallstyle , wallstyle);
2587 assign (rmp.wall_name , wall_name);
2588 assign (rmp.floorstyle , floorstyle);
2589 assign (rmp.monsterstyle , monsterstyle);
2590 assign (rmp.treasurestyle , treasurestyle);
2591 assign (rmp.layoutstyle , layoutstyle);
2592 assign (rmp.doorstyle , doorstyle);
2593 assign (rmp.decorstyle , decorstyle);
2594 assign (rmp.miningstyle , miningstyle);
2595 assign (rmp.exitstyle , exitstyle);
2596 assign (rmp.exit_on_final_map, exit_on_final_map);
2597
2598 rmp.origin_map = origin_map;
2599 rmp.final_map = final_map;
2600 rmp.this_map = this_map;
2601 rmp.xsize = xsize;
2602 rmp.ysize = ysize;
2603 rmp.expand2x = expand2x;
2604 rmp.layoutoptions1 = layoutoptions1;
2605 rmp.layoutoptions2 = layoutoptions2;
2606 rmp.layoutoptions3 = layoutoptions3;
2607 rmp.symmetry = symmetry;
2608 rmp.difficulty = difficulty;
2609 rmp.difficulty_given = difficulty_given;
2610 rmp.difficulty_increase = difficulty_increase;
2611 rmp.dungeon_level = dungeon_level;
2612 rmp.dungeon_depth = dungeon_depth;
2613 rmp.decoroptions = decoroptions;
2614 rmp.orientation = orientation;
2615 rmp.origin_y = origin_y;
2616 rmp.origin_x = origin_x;
2617 rmp.random_seed = random_seed;
2618 rmp.total_map_hp = (uint64_t) total_map_hp;
2619 rmp.map_layout_style = map_layout_style;
2620 rmp.treasureoptions = treasureoptions;
2621 rmp.symmetry_used = symmetry_used;
2622 rmp.region = region;
2623 rmp.custom = custom;
2624
2625 RETVAL = self->generate_random_map (&rmp); 2547 RETVAL = self->generate_random_map (&rmp);
2626} 2548}
2627 OUTPUT: 2549 OUTPUT:
2628 RETVAL 2550 RETVAL
2629 2551
… …
2963 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ()))); 2885 XPUSHs (sv_2mortal (newSVpv_utf8 (self->get_str ())));
2964 2886
2965 self->skip (); 2887 self->skip ();
2966 } 2888 }
2967 2889
2890MODULE = cf PACKAGE = cf::layout
2891
2892INCLUDE: $PERL $srcdir/genacc layout $srcdir/../random_maps/random_map.h |
2893

Diff Legend

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