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.388 by root, Wed Jun 30 01:57:54 2010 UTC

… …
122 122
123 return sv; 123 return sv;
124} 124}
125#endif 125#endif
126 126
127static noinline utf8_string 127noinline utf8_string
128cfSvPVutf8_nolen (SV *sv) 128cfSvPVutf8_nolen (SV *sv)
129{ 129{
130 SvGETMAGIC (sv); 130 SvGETMAGIC (sv);
131 131
132 if (SvPOK (sv)) 132 if (SvPOK (sv))
… …
354////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 354//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
355 355
356static SV * 356static SV *
357newSVptr (void *ptr, HV *stash, HV *hv) 357newSVptr (void *ptr, HV *stash, HV *hv)
358{ 358{
359 SV *sv;
360
361 if (!ptr) 359 if (!ptr)
362 return newSV (0); 360 return newSV (0);
363 361
364 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0); 362 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, 0, (char *)ptr, 0);
365 return sv_bless (newRV_noinc ((SV *)hv), stash); 363 return sv_bless (newRV_noinc ((SV *)hv), stash);
366} 364}
367 365
368static SV * 366static SV * noinline
369newSVptr (void *ptr, HV *stash) 367newSVptr (void *ptr, HV *stash)
370{ 368{
371 return newSVptr (ptr, stash, newHV ()); 369 return newSVptr (ptr, stash, newHV ());
372} 370}
373 371
… …
388 return 0; 386 return 0;
389} 387}
390 388
391MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free}; 389MGVTBL attachable::vtbl = {0, 0, 0, 0, attachable_free};
392 390
393static SV * 391static SV * noinline
394newSVattachable (attachable *obj, HV *stash) 392newSVattachable (attachable *obj, HV *stash)
395{ 393{
396 if (!obj) 394 if (!obj)
397 return newSV (0); 395 return newSV (0);
398 396
… …
532static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); } 530static inline SV *to_sv (unsigned long long v) { return newSVval64 (v); }
533static inline SV *to_sv (float v) { return newSVnv (v); } 531static inline SV *to_sv (float v) { return newSVnv (v); }
534static inline SV *to_sv (double v) { return newSVnv (v); } 532static inline SV *to_sv (double v) { return newSVnv (v); }
535static inline SV *to_sv (client * v) { return newSVattachable (v, stash_cf_client_wrap); } 533static 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); } 534static inline SV *to_sv (player * v) { return newSVattachable (v, stash_cf_player_wrap); }
535// 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); } 536static noinline SV *to_sv_ni (object * v) { return newSVattachable (v, v && v->type == PLAYER ? stash_cf_object_player_wrap : stash_cf_object_wrap); }
537static 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); } 538static 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); } 539static 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); } 540static 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); } 541static 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); } 542static inline SV *to_sv (living * v) { return newSVptr (v, stash_cf_living_wrap); }
… …
770 exit (EXIT_FAILURE); 770 exit (EXIT_FAILURE);
771 } 771 }
772 772
773 eval_pv ( 773 eval_pv (
774 "#line 1 'cfperl init'\n" 774 "#line 1 'cfperl init'\n"
775 "use EV ();\n" 775 "use EV ();\n" // required by bootstrap
776 "use Coro ();\n" 776 "use Coro ();\n" // required by bootstrap
777 "cf->bootstrap;\n" 777 "cf->bootstrap;\n" // required for cf::datadir
778 "unshift @INC, cf::datadir ();\n" 778 "unshift @INC, cf::datadir ();\n" // required for 'require' :)
779 "require cf;\n", 779 "require cf;\n",
780 0 780 0
781 ); 781 );
782 782
783 if (SvTRUE (ERRSV)) 783 if (SvTRUE (ERRSV))
… …
1456# undef def 1456# undef def
1457# define def(uc, flags) const_iv (SK_ ## uc) 1457# define def(uc, flags) const_iv (SK_ ## uc)
1458# include "skillinc.h" 1458# include "skillinc.h"
1459# undef def 1459# undef def
1460 1460
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) 1461 const_iv (Map0Cmd) const_iv (Map1Cmd) const_iv (Map1aCmd)
1465 1462
1466 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y) 1463 const_iv (MAP_CLIENT_X) const_iv (MAP_CLIENT_Y)
1467 1464
1468 const_iv (MAX_TIME) 1465 const_iv (MAX_TIME)
… …
1494 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT) 1491 const_iv (CS_QUERY_YESNO) const_iv (CS_QUERY_SINGLECHAR) const_iv (CS_QUERY_HIDEINPUT)
1495 1492
1496 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES) 1493 const_iv (IO_HEADER) const_iv (IO_OBJECTS) const_iv (IO_UNIQUES)
1497 }; 1494 };
1498 1495
1499 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1496 for (civ = const_iv + array_length (const_iv); civ-- > const_iv; )
1500 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv)); 1497 newCONSTSUB (stash_cf, (char *)civ->name, newSViv (civ->iv));
1501 1498
1502 static const struct { 1499 static const struct {
1503 const char *name; 1500 const char *name;
1504 int skip; 1501 int skip;
… …
1510# undef def 1507# undef def
1511 }; 1508 };
1512 1509
1513 AV *av = get_av ("cf::EVENT", 1); 1510 AV *av = get_av ("cf::EVENT", 1);
1514 1511
1515 for (eiv = event_iv + sizeof (event_iv) / sizeof (event_iv [0]); eiv-- > event_iv; ) 1512 for (eiv = event_iv + array_length (event_iv); eiv-- > event_iv; )
1516 { 1513 {
1517 AV *event = newAV (); 1514 AV *event = newAV ();
1518 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0)); 1515 av_push (event, newSVpv ((char *)eiv->name + eiv->skip, 0));
1519 av_push (event, newSViv (eiv->klass)); 1516 av_push (event, newSViv (eiv->klass));
1520 av_store (av, eiv->iv, newRV_noinc ((SV *)event)); 1517 av_store (av, eiv->iv, newRV_noinc ((SV *)event));
… …
1601 1598
1602void init_anim () 1599void init_anim ()
1603 1600
1604void init_globals () 1601void init_globals ()
1605 1602
1606void init_experience ()
1607
1608void init_attackmess () 1603void init_attackmess ()
1609 1604
1610void init_dynamic () 1605void init_dynamic ()
1611 1606
1612void load_settings () 1607void load_settings ()
1613 1608
1609void reload_exp_table ()
1610
1614void load_materials () 1611void reload_materials ()
1615 1612
1616void init_uuid () 1613void init_uuid ()
1617 CODE: 1614 CODE:
1618 UUID::init (); 1615 UUID::init ();
1619 1616
… …
2089 2086
2090void pick_up (object *who, object *op) 2087void pick_up (object *who, object *op)
2091 2088
2092void update_object (object *op, int action) 2089void update_object (object *op, int action)
2093 2090
2094void change_exp (object *op, uint64 exp, utf8_string skill_name = 0, int flag = 0) 2091void change_exp (object *op, uint64 exp, shstr_tmp skill_name = shstr_tmp (), int flag = 0)
2095 2092
2096void player_lvl_adj (object *who, object *skill = 0) 2093void player_lvl_adj (object *who, object *skill = 0)
2097 2094
2098int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL) 2095int kill_object (object *op, int dam = 0, object *hitter = 0, int type = AT_PHYSICAL)
2099 2096
… …
2539 2536
2540# worst xs function of my life 2537# worst xs function of my life
2541bool 2538bool
2542_create_random_map (\ 2539_create_random_map (\
2543 maptile *self,\ 2540 maptile *self,\
2544 utf8_string wallstyle,\ 2541 SV *options,\
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,\ 2542 val64 total_map_hp,\
2576 int map_layout_style,\
2577 int treasureoptions,\
2578 int symmetry_used,\
2579 region *region,\ 2543 region *region\
2580 utf8_string custom\
2581) 2544)
2582 CODE: 2545 CODE:
2583{ 2546{
2584 random_map_params rmp; 2547 random_map_params rmp;
2585 2548
2586 assign (rmp.wallstyle , wallstyle); 2549 rmp.hv = (HV *)SvREFCNT_inc_NN (SvRV (options));
2550
2587 assign (rmp.wall_name , wall_name); 2551 assign (rmp.wall_name , rmp.get_str ("wall_name"));
2588 assign (rmp.floorstyle , floorstyle);
2589 assign (rmp.monsterstyle , monsterstyle); 2552 assign (rmp.monsterstyle , rmp.get_str ("monsterstyle"));
2590 assign (rmp.treasurestyle , treasurestyle);
2591 assign (rmp.layoutstyle , layoutstyle); 2553 assign (rmp.layoutstyle , rmp.get_str ("layoutstyle"));
2592 assign (rmp.doorstyle , doorstyle); 2554 assign (rmp.doorstyle , rmp.get_str ("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); 2555 assign (rmp.exit_on_final_map, rmp.get_str ("exit_on_final_map"));
2597 2556
2598 rmp.origin_map = origin_map; 2557 rmp.origin_map = rmp.get_str ("origin_map");
2558 rmp.origin_x = rmp.get_iv ("origin_x");
2559 rmp.origin_y = rmp.get_iv ("origin_y");
2599 rmp.final_map = final_map; 2560 rmp.final_map = rmp.get_str ("final_map");
2600 rmp.this_map = this_map; 2561 rmp.this_map = rmp.get_str ("this_map");
2601 rmp.xsize = xsize; 2562 rmp.xsize = rmp.get_iv ("xsize");
2602 rmp.ysize = ysize; 2563 rmp.ysize = rmp.get_iv ("ysize");
2603 rmp.expand2x = expand2x; 2564 rmp.expand2x = rmp.get_iv ("expand2x");
2604 rmp.layoutoptions1 = layoutoptions1; 2565 rmp.layoutoptions1 = rmp.get_iv ("layoutoptions1");
2605 rmp.layoutoptions2 = layoutoptions2; 2566 rmp.layoutoptions2 = rmp.get_iv ("layoutoptions2");
2606 rmp.layoutoptions3 = layoutoptions3; 2567 rmp.layoutoptions3 = rmp.get_iv ("layoutoptions3");
2607 rmp.symmetry = symmetry; 2568 rmp.symmetry = rmp.get_iv ("symmetry");
2608 rmp.difficulty = difficulty; 2569 rmp.difficulty = rmp.get_iv ("difficulty");
2609 rmp.difficulty_given = difficulty_given; 2570 rmp.difficulty_given = rmp.get_iv ("difficulty_given");
2610 rmp.difficulty_increase = difficulty_increase; 2571 rmp.difficulty_increase = rmp.get_nv ("difficulty_increase");
2611 rmp.dungeon_level = dungeon_level; 2572 rmp.dungeon_level = rmp.get_iv ("dungeon_level");
2612 rmp.dungeon_depth = dungeon_depth; 2573 rmp.dungeon_depth = rmp.get_iv ("dungeon_depth");
2613 rmp.decoroptions = decoroptions;
2614 rmp.orientation = orientation; 2574 rmp.orientation = rmp.get_iv ("orientation");
2615 rmp.origin_y = origin_y;
2616 rmp.origin_x = origin_x;
2617 rmp.random_seed = random_seed; 2575 rmp.random_seed = rmp.get_uv ("random_seed");
2618 rmp.total_map_hp = (uint64_t) total_map_hp; 2576 rmp.total_map_hp = (uint64_t)total_map_hp;
2619 rmp.map_layout_style = map_layout_style; 2577 rmp.map_layout_style = rmp.get_iv ("map_layout_style");
2620 rmp.treasureoptions = treasureoptions;
2621 rmp.symmetry_used = symmetry_used; 2578 rmp.symmetry_used = rmp.get_iv ("symmetry_used");
2622 rmp.region = region; 2579 rmp.region = region;
2623 rmp.custom = custom;
2624 2580
2625 RETVAL = self->generate_random_map (&rmp); 2581 RETVAL = self->generate_random_map (&rmp);
2626} 2582}
2627 OUTPUT: 2583 OUTPUT:
2628 RETVAL 2584 RETVAL

Diff Legend

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